孔广洋 / synthesize_energy_project · 提交

转到一个项目

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

项目部署

内嵌 并排对比
正在显示 2 个修改的文件 包含 25 行增加 和 8 行删除
@@ -14,4 +14,5 @@ public class EquipmentCapacityDto2 { @@ -14,4 +14,5 @@ public class EquipmentCapacityDto2 {
14 14
15 private String total; 15 private String total;
16 private List<EquipmentCapacityDto> list; 16 private List<EquipmentCapacityDto> list;
  17 + private String annotation;
17 } 18 }
@@ -2470,6 +2470,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -2470,6 +2470,7 @@ public class ProjectServiceImpl implements ProjectService {
2470 equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo11() + synthesize_no_3_6.getNo12() + synthesize_no_3_6.getNo13()))); 2470 equipmentCapacityDto.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo11() + synthesize_no_3_6.getNo12() + synthesize_no_3_6.getNo13())));
2471 equipmentCapacityDto.setType("1"); 2471 equipmentCapacityDto.setType("1");
2472 String[] strings = synthesize_no_2_3.getPowerSupply().split(",");//1光伏2风电3持续供电4一充一放5两充两放 2472 String[] strings = synthesize_no_2_3.getPowerSupply().split(",");//1光伏2风电3持续供电4一充一放5两充两放
  2473 + String annotation = "";
2473 for (String string : strings) { 2474 for (String string : strings) {
2474 if ("1".equals(string)) { 2475 if ("1".equals(string)) {
2475 EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto(); 2476 EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
@@ -2484,21 +2485,24 @@ public class ProjectServiceImpl implements ProjectService { @@ -2484,21 +2485,24 @@ public class ProjectServiceImpl implements ProjectService {
2484 equipmentCapacityDto2.setType("2"); 2485 equipmentCapacityDto2.setType("2");
2485 list2.add(equipmentCapacityDto2); 2486 list2.add(equipmentCapacityDto2);
2486 } else if ("3".equals(string)) { 2487 } else if ("3".equals(string)) {
2487 - annotations.add("(持续供电)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h"); 2488 + annotation = "(持续供电)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h";
  2489 + annotations.add(annotation);
2488 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto(); 2490 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
2489 equipmentCapacityDto2.setName(format.apply(new BigDecimal(synthesize_no_3_6.getNo13())) + "kW * 2h(持续供电)"); 2491 equipmentCapacityDto2.setName(format.apply(new BigDecimal(synthesize_no_3_6.getNo13())) + "kW * 2h(持续供电)");
2490 equipmentCapacityDto2.setData("0.00"); 2492 equipmentCapacityDto2.setData("0.00");
2491 equipmentCapacityDto2.setType("3"); 2493 equipmentCapacityDto2.setType("3");
2492 list2.add(equipmentCapacityDto2);*/ 2494 list2.add(equipmentCapacityDto2);*/
2493 } else if ("4".equals(string)) { 2495 } else if ("4".equals(string)) {
2494 - annotations.add("(一充一放)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h"); 2496 + annotation = "(一充一放)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h";
  2497 + annotations.add(annotation);
2495 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto(); 2498 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
2496 equipmentCapacityDto2.setName("一充一放"); 2499 equipmentCapacityDto2.setName("一充一放");
2497 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo13()))); 2500 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo13())));
2498 equipmentCapacityDto2.setType("3"); 2501 equipmentCapacityDto2.setType("3");
2499 list2.add(equipmentCapacityDto2);*/ 2502 list2.add(equipmentCapacityDto2);*/
2500 } else if ("5".equals(string)) { 2503 } else if ("5".equals(string)) {
2501 - annotations.add("(两充两放)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h"); 2504 + annotation = "(两充两放)" + format.apply(new BigDecimal(synthesize_no_2_3.getPowerSupplyEnergy())) + "kW * " + synthesize_no_2_3.getHours() + "h";
  2505 + annotations.add(annotation);
2502 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto(); 2506 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
2503 equipmentCapacityDto2.setName("两充两放"); 2507 equipmentCapacityDto2.setName("两充两放");
2504 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo13()))); 2508 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo13())));
@@ -2513,6 +2517,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -2513,6 +2517,7 @@ public class ProjectServiceImpl implements ProjectService {
2513 EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2(); 2517 EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
2514 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW"); 2518 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
2515 equipmentCapacityVo1.setList(list2); 2519 equipmentCapacityVo1.setList(list2);
  2520 + equipmentCapacityVo1.setAnnotation(annotation);
2516 equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1); 2521 equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
2517 list.add(equipmentCapacityDto); 2522 list.add(equipmentCapacityDto);
2518 } else if ("2".equals(s)) { 2523 } else if ("2".equals(s)) {
@@ -2525,6 +2530,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -2525,6 +2530,7 @@ public class ProjectServiceImpl implements ProjectService {
2525 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()))); 2530 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())));
2526 equipmentCapacityDto.setType("2"); 2531 equipmentCapacityDto.setType("2");
2527 String[] split1 = synthesize_no_2_3.getPowerHot().split(",");//1空气源热泵（制热型）2空气源热泵（双工况）3电锅炉4燃气锅炉 2532 String[] split1 = synthesize_no_2_3.getPowerHot().split(",");//1空气源热泵（制热型）2空气源热泵（双工况）3电锅炉4燃气锅炉
  2533 + String annotation = "";
2528 for (String strings : split1) { 2534 for (String strings : split1) {
2529 if ("1".equals(strings)) { 2535 if ("1".equals(strings)) {
2530 EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto(); 2536 EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
@@ -2557,14 +2563,16 @@ public class ProjectServiceImpl implements ProjectService { @@ -2557,14 +2563,16 @@ public class ProjectServiceImpl implements ProjectService {
2557 equipmentCapacityDto2.setType("5"); 2563 equipmentCapacityDto2.setType("5");
2558 list2.add(equipmentCapacityDto2); 2564 list2.add(equipmentCapacityDto2);
2559 } else if ("6".equals(strings)) { 2565 } else if ("6".equals(strings)) {
2560 - annotations.add("蓄热体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo202())) + "(吨)"); 2566 + annotation = "蓄热体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo202())) + "(吨)";
  2567 + annotations.add(annotation);
2561 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto(); 2568 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
2562 equipmentCapacityDto2.setName("蓄热"); 2569 equipmentCapacityDto2.setName("蓄热");
2563 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo202()))); 2570 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo202())));
2564 equipmentCapacityDto2.setType("6"); 2571 equipmentCapacityDto2.setType("6");
2565 list2.add(equipmentCapacityDto2);*/ 2572 list2.add(equipmentCapacityDto2);*/
2566 } else if ("7".equals(strings)) { 2573 } else if ("7".equals(strings)) {
2567 - annotations.add("双蓄体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo203())) + "(吨)"); 2574 + annotation = "双蓄体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo203())) + "(吨)";
  2575 + annotations.add(annotation);
2568 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto(); 2576 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
2569 equipmentCapacityDto2.setName("双蓄"); 2577 equipmentCapacityDto2.setName("双蓄");
2570 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo203()))); 2578 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo203())));
@@ -2579,6 +2587,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -2579,6 +2587,7 @@ public class ProjectServiceImpl implements ProjectService {
2579 EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2(); 2587 EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
2580 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW"); 2588 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
2581 equipmentCapacityVo1.setList(list2); 2589 equipmentCapacityVo1.setList(list2);
  2590 + equipmentCapacityVo1.setAnnotation(annotation);
2582 equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1); 2591 equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
2583 list.add(equipmentCapacityDto); 2592 list.add(equipmentCapacityDto);
2584 } else if ("3".equals(s)) { 2593 } else if ("3".equals(s)) {
@@ -2591,6 +2600,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -2591,6 +2600,7 @@ public class ProjectServiceImpl implements ProjectService {
2591 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()))); 2600 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())));
2592 equipmentCapacityDto.setType("3"); 2601 equipmentCapacityDto.setType("3");
2593 String[] split1 = synthesize_no_2_3.getPowerCold().split(",");//1空气源热泵（制热型）2空气源热泵（双工况）3冷水机组 2602 String[] split1 = synthesize_no_2_3.getPowerCold().split(",");//1空气源热泵（制热型）2空气源热泵（双工况）3冷水机组
  2603 + String annotation = "";
2594 for (String powerCold : split1) { 2604 for (String powerCold : split1) {
2595 if ("1".equals(powerCold)) { 2605 if ("1".equals(powerCold)) {
2596 EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto(); 2606 EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
@@ -2617,14 +2627,16 @@ public class ProjectServiceImpl implements ProjectService { @@ -2617,14 +2627,16 @@ public class ProjectServiceImpl implements ProjectService {
2617 equipmentCapacityDto2.setType("4"); 2627 equipmentCapacityDto2.setType("4");
2618 list2.add(equipmentCapacityDto2); 2628 list2.add(equipmentCapacityDto2);
2619 } else if ("5".equals(powerCold)) { 2629 } else if ("5".equals(powerCold)) {
2620 - annotations.add("蓄冷体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo205())) + "(吨)"); 2630 + annotation = "蓄冷体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo205())) + "(吨)";
  2631 + annotations.add(annotation);
2621 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto(); 2632 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
2622 equipmentCapacityDto2.setName("蓄冷"); 2633 equipmentCapacityDto2.setName("蓄冷");
2623 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo205()))); 2634 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo205())));
2624 equipmentCapacityDto2.setType("5"); 2635 equipmentCapacityDto2.setType("5");
2625 list2.add(equipmentCapacityDto2);*/ 2636 list2.add(equipmentCapacityDto2);*/
2626 } else if ("6".equals(powerCold)) { 2637 } else if ("6".equals(powerCold)) {
2627 - annotations.add("双蓄体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo206())) + "(吨)"); 2638 + annotation = "双蓄体积：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo206())) + "(吨)";
  2639 + annotations.add(annotation);
2628 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto(); 2640 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
2629 equipmentCapacityDto2.setName("双蓄"); 2641 equipmentCapacityDto2.setName("双蓄");
2630 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo206()))); 2642 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo206())));
@@ -2639,6 +2651,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -2639,6 +2651,7 @@ public class ProjectServiceImpl implements ProjectService {
2639 EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2(); 2651 EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
2640 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW"); 2652 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
2641 equipmentCapacityVo1.setList(list2); 2653 equipmentCapacityVo1.setList(list2);
  2654 + equipmentCapacityVo1.setAnnotation(annotation);
2642 equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1); 2655 equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
2643 list.add(equipmentCapacityDto); 2656 list.add(equipmentCapacityDto);
2644 } else if ("4".equals(s)) { 2657 } else if ("4".equals(s)) {
@@ -2651,9 +2664,11 @@ public class ProjectServiceImpl implements ProjectService { @@ -2651,9 +2664,11 @@ public class ProjectServiceImpl implements ProjectService {
2651 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()))); 2664 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())));
2652 equipmentCapacityDto.setType("4"); 2665 equipmentCapacityDto.setType("4");
2653 String[] strings = synthesize_no_2_3.getHotWater().split(","); //1太阳能集热器2空气源热泵（热水型） 2666 String[] strings = synthesize_no_2_3.getHotWater().split(","); //1太阳能集热器2空气源热泵（热水型）
  2667 + String annotation = "";
2654 for (String string : strings) { 2668 for (String string : strings) {
2655 if ("1".equals(string)) { 2669 if ("1".equals(string)) {
2656 - annotations.add("太阳能集热器：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo22())) + "m²"); 2670 + annotation = "太阳能集热器：" + format.apply(new BigDecimal(synthesize_no_3_6.getNo22())) + "m²";
  2671 + annotations.add(annotation);
2657 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto(); 2672 /* EquipmentCapacityDto equipmentCapacityDto2 = new EquipmentCapacityDto();
2658 equipmentCapacityDto2.setName("太阳能集热器"); 2673 equipmentCapacityDto2.setName("太阳能集热器");
2659 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo22()))); 2674 equipmentCapacityDto2.setData(format.apply(new BigDecimal(synthesize_no_3_6.getNo22())));
@@ -2686,6 +2701,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -2686,6 +2701,7 @@ public class ProjectServiceImpl implements ProjectService {
2686 EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2(); 2701 EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
2687 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW"); 2702 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
2688 equipmentCapacityVo1.setList(list2); 2703 equipmentCapacityVo1.setList(list2);
  2704 + equipmentCapacityVo1.setAnnotation(annotation);
2689 equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1); 2705 equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
2690 list.add(equipmentCapacityDto); 2706 list.add(equipmentCapacityDto);
2691 } 2707 }