孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 wwmin
提交 d6e779f3b3f20899fef51f69c007888ee57374f9 2 个父辈 17d9e302 8d53676e

Merge branch 'master' of http://114.215.101.231:8099/kgy/synthesize_energy_project 

# Conflicts:
#	synthesize_energy_api/src/main/java/com/synthesize_energy/item/web/service/impl/ProjectServiceImpl.java
内嵌 并排对比
正在显示 1 个修改的文件 包含 51 行增加 和 23 行删除
... ... @@ -327,7 +327,7 @@ public class ProjectServiceImpl implements ProjectService {
synthesize_no_3_6.setNo222(0.0D);
synthesize_no_3_6.setNo223(0.0D);
synthesize_no_3_6.setNo224(0.0D);
List<CalculateLoad> list1 = calculateLoadService.list(new LambdaQueryWrapper<CalculateLoad>().eq(CalculateLoad::getCid, id));// 年总需电量 年总需热量 年总需冷量
//List<CalculateLoad> list1 = calculateLoadService.list(new LambdaQueryWrapper<CalculateLoad>().eq(CalculateLoad::getCid, id));// 年总需电量 年总需热量 年总需冷量
synthesize_no_3_6.setId(id);
synthesize_no_3_6.setNo1("0");
synthesize_no_3_6.setNo2(0.0D);
... ... @@ -556,9 +556,15 @@ public class ProjectServiceImpl implements ProjectService {
* 10 * 365 * architectureArea * electricity * 0.8 / 1000
*/
double electricityAll = 0.0;
for (CalculateLoad calculateLoad : list1) {
electricityAll += calculateLoad.getNo11();
for (Synthesize_no_2_1 synthesize_no_2_1 : synthesize_no_2_1s) {
CalculateLoad calculateLoad = calculateLoadService.getById(synthesize_no_2_1.getId());
if (Objects.nonNull(calculateLoad.getNo11())) {
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()))));
/**
... ... @@ -829,7 +835,7 @@ public class ProjectServiceImpl implements ProjectService {
double level = synthesizeNo26ServiceById.getNo126();
double end = synthesizeNo26ServiceById.getNo127();
for (int i = 0; i < names.size(); i++) {
String zd_name = "no_" + names.get(i).getId();
//String zd_name = "no_" + names.get(i).getId();
CalculateLoad calculateLoad = calculateLoadService.getById(synthesize_no_2_1s.get(i).getId());
Synthesize_no_2_1 synthesize_no_2_1 = synthesize_no_2_1Service.getById(synthesize_no_2_1s.get(i).getId());
if (!StringUtils.isEmpty(calculateLoad)) {
... ... @@ -877,9 +883,15 @@ public class ProjectServiceImpl implements ProjectService {
java.text.NumberFormat nf = java.text.NumberFormat.getInstance();
nf.setGroupingUsed(false);
double annualTotalHeatRequirement = 0.0;
for (CalculateLoad calculateLoad : list1) {
annualTotalHeatRequirement += calculateLoad.getNo22();
for (Synthesize_no_2_1 synthesize_no_2_1 : synthesize_no_2_1s) {
CalculateLoad calculateLoad = calculateLoadService.getById(synthesize_no_2_1.getId());
if (Objects.nonNull(calculateLoad.getNo22())) {
annualTotalHeatRequirement += calculateLoad.getNo22();
}
}
/* for (CalculateLoad calculateLoad : list1) {
annualTotalHeatRequirement += calculateLoad.getNo22();
}*/
String format2 = nf.format(annualTotalHeatRequirement);
/**
* 电锅炉年供热量
... ... @@ -1242,18 +1254,28 @@ public class ProjectServiceImpl implements ProjectService {
* =10*150*供冷面积*设计冷负荷*0.75/1000
* 8 * 150 * coldArea * coldLoadAll * 0.75 / 1000
*/
double annualTotalColdRequirement = 0.0;
for (CalculateLoad calculateLoad : list1) {
annualTotalColdRequirement += calculateLoad.getNo33();
double annualTotalColdRequirement = 0.0;//冷
double AnnualTotalHeatRequirement = 0.0;//热
for (Synthesize_no_2_1 synthesize_no_2_1 : synthesize_no_2_1s) {
CalculateLoad calculateLoad = calculateLoadService.getById(synthesize_no_2_1.getId());
if (Objects.nonNull(calculateLoad.getNo33())) {
annualTotalColdRequirement += calculateLoad.getNo33();//冷
}
if (Objects.nonNull(calculateLoad.getNo22())) {
AnnualTotalHeatRequirement += calculateLoad.getNo22();//热
}
}
/* for (CalculateLoad calculateLoad : list1) {
annualTotalHeatRequirement += calculateLoad.getNo33();
}*/
java.text.NumberFormat nf = java.text.NumberFormat.getInstance();
nf.setGroupingUsed(false);
/**年总需热量*/
double AnnualTotalHeatRequirement = 0.0;
for (CalculateLoad calculateLoad : list1) {
// double AnnualTotalHeatRequirement = 0.0;
/* for (CalculateLoad calculateLoad : list1) {
AnnualTotalHeatRequirement += calculateLoad.getNo22();
}
String format1 = nf.format(AnnualTotalHeatRequirement);
}*/
//String format1 = nf.format(AnnualTotalHeatRequirement);
synthesize_no_3_6.setNo234(coldStorageCapacity);
/**
* 供冷收入
... ... @@ -1461,9 +1483,15 @@ public class ProjectServiceImpl implements ProjectService {
*/
double totalAnnualHotWaterDemand = hotWaterQuota * waterPersonNum * hotWaterDays / 1000;
double totalAnnualTotalHotWaterRequirement = 0.0;
for (CalculateLoad calculateLoad : list1) {
totalAnnualTotalHotWaterRequirement += calculateLoad.getNo44();
for (Synthesize_no_2_1 synthesize_no_2_1 : synthesize_no_2_1s) {
CalculateLoad calculateLoad = calculateLoadService.getById(synthesize_no_2_1.getId());
if (Objects.nonNull(calculateLoad.getNo44())){
totalAnnualTotalHotWaterRequirement += calculateLoad.getNo44();
}
}
/* for (CalculateLoad calculateLoad : list1) {
}*/
synthesize_no_3_6.setNo20(Double.valueOf(df.format(totalAnnualTotalHotWaterRequirement)));
/**
... ... @@ -1958,10 +1986,10 @@ public class ProjectServiceImpl implements ProjectService {
case 4:
case 5:
case 6:
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue)*0.12) * 0.25 / 2);
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue) * 0.12) * 0.25 / 2);
break;
default:
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue)*0.12) * 0.25);
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue) * 0.12) * 0.25);
break;
}
}
... ... @@ -1970,7 +1998,7 @@ public class ProjectServiceImpl implements ProjectService {
* 高新技术企业
*/
for (Integer i = 0; i < npvData.getYear(); i++) {
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue)*0.12) * 0.15);
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue) * 0.12) * 0.15);
}
list.set(0, -synthesize_no_3_6.getNo300() - otherIncome);
} else if ("1,2".equals(synthesize_no_2_5.getSale())) {
... ... @@ -1990,10 +2018,10 @@ public class ProjectServiceImpl implements ProjectService {
case 4:
case 5:
case 6:
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue)*0.12) * 0.15 / 2);
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue) * 0.12) * 0.15 / 2);
break;
default:
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue)*0.12) * 0.15);
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue) * 0.12) * 0.15);
break;
}
}
... ... @@ -2003,7 +2031,7 @@ public class ProjectServiceImpl implements ProjectService {
*/
for (int i = 0; i <= yearLength; i++) {
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue)*0.12) * 0.25);
list.add(profit - (originalValue - synthesize_no_3_6.getNo300() / yearLength - annualTotalTransportationCost - (annualIncome - originalValue) * 0.12) * 0.25);
}
list.set(0, -synthesize_no_3_6.getNo300());
}
... ... @@ -2045,7 +2073,7 @@ public class ProjectServiceImpl implements ProjectService {
break;
}
}
double spp = year + Math.abs(sum1) / sum2 ;
double spp = year + Math.abs(sum1) / sum2;
map.put("num3", df.format(spp));
/**
* 动态投资回收期（DPP）
... ... @@ -2064,7 +2092,7 @@ public class ProjectServiceImpl implements ProjectService {
break;
}
}
double dpp = year3 + Math.abs(sum3) / sum4 ;
double dpp = year3 + Math.abs(sum3) / sum4;
map.put("num4", df.format(dpp));
return map;
}
... ...