孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 kgy
提交 d6128fd8d48c047030ce3b2bf837c807088af77f 1 个父辈 dcddfe75

项目部署 算法修改

内嵌 并排对比
正在显示 1 个修改的文件 包含 70 行增加 和 5 行删除
... ... @@ -151,7 +151,7 @@ public class ProjectServiceImpl implements ProjectService {
if (Objects.nonNull(synthesize_no_2_3.getPowerSupplyEnergy())) {
energyEquipmentVo.setPowerSupplyEnergy(synthesize_no_2_3.getPowerSupplyEnergy());
}
if (Objects.nonNull(synthesize_no_2_3.getHours())){
if (Objects.nonNull(synthesize_no_2_3.getHours())) {
energyEquipmentVo.setHours(synthesize_no_2_3.getHours());
}
no_3_1Dto.setEnergyEquipmentVo(energyEquipmentVo);
... ... @@ -2466,9 +2466,34 @@ public class ProjectServiceImpl implements ProjectService {
EquipmentCapacityDto equipmentCapacityDto = new EquipmentCapacityDto();
equipmentCapacityDto.setName("供电系统");
//equipmentCapacityDto.setData(Double.valueOf(df.format(synthesize_no_3_6.getNo11() + synthesize_no_3_6.getNo12() + synthesize_no_3_6.getNo13())));
equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo11() + synthesize_no_3_6.getNo12() + synthesize_no_3_6.getNo13())));
equipmentCapacityDto.setType("1");
String[] strings = synthesize_no_2_3.getPowerSupply().split(",");//1光伏2风电3持续供电4一充一放5两充两放
if ((strings.length == 1) && (strings[0].equals("3") || strings[0].equals("4") || strings[0].equals("5"))) {
equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo13())));
for (String string : strings) {
if (string.equals("3")) {
EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName("持续供电");
equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo13())));
equipmentCapacityDto2.setType("3");
list2.add(equipmentCapacityDto2);
} else if (string.equals("4")) {
EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName("一充一放");
equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo13())));
equipmentCapacityDto2.setType("3");
list2.add(equipmentCapacityDto2);
} else if (string.equals("5")) {
EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName("两充两放");
equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo13())));
equipmentCapacityDto2.setType("3");
list2.add(equipmentCapacityDto2);
}
}
} else {
equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo11() + synthesize_no_3_6.getNo12())));
}
String annotation = "";
for (String string : strings) {
if ("1".equals(string)) {
... ... @@ -2526,9 +2551,29 @@ public class ProjectServiceImpl implements ProjectService {
*/
EquipmentCapacityDto equipmentCapacityDto = new EquipmentCapacityDto();
equipmentCapacityDto.setName("供热系统");
equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo14() + synthesize_no_3_6.getNo15() + synthesize_no_3_6.getNo16() + synthesize_no_3_6.getNo17() + synthesize_no_3_6.getNo201() + synthesize_no_3_6.getNo202() + synthesize_no_3_6.getNo203())));
//equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo14() + synthesize_no_3_6.getNo15() + synthesize_no_3_6.getNo16() + synthesize_no_3_6.getNo17() + synthesize_no_3_6.getNo201() + synthesize_no_3_6.getNo202() + synthesize_no_3_6.getNo203())));
equipmentCapacityDto.setType("2");
String[] split1 = synthesize_no_2_3.getPowerHot().split(",");//1空气源热泵（制热型）2空气源热泵（双工况）3电锅炉4燃气锅炉
if ((split1.length == 1) && ("6".equals(split1[0]) || "7".equals(split1[0]))) {
equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo202() + synthesize_no_3_6.getNo203())));
for (String s1 : split1) {
if ("6".equals(s1)) {
EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName("蓄热");
equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo202())));
equipmentCapacityDto2.setType("6");
list2.add(equipmentCapacityDto2);
} else if ("7".equals(s1)) {
EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName("双蓄");
equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo203())));
equipmentCapacityDto2.setType("7");
list2.add(equipmentCapacityDto2);
}
}
} else {
equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo14() + synthesize_no_3_6.getNo15() + synthesize_no_3_6.getNo16() + synthesize_no_3_6.getNo17() + synthesize_no_3_6.getNo201())));
}
String annotation = "";
for (String strings : split1) {
if ("1".equals(strings)) {
... ... @@ -2596,9 +2641,29 @@ public class ProjectServiceImpl implements ProjectService {
*/
EquipmentCapacityDto equipmentCapacityDto = new EquipmentCapacityDto();
equipmentCapacityDto.setName("供冷系统");
equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo18() + synthesize_no_3_6.getNo21() + synthesize_no_3_6.getNo19() + synthesize_no_3_6.getNo204() + synthesize_no_3_6.getNo205() + synthesize_no_3_6.getNo206())));
//equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo18() + synthesize_no_3_6.getNo21() + synthesize_no_3_6.getNo19() + synthesize_no_3_6.getNo204() + synthesize_no_3_6.getNo205() + synthesize_no_3_6.getNo206())));
equipmentCapacityDto.setType("3");
String[] split1 = synthesize_no_2_3.getPowerCold().split(",");//1空气源热泵（制热型）2空气源热泵（双工况）3冷水机组
if ((split1.length == 1) && (split1[0].equals("5") || split1[0].equals("6"))) {
equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo205() + synthesize_no_3_6.getNo206())));
for (String s1 : split1) {
if (s1.equals("5")){
EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName("蓄冷");
equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo205())));
equipmentCapacityDto2.setType("5");
list2.add(equipmentCapacityDto2);
}else if ("6".equals(s1)){
EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName("双蓄");
equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo206())));
equipmentCapacityDto2.setType("6");
list2.add(equipmentCapacityDto2);
}
}
} else {
equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo18() + synthesize_no_3_6.getNo21() + synthesize_no_3_6.getNo19() + synthesize_no_3_6.getNo204())));
}
String annotation = "";
for (String powerCold : split1) {
if ("1".equals(powerCold)) {
... ... @@ -2660,7 +2725,7 @@ public class ProjectServiceImpl implements ProjectService {
*/
EquipmentCapacityDto equipmentCapacityDto = new EquipmentCapacityDto();
equipmentCapacityDto.setName("热水系统");
equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo22() + synthesize_no_3_6.getNo23() + synthesize_no_3_6.getNo207() + synthesize_no_3_6.getNo208())));
equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo23() + synthesize_no_3_6.getNo207() + synthesize_no_3_6.getNo208())));
equipmentCapacityDto.setType("4");
String[] strings = synthesize_no_2_3.getHotWater().split(","); //1太阳能集热器2空气源热泵（热水型）
String annotation = "";
... ...