计算电量问题

wwmin
synthesize_energy_api/src/main/java/com/synthesize_energy/item/web/service/impl/ProjectServiceImpl.java
--- a/synthesize_energy_api/src/main/java/com/synthesize_energy/item/web/service/impl/ProjectServiceImpl.java
查看文件 @7963bc5
+++ b/synthesize_energy_api/src/main/java/com/synthesize_energy/item/web/service/impl/ProjectServiceImpl.java
查看文件 @7963bc5
@@ -494,6 +494,7 @@ public class ProjectServiceImpl implements ProjectService {
                  * 储能装机容量
                  */
                 double storedEnergyInstallCapacity = 0.0;
+                double storeItemListTotal= 0.0;
                 for (String string : strings) {
                     if ("1".equals(string)) {
                         /**
@@ -511,6 +512,7 @@ public class ProjectServiceImpl implements ProjectService {
                             photovoltaicInstall = synthesize_no_2_4.getPhotovoltaicArea() * synthesizeNo26ServiceById.getNo16() / 1000;
                         }
                         photovoltaicAll = photovoltaicInstall * synthesizeNo26ServiceById.getNo123();
+                        storeItemListTotal += photovoltaicAll;
                         synthesize_no_3_6.setNo51(photovoltaicAll);
                     } else if ("2".equals(string)) {
                         /**
@@ -518,18 +520,21 @@ public class ProjectServiceImpl implements ProjectService {
                          */
                         windAh = synthesize_no_2_4.getWindAh();
                         windAll = windAh * synthesizeNo26ServiceById.getNo124();
+                        storeItemListTotal += windAll;
                         synthesize_no_3_6.setNo52(windAll);
                     } else if ("3".equals(string)) {
                         /**
                          * 持续供电策略
                          */
                         storedEnergyAll = synthesize_no_2_3.getPowerSupplyEnergy() * synthesize_no_2_3.getHours();
+                        storeItemListTotal += storedEnergyAll;
                     } else if ("4".equals(string)) {
                         /**
                          * 一充一放策略
                          */
                         storedEnergyAll = synthesize_no_2_3.getPowerSupplyEnergy() * synthesize_no_2_3.getHours();
-                        storedEnergyInstallCapacity = storedEnergyAll * 350 * 0.9;
+                        storedEnergyInstallCapacity = storedEnergyAll * 350 * 0.9;//0.9 放电深度 ,
+                        storeItemListTotal += storedEnergyInstallCapacity * 0.93;//0.93放电效率
                         synthesize_no_3_6.setNo53(storedEnergyInstallCapacity);
                     } else if ("5".equals(string)) {
                         /**
@@ -537,6 +542,7 @@ public class ProjectServiceImpl implements ProjectService {
                          */
                         storedEnergyAll = synthesize_no_2_3.getPowerSupplyEnergy() * synthesize_no_2_3.getHours();
                         storedEnergyInstallCapacity = storedEnergyAll * 350 * 2 * 0.9;
+                        storeItemListTotal += storedEnergyInstallCapacity * 0.93;//0.93放电效率;
                         synthesize_no_3_6.setNo53(storedEnergyInstallCapacity);
                     }
                 }
@@ -545,9 +551,10 @@ public class ProjectServiceImpl implements ProjectService {
                  * 10 * 365 * architectureArea * electricity * 0.8 / 1000
                  */
                 double electricityAll = 0.0;
-                for (CalculateLoad calculateLoad : list1) {
-                    electricityAll += calculateLoad.getNo11();
-                }
+//                for (CalculateLoad calculateLoad : list1) {
+//                    electricityAll += calculateLoad.getNo11();
+//                }
+                electricityAll = storeItemListTotal;
                 synthesize_no_3_6.setNo1(String.valueOf(Double.valueOf(df.format(electricityAll * synthesize_no_2_5.getElectricitySellingPrice()))));
                 /**
                  * 1供电
@@ -661,7 +668,7 @@ public class ProjectServiceImpl implements ProjectService {
                         synthesize_no_3_6.setNo38(num1);
                         no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1)));
                         no_3_1_1_1Dto.setProjectEarnings("0.00");
-                        Double num3 = Double.valueOf(format.apply(new BigDecimal(synthesizeNo26ServiceById.getNo20() * storedEnergyAll * 1000 / 10000)));
+                        Double num3 = Double.valueOf(format.apply(new BigDecimal(synthesizeNo26ServiceById.getNo20() * storedEnergyAll / 0.93 * 1000 / 10000)));//0.93充电效率
                         no_3_1_1_1Dto.setRemark(String.valueOf(num3));
                         synthesize_no_3_6.setNo68(num3);
                         list2.add(no_3_1_1_1Dto);
@@ -680,7 +687,7 @@ public class ProjectServiceImpl implements ProjectService {
                         synthesize_no_3_6.setNo38(num1);
                         Double num2 = Double.valueOf(df.format(storedEnergyAll * 365 * (synthesize_no_2_5.getElectricitySellingPrice() - end) / 10000));
                         synthesize_no_3_6.setNo26(num2);
-                        Double num3 = Double.valueOf(df.format((storedEnergyAll * 365 * end + storedEnergyAll * synthesizeNo26ServiceById.getNo20() * 1000) / 10000));
+                        Double num3 = Double.valueOf(df.format((storedEnergyAll * 365 * end + storedEnergyAll * synthesizeNo26ServiceById.getNo20() / 0.93 * 1000) / 10000));//0.93充电效率
                         /**
                          * 储能供电收入=储能供电量*(售电价)/10000
                          */
@@ -705,7 +712,7 @@ public class ProjectServiceImpl implements ProjectService {
                         Double num2 = Double.valueOf(df.format(storedEnergyAll * 365 * 2 * (synthesize_no_2_5.getElectricitySellingPrice() - end) / 10000));
                         synthesize_no_3_6.setNo26(num2);
                         no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(storedEnergyAll * 368 * 2 * (synthesize_no_2_5.getElectricitySellingPrice()) / 10000)));
-                        Double num3 = Double.valueOf(df.format((storedEnergyAll * 365 * 2 * end + storedEnergyAll * synthesizeNo26ServiceById.getNo20() * 1000) / 10000));
+                        Double num3 = Double.valueOf(df.format((storedEnergyAll * 365 * 2 * end + storedEnergyAll * synthesizeNo26ServiceById.getNo20() / 0.93 * 1000) / 10000));//0.93充电效率
                         no_3_1_1_1Dto.setRemark(format.apply(new BigDecimal(num3)));
                         synthesize_no_3_6.setNo68(num3);
                         no_3_1Tall_dto.setEnergyStorageRemarks("注：两充两放");
@@ -4455,9 +4462,9 @@ public class ProjectServiceImpl implements ProjectService {
                  */
                 EquipmentCapacityDto equipmentCapacityDto = new EquipmentCapacityDto();
                 equipmentCapacityDto.setName("供电");
-                equipmentCapacityDto.setData(format.apply(BigDecimal.valueOf(synthesize_no_3_6.getNo65() + synthesize_no_3_6.getNo66() + synthesize_no_3_6.getNo67() + synthesize_no_3_6.getNo68())));
+                equipmentCapacityDto.setData(format.apply(BigDecimal.valueOf(/*synthesize_no_3_6.getNo65() + */synthesize_no_3_6.getNo66() + synthesize_no_3_6.getNo67() + synthesize_no_3_6.getNo68())));
                 equipmentCapacityDto.setType("1");
-                list.add(equipmentCapacityDto);
+                list.add(equipmentCapacityDto);//去掉 供电成本
             } else if ("2".equals(s)) {
                 /**
                  * 供热