孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 kgy
提交 e70c0882520a7a14102846893ff89afe51071887 1 个父辈 d94487c1

更新

内嵌 并排对比
正在显示 1 个修改的文件 包含 28 行增加 和 28 行删除
... ... @@ -236,12 +236,12 @@ public class ProjectServiceImpl implements ProjectService {
*/
Synthesize_no_2_5 synthesize_no_2_5 = synthesize_no_2_5Service.getById(id);
if (!StringUtils.isEmpty(synthesize_no_2_5)) {
if (!org.springframework.util.StringUtils.isEmpty(synthesize_no_2_5.getElectricitySellingPrice()))
if (!StringUtils.isEmpty(synthesize_no_2_5.getElectricitySellingPrice()))
no_3_1Dto.setMarketElectricityPrice(synthesize_no_2_5.getElectricitySellingPrice() + "元/kWh");
/**
* 销售热价
*/
if (!org.springframework.util.StringUtils.isEmpty(synthesize_no_2_5.getHotSellingPrice())) {
if (!StringUtils.isEmpty(synthesize_no_2_5.getHotSellingPrice())) {
String s1 = "1".equals(synthesize_no_2_5.getUnit1()) ? "元/m²" : "元/GJ";
/* String s1 = "";
if ("1".equals(synthesize_no_2_5.getUnit1())) {
... ... @@ -254,7 +254,7 @@ public class ProjectServiceImpl implements ProjectService {
/**
* 销售冷价
*/
if (!org.springframework.util.StringUtils.isEmpty(synthesize_no_2_5.getColdSellingPrice())) {
if (!StringUtils.isEmpty(synthesize_no_2_5.getColdSellingPrice())) {
String s1 = "1".equals(synthesize_no_2_5.getUnit2()) ? "元/m²" : "元/GJ";
/* String s1 = "";
if ("1".equals(synthesize_no_2_5.getUnit2())) {
... ... @@ -267,7 +267,7 @@ public class ProjectServiceImpl implements ProjectService {
/**
* 热水销售价格
*/
if (!org.springframework.util.StringUtils.isEmpty(synthesize_no_2_5.getHotWaterSellingPrice()))
if (!StringUtils.isEmpty(synthesize_no_2_5.getHotWaterSellingPrice()))
no_3_1Dto.setMarketWaterPrice(Double.valueOf(df.format(synthesize_no_2_5.getHotWaterSellingPrice())) + "元/吨");
}
return no_3_1Dto;
... ... @@ -1072,7 +1072,7 @@ public class ProjectServiceImpl implements ProjectService {
synthesize_no_3_6.setNo201(Double.valueOf(df.format(MultiLineCentralAirConditioningInstalledCapacity)));
no_3_1_1_1Dto.setName(array2[13]);
no_3_1_1_1Dto.setInstallCapacity(format.apply(new BigDecimal(MultiLineCentralAirConditioningInstalledCapacity)) + "kW");
Double num1 = Double.valueOf(df.format(MultiLineCentralAirConditioningInstalledCapacity * synthesizeNo26ServiceById.getNo102()));
Double num1 = Double.valueOf(df.format(MultiLineCentralAirConditioningInstalledCapacity * synthesizeNo26ServiceById.getNo102() / 10000));
synthesize_no_3_6.setNo209(num1);
no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1)));
Double num2 = Double.valueOf(df.format(heatingIncome * Double.parseDouble(String.valueOf(jsonObject.get("hotE"))) / 100 / 10000));
... ... @@ -2188,7 +2188,7 @@ public class ProjectServiceImpl implements ProjectService {
String site = no_1Service.getById(id).getProjectSite();
if (!StringUtils.isEmpty(site)) {
Synthesize_no_2_6 byId = synthesize_no_2_6Service.getById(id);
if (org.springframework.util.StringUtils.isEmpty(byId)) {
if (StringUtils.isEmpty(byId)) {
byId = synthesize_no_2_6Service.getById("1");
}
CityDict cityDict = cityDictService.getOne(new QueryWrapper<CityDict>().lambda().eq(CityDict::getName, site));
... ... @@ -2213,7 +2213,7 @@ public class ProjectServiceImpl implements ProjectService {
flat += electrovalence.getNo22();
floor += electrovalence.getNo33();
}
if (!org.springframework.util.StringUtils.isEmpty(calculateLoad)) {
if (!StringUtils.isEmpty(calculateLoad)) {
if (calculateLoad.getNo4().equals(calculateLoad.getNo44())) {
//electricity += hotWaterDataMapper.queryName(zd_name, cityDict.getId());
electricity += synthesize_no_2_11.getHotWaterQuota();
... ... @@ -4455,7 +4455,7 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public void saveProject(Synthesize_no_1 synthesize_no_1, String synthesize_no_2_1, Double electricityAh, Double photovoltaicArea, Double windAh, Synthesize_no_1Img synthesize_no_1Img, Synthesize_no_2_2 synthesize_no_2_2, Synthesize_no_2_3 synthesize_no_2_3, Synthesize_no_2_5 synthesize_no_2_5, HotMsgDto hotMsgDto, ColdMsgDto coldMsgDto, HotWaterDto hotWaterDto) {
if (org.springframework.util.StringUtils.isEmpty(synthesize_no_1.getId())) {
if (StringUtils.isEmpty(synthesize_no_1.getId())) {
if (org.apache.commons.lang3.StringUtils.isNotEmpty(synthesize_no_1.getProjectSite())) {
synthesize_no_1.setType("1");
synthesize_no_1.setTime(new Date());
... ... @@ -4479,7 +4479,7 @@ public class ProjectServiceImpl implements ProjectService {
if (org.apache.commons.lang3.StringUtils.isNotEmpty(synthesize_no_1.getProjectSite())) {
String site = synthesize_no_1.getProjectSite();
Synthesize_no_2_6 byId = synthesize_no_2_6Service.getById(synthesize_no_1.getId());
if (org.springframework.util.StringUtils.isEmpty(byId)) {
if (StringUtils.isEmpty(byId)) {
byId = synthesize_no_2_6Service.getById("1");
}
CityDict cityDict = cityDictService.getOne(new QueryWrapper<CityDict>().lambda().eq(CityDict::getName, site));
... ... @@ -4504,7 +4504,7 @@ public class ProjectServiceImpl implements ProjectService {
flat += electrovalence.getNo22();
floor += electrovalence.getNo33();
}
if (!org.springframework.util.StringUtils.isEmpty(calculateLoad)) {
if (!StringUtils.isEmpty(calculateLoad)) {
if (calculateLoad.getNo4().equals(calculateLoad.getNo44())) {
electricity += hotWaterDataMapper.queryName(zd_name, cityDict.getId());
} else {
... ... @@ -4553,10 +4553,10 @@ public class ProjectServiceImpl implements ProjectService {
*/
if (org.apache.commons.lang3.StringUtils.isNotEmpty(synthesize_no_2_1))
no2_1Save(synthesize_no_2_1, electricityAh);
if (!org.springframework.util.StringUtils.isEmpty(synthesize_no_2_2.getId())) {
if (!StringUtils.isEmpty(synthesize_no_2_2.getId())) {
synthesize_no_2_2Service.saveOrUpdate(synthesize_no_2_2);
}
if (!org.springframework.util.StringUtils.isEmpty(synthesize_no_2_3.getId())) {
if (!StringUtils.isEmpty(synthesize_no_2_3.getId())) {
String s1 = JSON.toJSONString(hotMsgDto);
String s2 = JSON.toJSONString(coldMsgDto);
String s3 = JSON.toJSONString(hotWaterDto);
... ... @@ -4564,7 +4564,7 @@ public class ProjectServiceImpl implements ProjectService {
synthesize_no_2_3.setColdMsg(s2);
synthesize_no_2_3.setHotWaterMsg(s3);
synthesize_no_2_3Service.saveOrUpdate(synthesize_no_2_3);
if (org.springframework.util.StringUtils.isEmpty(synthesize_no_2_4Service.getById(synthesize_no_2_3.getId()))) {
if (StringUtils.isEmpty(synthesize_no_2_4Service.getById(synthesize_no_2_3.getId()))) {
Synthesize_no_2_4 synthesize_no_2_4 = new Synthesize_no_2_4();
synthesize_no_2_4.setId(synthesize_no_2_3.getId());
synthesize_no_2_4.setWindAh(windAh);
... ... @@ -4577,7 +4577,7 @@ public class ProjectServiceImpl implements ProjectService {
synthesize_no_2_4Service.saveOrUpdate(synthesize_no_2_4);
}
}
if (!org.springframework.util.StringUtils.isEmpty(synthesize_no_2_5.getId()))
if (!StringUtils.isEmpty(synthesize_no_2_5.getId()))
synthesize_no_2_5Service.saveOrUpdate(synthesize_no_2_5);
}
... ... @@ -4594,7 +4594,7 @@ public class ProjectServiceImpl implements ProjectService {
String projectType = synthesize_no_1.getProjectType();
if ("2".equals(projectType))
synthesize_no_2_2Service.saveOrUpdate(synthesize_no_2_2);
if (!org.springframework.util.StringUtils.isEmpty(synthesize_no_2_3.getId())) {
if (!StringUtils.isEmpty(synthesize_no_2_3.getId())) {
List<Synthesize_no_2_1> synthesize_no_2_1List = synthesize_no_2_1Service.list(new QueryWrapper<Synthesize_no_2_1>().lambda().eq(Synthesize_no_2_1::getPid, synthesize_no_1.getId()));
String[] split = synthesize_no_1.getEnergyType().split(",");
for (String s : split) {
... ... @@ -4654,7 +4654,7 @@ public class ProjectServiceImpl implements ProjectService {
* 蓄热做一个限制，出水温度不能低于进水温度
*/
Synthesize_no_2_6 synthesize_no_2_6 = synthesize_no_2_6Service.getById(synthesize_no_2_3.getId());
if (org.springframework.util.StringUtils.isEmpty(synthesize_no_2_6)) {
if (StringUtils.isEmpty(synthesize_no_2_6)) {
Synthesize_no_2_6 synthesize_no_2_61 = synthesize_no_2_6Service.getById("1");
if (synthesize_no_2_61.getNo52() <= hotMsgDto.getHotG()) {
throw new IllegalArgumentException("供热温度填写有误，范围不得大于等于" + synthesize_no_2_61.getNo52());
... ... @@ -4723,12 +4723,12 @@ public class ProjectServiceImpl implements ProjectService {
String site = synthesize_no_1.getProjectSite();
CityDict cityDict = cityDictService.getOne(new QueryWrapper<CityDict>().lambda().eq(CityDict::getName, site));
Integer no1 = coldWaterDataMapper.selectById(cityDict.getId()).getNo1();
if (org.springframework.util.StringUtils.isEmpty(synthesize_no_2_6)) {
if (StringUtils.isEmpty(synthesize_no_2_6)) {
if (no1 <= coldMsgDto.getColdF()) {
throw new IllegalArgumentException("供冷温度填写有误，范围不得大于等于" + no1);
}
} else {
if (org.springframework.util.StringUtils.isEmpty(coldMsgDto.getColdF())) {
if (StringUtils.isEmpty(coldMsgDto.getColdF())) {
coldMsgDto.setColdF(0.0);
}
if (synthesize_no_2_6.getNo51() <= coldMsgDto.getColdF()) {
... ... @@ -4752,7 +4752,7 @@ public class ProjectServiceImpl implements ProjectService {
synthesize_no_2_3.setColdMsg(s2);
synthesize_no_2_3.setHotWaterMsg(s3);
synthesize_no_2_3Service.saveOrUpdate(synthesize_no_2_3);
if (org.springframework.util.StringUtils.isEmpty(synthesize_no_2_4Service.getById(synthesize_no_2_3.getId()))) {
if (StringUtils.isEmpty(synthesize_no_2_4Service.getById(synthesize_no_2_3.getId()))) {
Synthesize_no_2_4 synthesize_no_2_4 = new Synthesize_no_2_4();
synthesize_no_2_4.setId(synthesize_no_2_3.getId());
synthesize_no_2_4.setWindAh(windAh);
... ... @@ -4765,7 +4765,7 @@ public class ProjectServiceImpl implements ProjectService {
synthesize_no_2_4Service.saveOrUpdate(synthesize_no_2_4);
}
}
if (!org.springframework.util.StringUtils.isEmpty(synthesize_no_2_5.getId()))
if (!StringUtils.isEmpty(synthesize_no_2_5.getId()))
synthesize_no_2_5Service.saveOrUpdate(synthesize_no_2_5);
}
... ... @@ -4800,7 +4800,7 @@ public class ProjectServiceImpl implements ProjectService {
flat += electrovalence.getNo22();
floor += electrovalence.getNo33();
}
if (!org.springframework.util.StringUtils.isEmpty(calculateLoad)) {
if (!StringUtils.isEmpty(calculateLoad)) {
if (calculateLoad.getNo4().equals(calculateLoad.getNo44())) {
electricity += hotWaterDataMapper.queryName(zd_name, cityDict.getId());
} else {
... ... @@ -4901,7 +4901,7 @@ public class ProjectServiceImpl implements ProjectService {
* 蓄热做一个限制，出水温度不能低于进水温度
*/
Synthesize_no_2_6 synthesize_no_2_6 = synthesize_no_2_6Service.getById(synthesize_no_2_3.getId());
if (org.springframework.util.StringUtils.isEmpty(synthesize_no_2_6)) {
if (StringUtils.isEmpty(synthesize_no_2_6)) {
Synthesize_no_2_6 synthesize_no_2_61 = synthesize_no_2_6Service.getById("1");
if (synthesize_no_2_61.getNo52() <= hotMsgDto.getHotG()) {
throw new IllegalArgumentException("供热温度填写有误，范围不得大于等于" + synthesize_no_2_61.getNo52());
... ... @@ -4971,12 +4971,12 @@ public class ProjectServiceImpl implements ProjectService {
String site = synthesize_no_1.getProjectSite();
CityDict cityDict = cityDictService.getOne(new QueryWrapper<CityDict>().lambda().eq(CityDict::getName, site));
Integer no1 = coldWaterDataMapper.selectById(cityDict.getId()).getNo1();
if (org.springframework.util.StringUtils.isEmpty(synthesize_no_2_6)) {
if (StringUtils.isEmpty(synthesize_no_2_6)) {
if (no1 <= coldMsgDto.getColdF()) {
throw new IllegalArgumentException("供冷温度填写有误，范围不得大于等于" + no1);
}
} else {
if (org.springframework.util.StringUtils.isEmpty(coldMsgDto.getColdF())) {
if (StringUtils.isEmpty(coldMsgDto.getColdF())) {
coldMsgDto.setColdF(0.0);
}
if (synthesize_no_2_6.getNo51() <= coldMsgDto.getColdF()) {
... ... @@ -5019,7 +5019,7 @@ public class ProjectServiceImpl implements ProjectService {
@Override
public String no1Save(Synthesize_no_1 synthesize_no_1) {
if (org.springframework.util.StringUtils.isEmpty(synthesize_no_1.getId())) {
if (StringUtils.isEmpty(synthesize_no_1.getId())) {
synthesize_no_1.setType("1");
synthesize_no_1.setTime(new Date());
synthesize_no_1.setDeleteState("3");
... ... @@ -5055,7 +5055,7 @@ public class ProjectServiceImpl implements ProjectService {
if (org.apache.commons.lang3.StringUtils.isNotEmpty(synthesize_no_1.getProjectSite())) {
String site = synthesize_no_1.getProjectSite();
Synthesize_no_2_6 byId = synthesize_no_2_6Service.getById(synthesize_no_1.getId());
if (org.springframework.util.StringUtils.isEmpty(byId)) {
if (StringUtils.isEmpty(byId)) {
byId = synthesize_no_2_6Service.getById("1");
}
CityDict cityDict = cityDictService.getOne(new QueryWrapper<CityDict>().lambda().eq(CityDict::getName, site));
... ... @@ -5067,7 +5067,7 @@ public class ProjectServiceImpl implements ProjectService {
if (!synthesize_no_2_1s.isEmpty()) {
for (int i = 0; i < synthesize_no_2_1s.size(); i++) {
Sort sort = sortMapper.selectById(synthesize_no_2_1s.get(i).getBuildingTypeId());
if (!org.springframework.util.StringUtils.isEmpty(sort)) {
if (!StringUtils.isEmpty(sort)) {
String zd_name = "no_" + sort.getId();
CalculateLoad calculateLoad = calculateLoadService.getById(synthesize_no_2_1s.get(i).getId());
Electrovalence electrovalence = electrovalenceMapper.selectById(cityDict.getId());
... ... @@ -5080,7 +5080,7 @@ public class ProjectServiceImpl implements ProjectService {
flat += electrovalence.getNo22();
floor += electrovalence.getNo33();
}
if (!org.springframework.util.StringUtils.isEmpty(calculateLoad)) {
if (!StringUtils.isEmpty(calculateLoad)) {
if (calculateLoad.getNo4().equals(calculateLoad.getNo44())) {
electricity += hotWaterDataMapper.queryName(zd_name, cityDict.getId());
} else {
... ...