孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 wwmin
提交 0362061baf09a26eee3e8dd1f3fccd968cea71de 1 个父辈 7963bc51

售热售冷经济收入使用建筑面积计算

内嵌 并排对比
正在显示 1 个修改的文件 包含 24 行增加 和 17 行删除
@@ -417,21 +417,25 @@ public class ProjectServiceImpl implements ProjectService { @@ -417,21 +417,25 @@ public class ProjectServiceImpl implements ProjectService {
417 * 总成本 417 * 总成本
418 */ 418 */
419 Double totalAll = 0.0; 419 Double totalAll = 0.0;
  420 + /**
  421 + * 建筑面积
  422 + */
  423 + double architectureArea = 0.0;
  424 + if(!synthesize_no_2_1s.isEmpty()){
  425 + for (Synthesize_no_2_1 synthesize_no_2_1 : synthesize_no_2_1s){
  426 + architectureArea += synthesize_no_2_1.getArchitectureArea();
  427 + }
  428 + }
420 for (String s : split) { 429 for (String s : split) {
421 if ("1".equals(s)) { 430 if ("1".equals(s)) {
422 String[] strings = synthesize_no_2_3.getPowerSupply().split(",");// 1光伏 2风电 3持续供电 4一充一放5两充两放 431 String[] strings = synthesize_no_2_3.getPowerSupply().split(",");// 1光伏 2风电 3持续供电 4一充一放5两充两放
423 /** 432 /**
424 - * 建筑面积  
425 - */  
426 - double architectureArea = 0.0;  
427 - /**  
428 * 设计电负荷 433 * 设计电负荷
429 */ 434 */
430 int electricity = 0; 435 int electricity = 0;
431 List<Sort> names = new ArrayList<>();//建筑Name 436 List<Sort> names = new ArrayList<>();//建筑Name
432 if (!synthesize_no_2_1s.isEmpty()) { 437 if (!synthesize_no_2_1s.isEmpty()) {
433 for (Synthesize_no_2_1 synthesize_no_2_1 : synthesize_no_2_1s) { 438 for (Synthesize_no_2_1 synthesize_no_2_1 : synthesize_no_2_1s) {
434 - architectureArea += synthesize_no_2_1.getArchitectureArea();  
435 Sort sort = sortMapper.selectById(synthesize_no_2_1.getBuildingTypeId()); 439 Sort sort = sortMapper.selectById(synthesize_no_2_1.getBuildingTypeId());
436 names.add(sort); 440 names.add(sort);
437 } 441 }
@@ -471,7 +475,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -471,7 +475,7 @@ public class ProjectServiceImpl implements ProjectService {
471 /** 475 /**
472 * 光伏装机容量 476 * 光伏装机容量
473 * 477 *
474 - * "当（光伏可利用面积*有效铺设量/1000）>建筑面积*设计电负荷 478 + * "当（光伏可利用面积*铺设比例/1000）>建筑面积*设计电负荷
475 */ 479 */
476 double photovoltaicInstall = 0.0; 480 double photovoltaicInstall = 0.0;
477 /** 481 /**
@@ -494,7 +498,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -494,7 +498,7 @@ public class ProjectServiceImpl implements ProjectService {
494 * 储能装机容量 498 * 储能装机容量
495 */ 499 */
496 double storedEnergyInstallCapacity = 0.0; 500 double storedEnergyInstallCapacity = 0.0;
497 - double storeItemListTotal= 0.0; 501 + double storeItemListTotal = 0.0;
498 for (String string : strings) { 502 for (String string : strings) {
499 if ("1".equals(string)) { 503 if ("1".equals(string)) {
500 /** 504 /**
@@ -507,7 +511,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -507,7 +511,7 @@ public class ProjectServiceImpl implements ProjectService {
507 photovoltaicInstall = architectureArea * electricity / 1000; 511 photovoltaicInstall = architectureArea * electricity / 1000;
508 } else { 512 } else {
509 /** 513 /**
510 - * 光伏装机容量=光伏可利用面积*有效铺设量/1000）" 514 + * 光伏装机容量=光伏可利用面积*铺设比例/1000）"
511 */ 515 */
512 photovoltaicInstall = synthesize_no_2_4.getPhotovoltaicArea() * synthesizeNo26ServiceById.getNo16() / 1000; 516 photovoltaicInstall = synthesize_no_2_4.getPhotovoltaicArea() * synthesizeNo26ServiceById.getNo16() / 1000;
513 } 517 }
@@ -884,8 +888,10 @@ public class ProjectServiceImpl implements ProjectService { @@ -884,8 +888,10 @@ public class ProjectServiceImpl implements ProjectService {
884 if ("1".equals(synthesize_no_2_5.getUnit1())) { 888 if ("1".equals(synthesize_no_2_5.getUnit1())) {
885 /** 889 /**
886 * 选择单位 （元/m2） 890 * 选择单位 （元/m2）
  891 + * 供热收入=供热面积*售热价格
  892 + * 供热收入=建筑面积*售热价格 (使用建筑面积算收入)
887 */ 893 */
888 - heatingIncome = heatArea * synthesize_no_2_5.getHotSellingPrice(); 894 + heatingIncome = architectureArea * synthesize_no_2_5.getHotSellingPrice();
889 } else { 895 } else {
890 /** 896 /**
891 * 选择单位 元/GJ 897 * 选择单位 元/GJ
@@ -1244,9 +1250,10 @@ public class ProjectServiceImpl implements ProjectService { @@ -1244,9 +1250,10 @@ public class ProjectServiceImpl implements ProjectService {
1244 if ("1".equals(synthesize_no_2_5.getUnit2())) { 1250 if ("1".equals(synthesize_no_2_5.getUnit2())) {
1245 /** 1251 /**
1246 * 选择单位 （元/m2） 1252 * 选择单位 （元/m2）
1247 - * 供冷收入=供冷面积*售冷价格 1253 + * -供冷收入=供冷面积*售冷价格-
  1254 + * 供冷收入=建筑面积*售冷价格
1248 */ 1255 */
1249 - coolingIncome = coldArea * synthesize_no_2_5.getColdSellingPrice(); 1256 + coolingIncome = architectureArea * synthesize_no_2_5.getColdSellingPrice();
1250 } else { 1257 } else {
1251 /** 1258 /**
1252 * 选择单位 元/GJ 1259 * 选择单位 元/GJ
@@ -1721,7 +1728,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -1721,7 +1728,7 @@ public class ProjectServiceImpl implements ProjectService {
1721 /** 1728 /**
1722 * 光伏装机容量 1729 * 光伏装机容量
1723 * 1730 *
1724 - * "当（光伏可利用面积*有效铺设量/1000）>建筑面积*设计电负荷 1731 + * "当（光伏可利用面积*铺设比例/1000）>建筑面积*设计电负荷
1725 */ 1732 */
1726 double photovoltaicInstall = 0.0; 1733 double photovoltaicInstall = 0.0;
1727 if (!StringUtils.isEmpty(synthesize_no_2_4.getPhotovoltaicArea())) { 1734 if (!StringUtils.isEmpty(synthesize_no_2_4.getPhotovoltaicArea())) {
@@ -1736,7 +1743,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -1736,7 +1743,7 @@ public class ProjectServiceImpl implements ProjectService {
1736 annualPhotovoltaicPowerGeneration = photovoltaicInstall * synthesizeNo26ServiceById.getNo123(); 1743 annualPhotovoltaicPowerGeneration = photovoltaicInstall * synthesizeNo26ServiceById.getNo123();
1737 } else { 1744 } else {
1738 /** 1745 /**
1739 - * 光伏装机容量=光伏可利用面积*有效铺设量/1000）" 1746 + * 光伏装机容量=光伏可利用面积*铺设比例/1000）"
1740 */ 1747 */
1741 photovoltaicInstall = synthesize_no_2_4.getPhotovoltaicArea() * synthesizeNo26ServiceById.getNo16() / 1000; 1748 photovoltaicInstall = synthesize_no_2_4.getPhotovoltaicArea() * synthesizeNo26ServiceById.getNo16() / 1000;
1742 /** 1749 /**
@@ -3792,7 +3799,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -3792,7 +3799,7 @@ public class ProjectServiceImpl implements ProjectService {
3792 } else { 3799 } else {
3793 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh"); 3800 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
3794 } 3801 }
3795 - List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p->{ 3802 + List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p -> {
3796 double d = Double.parseDouble(p.getData()); 3803 double d = Double.parseDouble(p.getData());
3797 if (d >= 10000) { 3804 if (d >= 10000) {
3798 p.setData(format.apply(new BigDecimal(d / 10000))); 3805 p.setData(format.apply(new BigDecimal(d / 10000)));
@@ -3869,7 +3876,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -3869,7 +3876,7 @@ public class ProjectServiceImpl implements ProjectService {
3869 } else { 3876 } else {
3870 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh"); 3877 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
3871 } 3878 }
3872 - List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p->{ 3879 + List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p -> {
3873 double d = Double.parseDouble(p.getData()); 3880 double d = Double.parseDouble(p.getData());
3874 if (d >= 10000) { 3881 if (d >= 10000) {
3875 p.setData(format.apply(new BigDecimal(d / 10000))); 3882 p.setData(format.apply(new BigDecimal(d / 10000)));
@@ -3939,7 +3946,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -3939,7 +3946,7 @@ public class ProjectServiceImpl implements ProjectService {
3939 } else { 3946 } else {
3940 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh"); 3947 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
3941 } 3948 }
3942 - List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p->{ 3949 + List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p -> {
3943 double d = Double.parseDouble(p.getData()); 3950 double d = Double.parseDouble(p.getData());
3944 if (d >= 10000) { 3951 if (d >= 10000) {
3945 p.setData(format.apply(new BigDecimal(d / 10000))); 3952 p.setData(format.apply(new BigDecimal(d / 10000)));
@@ -3997,7 +4004,7 @@ public class ProjectServiceImpl implements ProjectService { @@ -3997,7 +4004,7 @@ public class ProjectServiceImpl implements ProjectService {
3997 } else { 4004 } else {
3998 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh"); 4005 equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
3999 } 4006 }
4000 - List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p->{ 4007 + List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p -> {
4001 double d = Double.parseDouble(p.getData()); 4008 double d = Double.parseDouble(p.getData());
4002 if (d >= 10000) { 4009 if (d >= 10000) {
4003 p.setData(format.apply(new BigDecimal(d / 10000))); 4010 p.setData(format.apply(new BigDecimal(d / 10000)));