项目部署算法修改

kgy
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
查看文件 @189ac6a
+++ b/synthesize_energy_api/src/main/java/com/synthesize_energy/item/web/service/impl/ProjectServiceImpl.java
查看文件 @189ac6a
@@ -393,9 +393,9 @@ public class ProjectServiceImpl implements ProjectService {
         synthesize_no_3_6.setNo113(0.0D);
         synthesize_no_3_6.setNo114(0.0D);
         synthesize_no_3_6.setNo115("0");
-        synthesize_no_3_6.setNo116(Double.valueOf(df.format(energySources.getNo2())));
+        synthesize_no_3_6.setNo116(Double.valueOf(df.format(synthesizeNo26ServiceById.getNo128())));
         synthesize_no_3_6.setNo117(0.0D);
-        synthesize_no_3_6.setNo118(Double.valueOf(df.format(energySources.getNo1())));
+        synthesize_no_3_6.setNo118(Double.valueOf(df.format(synthesizeNo26ServiceById.getNo129())));
         No_3_1Tall_Dto no_3_1Tall_dto = new No_3_1Tall_Dto();
         /**
          * 总投资
@@ -506,7 +506,7 @@ public class ProjectServiceImpl implements ProjectService {
                          * 风电
                          */
                         windAh = synthesize_no_2_4.getWindAh();
-                        windAll = windAh * cfmData.getNo5();
+                        windAll = windAh * synthesizeNo26ServiceById.getNo124();
                         synthesize_no_3_6.setNo52(windAll);
                     } else if ("3".equals(string)) {
                         /**
@@ -623,7 +623,7 @@ public class ProjectServiceImpl implements ProjectService {
                         Double num1 = Double.valueOf(df.format(windAh * synthesizeNo26ServiceById.getNo21() / 10));
                         synthesize_no_3_6.setNo37(num1);
                         no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1)));
-                        Double num2 = Double.valueOf(df.format(windAh * cfmData.getNo5() * synthesize_no_2_5.getElectricitySellingPrice() / 10000));
+                        Double num2 = Double.valueOf(df.format(windAh * synthesizeNo26ServiceById.getNo124() * synthesize_no_2_5.getElectricitySellingPrice() / 10000));
                         synthesize_no_3_6.setNo25(num2);
                         no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(num2)));
                         Double num3 = Double.valueOf(df.format(windAh * synthesizeNo26ServiceById.getNo22() * 1000 / 10000));
@@ -996,7 +996,7 @@ public class ProjectServiceImpl implements ProjectService {
                         Double num1 = Double.valueOf(df.format(electricBoilerInstalledCapacity * synthesizeNo26ServiceById.getNo37() / 10000));
                         synthesize_no_3_6.setNo42(num1);
                         no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1)));
-                        Double num2 = Double.valueOf(df.format((heatingIncome - (annualTotalHeatRequirement / synthesizeNo26ServiceById.getNo35() * 3600 / 36000) * energySources.getNo2()) / 10000));
+                        Double num2 = Double.valueOf(df.format((heatingIncome - (annualTotalHeatRequirement / synthesizeNo26ServiceById.getNo35() * 3600 / 36000) * synthesizeNo26ServiceById.getNo128()) / 10000));
                         synthesize_no_3_6.setNo30(num2);
                         no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(heatingIncome * Double.parseDouble(String.valueOf(jsonObject.get("hotD"))) / 100 / 10000)));
                         Double num3 = 0.0;
@@ -1368,7 +1368,7 @@ public class ProjectServiceImpl implements ProjectService {
                 /**
                  * 热水系统收益
                  */
-                double hotWaterSystemRevenue = ((totalAnnualTotalHotWaterRequirement * synthesize_no_2_5.getHotWaterSellingPrice() - annualTotalHotWaterRequirement * 0.4 / 0.9 / synthesizeNo26ServiceById.getNo53() * (8 * end + 2 * tall) / 10 - totalAnnualTotalHotWaterRequirement * energySources.getNo1()) / 10000);
+                double hotWaterSystemRevenue = ((totalAnnualTotalHotWaterRequirement * synthesize_no_2_5.getHotWaterSellingPrice() - annualTotalHotWaterRequirement * 0.4 / 0.9 / synthesizeNo26ServiceById.getNo53() * (8 * end + 2 * tall) / 10 - totalAnnualTotalHotWaterRequirement * synthesizeNo26ServiceById.getNo129()) / 10000);
                 java.text.NumberFormat nf = java.text.NumberFormat.getInstance();
                 nf.setGroupingUsed(false);
                 String format2 = nf.format(hotWaterSystemRevenue);
@@ -1646,7 +1646,7 @@ public class ProjectServiceImpl implements ProjectService {
                         /**
                          * 光伏年发电量
                          */
-                        annualPhotovoltaicPowerGeneration = photovoltaicInstall * cfmData.getNo3();
+                        annualPhotovoltaicPowerGeneration = photovoltaicInstall * synthesizeNo26ServiceById.getNo123();
                     } else {
                         /**
                          * 光伏装机容量=光伏可利用面积*有效铺设量/1000）"
@@ -1655,7 +1655,7 @@ public class ProjectServiceImpl implements ProjectService {
                         /**
                          * 光伏年发电量
                          */
-                        annualPhotovoltaicPowerGeneration = photovoltaicInstall * cfmData.getNo3();
+                        annualPhotovoltaicPowerGeneration = photovoltaicInstall * synthesizeNo26ServiceById.getNo123();
                     }
                 }
                 /**
@@ -1667,7 +1667,7 @@ public class ProjectServiceImpl implements ProjectService {
                     /**
                      * 风电年发量
                      */
-                    annualWindPowerGeneration = windAh * cfmData.getNo5();
+                    annualWindPowerGeneration = windAh * synthesizeNo26ServiceById.getNo124();
                 }
             }
@@ -2096,7 +2096,6 @@ public class ProjectServiceImpl implements ProjectService {
                     if (org.springframework.util.StringUtils.isEmpty(byId)) {
                         byId = synthesize_no_2_6Service.getById("1");
                     }
-
                     CityDict cityDict = cityDictService.getOne(new QueryWrapper<CityDict>().lambda().eq(CityDict::getName, site));
                     List<Synthesize_no_2_1> synthesize_no_2_1s1 = synthesize_no_2_1Service.list(new QueryWrapper<Synthesize_no_2_1>().lambda().eq(Synthesize_no_2_1::getPid, id));//建筑
                     double electricity = 0.0;