孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 kgy
提交 a1843a8a24fb8c1b7d47a4aff477426b64f64ded 1 个父辈 9b1882c7

项目部署

内嵌 并排对比
正在显示 2 个修改的文件 包含 25 行增加 和 8 行删除
... ... @@ -14,4 +14,5 @@ public class EquipmentCapacityDto2 {
private String total;
private List<EquipmentCapacityDto> list;
private String annotation;
}
... ...
... ... @@ -2470,6 +2470,7 @@ public class ProjectServiceImpl implements ProjectService {
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两充两放
String annotation = "";
for (String string : strings) {
if ("1".equals(string)) {
EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
... ... @@ -2484,21 +2485,24 @@ public class ProjectServiceImpl implements ProjectService {
equipmentCapacityDto2.setType("2");
list2.add(equipmentCapacityDto2);
} else if ("3".equals(string)) {
annotations.add("(持续供电)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h");
annotation = "(持续供电)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h";
annotations.add(annotation);
/* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName(format.apply(new BigDecimal(synthesize_no_3_6.getNo13())) + "kW * 2h(持续供电)");
equipmentCapacityDto2.setData("0.00");
equipmentCapacityDto2.setType("3");
list2.add(equipmentCapacityDto2);*/
} else if ("4".equals(string)) {
annotations.add("(一充一放)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h");
annotation = "(一充一放)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h";
annotations.add(annotation);
/* 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 ("5".equals(string)) {
annotations.add("(两充两放)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h");
annotation = "(两充两放)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h";
annotations.add(annotation);
/* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName("两充两放");
equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo13())));
... ... @@ -2513,6 +2517,7 @@ public class ProjectServiceImpl implements ProjectService {
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
equipmentCapacityVo1.setList(list2);
equipmentCapacityVo1.setAnnotation(annotation);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
} else if ("2".equals(s)) {
... ... @@ -2525,6 +2530,7 @@ public class ProjectServiceImpl implements ProjectService {
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燃气锅炉
String annotation = "";
for (String strings : split1) {
if ("1".equals(strings)) {
EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
... ... @@ -2557,14 +2563,16 @@ public class ProjectServiceImpl implements ProjectService {
equipmentCapacityDto2.setType("5");
list2.add(equipmentCapacityDto2);
} else if ("6".equals(strings)) {
annotations.add("蓄热体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo202())) + "(吨)");
annotation = "蓄热体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo202())) + "(吨)";
annotations.add(annotation);
/* 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(strings)) {
annotations.add("双蓄体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo203())) + "(吨)");
annotation = "双蓄体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo203())) + "(吨)";
annotations.add(annotation);
/* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName("双蓄");
equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo203())));
... ... @@ -2579,6 +2587,7 @@ public class ProjectServiceImpl implements ProjectService {
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
equipmentCapacityVo1.setList(list2);
equipmentCapacityVo1.setAnnotation(annotation);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
} else if ("3".equals(s)) {
... ... @@ -2591,6 +2600,7 @@ public class ProjectServiceImpl implements ProjectService {
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冷水机组
String annotation = "";
for (String powerCold : split1) {
if ("1".equals(powerCold)) {
EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
... ... @@ -2617,14 +2627,16 @@ public class ProjectServiceImpl implements ProjectService {
equipmentCapacityDto2.setType("4");
list2.add(equipmentCapacityDto2);
} else if ("5".equals(powerCold)) {
annotations.add("蓄冷体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo205())) + "(吨)");
annotation = "蓄冷体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo205())) + "(吨)";
annotations.add(annotation);
/* 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(powerCold)) {
annotations.add("双蓄体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo206())) + "(吨)");
annotation = "双蓄体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo206())) + "(吨)";
annotations.add(annotation);
/* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName("双蓄");
equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo206())));
... ... @@ -2639,6 +2651,7 @@ public class ProjectServiceImpl implements ProjectService {
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
equipmentCapacityVo1.setList(list2);
equipmentCapacityVo1.setAnnotation(annotation);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
} else if ("4".equals(s)) {
... ... @@ -2651,9 +2664,11 @@ public class ProjectServiceImpl implements ProjectService {
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.setType("4");
String[] strings = synthesize_no_2_3.getHotWater().split(","); //1太阳能集热器2空气源热泵（热水型）
String annotation = "";
for (String string : strings) {
if ("1".equals(string)) {
annotations.add("太阳能集热器：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo22())) + "m²");
annotation = "太阳能集热器：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo22())) + "m²";
annotations.add(annotation);
/* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
equipmentCapacityDto2.setName("太阳能集热器");
equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo22())));
... ... @@ -2686,6 +2701,7 @@ public class ProjectServiceImpl implements ProjectService {
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
equipmentCapacityVo1.setList(list2);
equipmentCapacityVo1.setAnnotation(annotation);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
list.add(equipmentCapacityDto);
}
... ...