...
|
...
|
@@ -417,21 +417,25 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
* 总成本
|
|
|
*/
|
|
|
Double totalAll = 0.0;
|
|
|
/**
|
|
|
* 建筑面积
|
|
|
*/
|
|
|
double architectureArea = 0.0;
|
|
|
if(!synthesize_no_2_1s.isEmpty()){
|
|
|
for (Synthesize_no_2_1 synthesize_no_2_1 : synthesize_no_2_1s){
|
|
|
architectureArea += synthesize_no_2_1.getArchitectureArea();
|
|
|
}
|
|
|
}
|
|
|
for (String s : split) {
|
|
|
if ("1".equals(s)) {
|
|
|
String[] strings = synthesize_no_2_3.getPowerSupply().split(",");// 1光伏 2风电 3持续供电 4一充一放5两充两放
|
|
|
/**
|
|
|
* 建筑面积
|
|
|
*/
|
|
|
double architectureArea = 0.0;
|
|
|
/**
|
|
|
* 设计电负荷
|
|
|
*/
|
|
|
int electricity = 0;
|
|
|
List<Sort> names = new ArrayList<>();//建筑Name
|
|
|
if (!synthesize_no_2_1s.isEmpty()) {
|
|
|
for (Synthesize_no_2_1 synthesize_no_2_1 : synthesize_no_2_1s) {
|
|
|
architectureArea += synthesize_no_2_1.getArchitectureArea();
|
|
|
Sort sort = sortMapper.selectById(synthesize_no_2_1.getBuildingTypeId());
|
|
|
names.add(sort);
|
|
|
}
|
...
|
...
|
@@ -471,7 +475,7 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
/**
|
|
|
* 光伏装机容量
|
|
|
*
|
|
|
* "当(光伏可利用面积*有效铺设量/1000)>建筑面积*设计电负荷
|
|
|
* "当(光伏可利用面积*铺设比例/1000)>建筑面积*设计电负荷
|
|
|
*/
|
|
|
double photovoltaicInstall = 0.0;
|
|
|
/**
|
...
|
...
|
@@ -494,7 +498,7 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
* 储能装机容量
|
|
|
*/
|
|
|
double storedEnergyInstallCapacity = 0.0;
|
|
|
double storeItemListTotal= 0.0;
|
|
|
double storeItemListTotal = 0.0;
|
|
|
for (String string : strings) {
|
|
|
if ("1".equals(string)) {
|
|
|
/**
|
...
|
...
|
@@ -507,7 +511,7 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
photovoltaicInstall = architectureArea * electricity / 1000;
|
|
|
} else {
|
|
|
/**
|
|
|
* 光伏装机容量=光伏可利用面积*有效铺设量/1000)"
|
|
|
* 光伏装机容量=光伏可利用面积*铺设比例/1000)"
|
|
|
*/
|
|
|
photovoltaicInstall = synthesize_no_2_4.getPhotovoltaicArea() * synthesizeNo26ServiceById.getNo16() / 1000;
|
|
|
}
|
...
|
...
|
@@ -884,8 +888,10 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
if ("1".equals(synthesize_no_2_5.getUnit1())) {
|
|
|
/**
|
|
|
* 选择单位 (元/m2)
|
|
|
* 供热收入=供热面积*售热价格
|
|
|
* 供热收入=建筑面积*售热价格 (使用建筑面积算收入)
|
|
|
*/
|
|
|
heatingIncome = heatArea * synthesize_no_2_5.getHotSellingPrice();
|
|
|
heatingIncome = architectureArea * synthesize_no_2_5.getHotSellingPrice();
|
|
|
} else {
|
|
|
/**
|
|
|
* 选择单位 元/GJ
|
...
|
...
|
@@ -1244,9 +1250,10 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
if ("1".equals(synthesize_no_2_5.getUnit2())) {
|
|
|
/**
|
|
|
* 选择单位 (元/m2)
|
|
|
* 供冷收入=供冷面积*售冷价格
|
|
|
* -供冷收入=供冷面积*售冷价格-
|
|
|
* 供冷收入=建筑面积*售冷价格
|
|
|
*/
|
|
|
coolingIncome = coldArea * synthesize_no_2_5.getColdSellingPrice();
|
|
|
coolingIncome = architectureArea * synthesize_no_2_5.getColdSellingPrice();
|
|
|
} else {
|
|
|
/**
|
|
|
* 选择单位 元/GJ
|
...
|
...
|
@@ -1721,7 +1728,7 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
/**
|
|
|
* 光伏装机容量
|
|
|
*
|
|
|
* "当(光伏可利用面积*有效铺设量/1000)>建筑面积*设计电负荷
|
|
|
* "当(光伏可利用面积*铺设比例/1000)>建筑面积*设计电负荷
|
|
|
*/
|
|
|
double photovoltaicInstall = 0.0;
|
|
|
if (!StringUtils.isEmpty(synthesize_no_2_4.getPhotovoltaicArea())) {
|
...
|
...
|
@@ -1736,7 +1743,7 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
annualPhotovoltaicPowerGeneration = photovoltaicInstall * synthesizeNo26ServiceById.getNo123();
|
|
|
} else {
|
|
|
/**
|
|
|
* 光伏装机容量=光伏可利用面积*有效铺设量/1000)"
|
|
|
* 光伏装机容量=光伏可利用面积*铺设比例/1000)"
|
|
|
*/
|
|
|
photovoltaicInstall = synthesize_no_2_4.getPhotovoltaicArea() * synthesizeNo26ServiceById.getNo16() / 1000;
|
|
|
/**
|
...
|
...
|
@@ -3792,7 +3799,7 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
} else {
|
|
|
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
|
|
|
}
|
|
|
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p->{
|
|
|
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p -> {
|
|
|
double d = Double.parseDouble(p.getData());
|
|
|
if (d >= 10000) {
|
|
|
p.setData(format.apply(new BigDecimal(d / 10000)));
|
...
|
...
|
@@ -3869,7 +3876,7 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
} else {
|
|
|
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
|
|
|
}
|
|
|
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p->{
|
|
|
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p -> {
|
|
|
double d = Double.parseDouble(p.getData());
|
|
|
if (d >= 10000) {
|
|
|
p.setData(format.apply(new BigDecimal(d / 10000)));
|
...
|
...
|
@@ -3939,7 +3946,7 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
} else {
|
|
|
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
|
|
|
}
|
|
|
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p->{
|
|
|
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p -> {
|
|
|
double d = Double.parseDouble(p.getData());
|
|
|
if (d >= 10000) {
|
|
|
p.setData(format.apply(new BigDecimal(d / 10000)));
|
...
|
...
|
@@ -3997,7 +4004,7 @@ public class ProjectServiceImpl implements ProjectService { |
|
|
} else {
|
|
|
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
|
|
|
}
|
|
|
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p->{
|
|
|
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).map(p -> {
|
|
|
double d = Double.parseDouble(p.getData());
|
|
|
if (d >= 10000) {
|
|
|
p.setData(format.apply(new BigDecimal(d / 10000)));
|
...
|
...
|
|