孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 kgy
提交 35ca677d35a98d9afbd3a5d3cb2eb22b710e9835 1 个父辈 69065ee2

修改

内嵌 并排对比
正在显示 1 个修改的文件 包含 12 行增加 和 5 行删除
@@ -634,7 +634,14 @@ public class ProjectServiceImpl implements ProjectService { @@ -634,7 +634,14 @@ public class ProjectServiceImpl implements ProjectService {
634 Double num1 = Double.valueOf(df.format(windAh * synthesizeNo26ServiceById.getNo21() / 10)); 634 Double num1 = Double.valueOf(df.format(windAh * synthesizeNo26ServiceById.getNo21() / 10));
635 synthesize_no_3_6.setNo37(num1); 635 synthesize_no_3_6.setNo37(num1);
636 no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1))); 636 no_3_1_1_1Dto.setInvestmentEstimation(format.apply(new BigDecimal(num1)));
637 - Double num2 = Double.valueOf(df.format(windAh * synthesizeNo26ServiceById.getNo124() * synthesize_no_2_5.getElectricitySellingPrice() / 10000)); 637 + Double fd = windAh * synthesizeNo26ServiceById.getNo124();
  638 + Double num2 = 0d;
  639 + if(fd>electricityAll){
  640 + num2 = Double.valueOf(df.format(electricityAll * synthesize_no_2_5.getElectricitySellingPrice() / 10000));
  641 + }else{
  642 + num2 = Double.valueOf(df.format(fd * synthesize_no_2_5.getElectricitySellingPrice() / 10000));
  643 + }
  644 +
638 synthesize_no_3_6.setNo25(num2); 645 synthesize_no_3_6.setNo25(num2);
639 no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(num2))); 646 no_3_1_1_1Dto.setProjectEarnings(format.apply(new BigDecimal(num2)));
640 Double num3 = Double.valueOf(df.format(windAh * synthesizeNo26ServiceById.getNo22() * 1000 / 10000)); 647 Double num3 = Double.valueOf(df.format(windAh * synthesizeNo26ServiceById.getNo22() * 1000 / 10000));
@@ -1779,18 +1786,18 @@ public class ProjectServiceImpl implements ProjectService { @@ -1779,18 +1786,18 @@ public class ProjectServiceImpl implements ProjectService {
1779 * 节约标煤=（光伏发电量+风电发电量+年需热量/（空气源热泵能效比-1）/0.9+年需供热量/（1-电锅炉热效率）+年需供热量/（1-燃气锅炉热效率）+年需热量/（多联机空调能效比-1）+年蓄热量/3+年需冷量/ 1786 * 节约标煤=（光伏发电量+风电发电量+年需热量/（空气源热泵能效比-1）/0.9+年需供热量/（1-电锅炉热效率）+年需供热量/（1-燃气锅炉热效率）+年需热量/（多联机空调能效比-1）+年蓄热量/3+年需冷量/
1780 * （空气源热泵能效比-1）+年需供冷量/（冷水机组能效比-1）+年需冷量/（多联机空调能效比-1）+年蓄冷量/3+[4.2*年总需热水热量/0.9*（0.6+0.4/（空气源热泵（热水型）COP-1）]）*0.404/1000 1787 * （空气源热泵能效比-1）+年需供冷量/（冷水机组能效比-1）+年需冷量/（多联机空调能效比-1）+年蓄冷量/3+[4.2*年总需热水热量/0.9*（0.6+0.4/（空气源热泵（热水型）COP-1）]）*0.404/1000
1781 */ 1788 */
1782 - double savingStandardCoal = ((synthesize_no_3_6.getNo51() + synthesize_no_3_6.getNo52() + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo26() - 1) / 0.9 + synthesize_no_3_6.getNo55() / 1789 + double savingStandardCoal = (((synthesize_no_3_6.getNo51() + synthesize_no_3_6.getNo52() + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo26() - 1) / 0.9 + synthesize_no_3_6.getNo55() /
1783 (1 - synthesizeNo26ServiceById.getNo23()) + synthesize_no_3_6.getNo57() / (1 - synthesizeNo26ServiceById.getNo35()) + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo100() - 1) + synthesize_no_3_6.getNo233() / 3 + Double.parseDouble(format2) 1790 (1 - synthesizeNo26ServiceById.getNo23()) + synthesize_no_3_6.getNo57() / (1 - synthesizeNo26ServiceById.getNo35()) + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo100() - 1) + synthesize_no_3_6.getNo233() / 3 + Double.parseDouble(format2)
1784 / (synthesizeNo26ServiceById.getNo38() - 1) + synthesize_no_3_6.getNo58() / (synthesizeNo26ServiceById.getNo47() - 1) + Double.parseDouble(format2) / 1791 / (synthesizeNo26ServiceById.getNo38() - 1) + synthesize_no_3_6.getNo58() / (synthesizeNo26ServiceById.getNo47() - 1) + Double.parseDouble(format2) /
1785 - (synthesizeNo26ServiceById.getNo101() - 1) + synthesize_no_3_6.getNo234() / 3 + (4.2 * synthesize_no_3_6.getNo62() / 0.9 * (0.6 + 0.4 / (synthesizeNo26ServiceById.getNo53() - 1))) * 0.404 / 1000)); 1792 + (synthesizeNo26ServiceById.getNo101() - 1) + synthesize_no_3_6.getNo234() / 3 + (4.2 * synthesize_no_3_6.getNo62() / 0.9 * (0.6 + 0.4 / (synthesizeNo26ServiceById.getNo53() - 1)))) * 0.404 / 1000));
1786 /** 1793 /**
1787 * @description 二氧化碳减排 =（光伏发电量+风电发电量+[4.2*年总需热水热量/0.9*（0.6+0.4*（空气源热泵（热水型）COP-1）]）*0.03/1000 1794 * @description 二氧化碳减排 =（光伏发电量+风电发电量+[4.2*年总需热水热量/0.9*（0.6+0.4*（空气源热泵（热水型）COP-1）]）*0.03/1000
1788 * 节约标煤=（光伏发电量+风电发电量+年需热量/（热泵能效比-1）/0.9+年需供热量/（1-电锅炉热效率）+年需供热量/（1-燃气锅炉热效率）+年需热量/（多联机空调能效比-1）+年蓄热量/3+年需冷量/（空气源热泵能效比-1）+年需供冷量/（冷水机组能效比-1）+年需冷量/（多联机空调能效比-1）+年蓄冷量/3+[4.2*年总需热水热量/0.9*（0.6+0.4/（空气源热泵（热水型）COP-1）]）*0.03/1000 1795 * 节约标煤=（光伏发电量+风电发电量+年需热量/（热泵能效比-1）/0.9+年需供热量/（1-电锅炉热效率）+年需供热量/（1-燃气锅炉热效率）+年需热量/（多联机空调能效比-1）+年蓄热量/3+年需冷量/（空气源热泵能效比-1）+年需供冷量/（冷水机组能效比-1）+年需冷量/（多联机空调能效比-1）+年蓄冷量/3+[4.2*年总需热水热量/0.9*（0.6+0.4/（空气源热泵（热水型）COP-1）]）*0.03/1000
1789 */ 1796 */
1790 - double co2Reduction = ((synthesize_no_3_6.getNo51() + synthesize_no_3_6.getNo52() + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo26() - 1) / 0.9 + synthesize_no_3_6.getNo54() / (1 - synthesizeNo26ServiceById.getNo23()) + 1797 + double co2Reduction = (((synthesize_no_3_6.getNo51() + synthesize_no_3_6.getNo52() + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo26() - 1) / 0.9 + synthesize_no_3_6.getNo54() / (1 - synthesizeNo26ServiceById.getNo23()) +
1791 synthesize_no_3_6.getNo57() / (1 - synthesizeNo26ServiceById.getNo35()) + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo100() - 1) + synthesize_no_3_6.getNo233() / 3 + 1798 synthesize_no_3_6.getNo57() / (1 - synthesizeNo26ServiceById.getNo35()) + Double.parseDouble(format) / (synthesizeNo26ServiceById.getNo100() - 1) + synthesize_no_3_6.getNo233() / 3 +
1792 Double.parseDouble(format2) / (synthesizeNo26ServiceById.getNo47() - 1) + synthesize_no_3_6.getNo59() / (synthesizeNo26ServiceById.getNo38() - 1) + Double.parseDouble(format2) / (synthesizeNo26ServiceById.getNo101() - 1) 1799 Double.parseDouble(format2) / (synthesizeNo26ServiceById.getNo47() - 1) + synthesize_no_3_6.getNo59() / (synthesizeNo26ServiceById.getNo38() - 1) + Double.parseDouble(format2) / (synthesizeNo26ServiceById.getNo101() - 1)
1793 - + synthesize_no_3_6.getNo234() / 3 + (4.2 * synthesize_no_3_6.getNo62() / 0.9 * (0.6 + 0.4 / (synthesizeNo26ServiceById.getNo53() - 1))) * 0.03 / 1000)); 1800 + + synthesize_no_3_6.getNo234() / 3 + (4.2 * synthesize_no_3_6.getNo62() / 0.9 * (0.6 + 0.4 / (synthesizeNo26ServiceById.getNo53() - 1)))) * 0.997 / 1000));
1794 Map<String, Object> map = new HashMap<>(2); 1801 Map<String, Object> map = new HashMap<>(2);
1795 if (savingStandardCoal == 0) { 1802 if (savingStandardCoal == 0) {
1796 map.put("num1", 0 + "吨"); 1803 map.put("num1", 0 + "吨");