孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 kgy
提交 c3ad99353583bf82453dfd099c7ce31fb79d4e91 2 个父辈 2a275015 5fce76ba

Merge remote-tracking branch 'kgy/master' into master

内嵌 并排对比
正在显示 2 个修改的文件 包含 38 行增加 和 38 行删除
... ... @@ -18,11 +18,11 @@ public class EquipmentCapacityDto {
public void setName(String name) {
this.name = name;
this.unit = "万kW";
this.unit = "kW";
}
public void setData(String data) {
this.data = data;
this.unit = "万kW";
this.unit = "kW";
}
}
... ...
... ... @@ -2469,7 +2469,7 @@ public class ProjectServiceImpl implements ProjectService {
* 风机盘管
* * 2
*/
hotLoadAll = synthesize_no_2_1.getDesignHeatLoadIndex() * 2;
hotLoadAll = synthesize_no_2_1.getDesignHeatLoadIndex() * 1.6;
}
Assert.notNull(synthesize_no_2_1.getHeatDay(), "供热天数为空了");
Integer di = calculatedTemperatureInHeatingRoomMapper.queryName(zd_name, dict.getId());
... ... @@ -2652,10 +2652,10 @@ public class ProjectServiceImpl implements ProjectService {
designHeatLoad += synthesize_no_2_1.getDesignHeatLoadIndex() * 0.9;
} else if ("3".equals(synthesize_no_2_1.getHeatEnd())) {
/**
* 等级盘管
* 风机盘管
* * 2
*/
designHeatLoad += synthesize_no_2_1.getDesignHeatLoadIndex() * 2;
designHeatLoad += synthesize_no_2_1.getDesignHeatLoadIndex() * 1.6;
}
}
double v = annualHeatSupply * 1000 / (heatingArea * designHeatLoad) / 130;
... ... @@ -2693,10 +2693,10 @@ public class ProjectServiceImpl implements ProjectService {
designCoolingLoad += synthesize_no_2_1.getDesignHeatLoadIndex() * 0.9;
} else if ("3".equals(synthesize_no_2_1.getHeatEnd())) {
/**
* 等级盘管
* 风机盘管
* * 2
*/
designCoolingLoad += synthesize_no_2_1.getDesignHeatLoadIndex() * 2;
designCoolingLoad += synthesize_no_2_1.getDesignHeatLoadIndex() * 1.6;
}
}
double v = annualCoolingCapacity * 1000 / (coolingArea * designCoolingLoad) / 150;
... ... @@ -2829,10 +2829,10 @@ public class ProjectServiceImpl implements ProjectService {
hotLoadAll = synthesizeNo21.getDesignHeatLoadIndex() * 0.9;
} else if ("3".equals(synthesizeNo21.getHeatEnd())) {
/**
* 等级盘管
* 风机盘管
* * 2
*/
hotLoadAll = synthesizeNo21.getDesignHeatLoadIndex() * 2;
hotLoadAll = synthesizeNo21.getDesignHeatLoadIndex() * 1.6;
}
Assert.notNull(synthesizeNo21.getHeatDay(), "供热天数为空了");
Integer di = calculatedTemperatureInHeatingRoomMapper.queryName(zd_name, dict.getId());
... ... @@ -3029,19 +3029,19 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
// if (flag) {
// if (Double.parseDouble(poweredBy) >= 10000) {
// equipmentCapacityVo1.setTotal(Double.parseDouble(poweredBy) / 10000 + "万kW");
// } else {
// equipmentCapacityVo1.setTotal(poweredBy + "kW");
// }
// } else {
// if (date >= 10000) {
// equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date).divide(new BigDecimal(10000))) + "万kW");
// } else {
// equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
// }
// }
if (flag) {
if (Double.parseDouble(poweredBy) >= 10000) {
equipmentCapacityVo1.setTotal(Double.parseDouble(poweredBy) / 10000 + "万kW");
} else {
equipmentCapacityVo1.setTotal(poweredBy + "kW");
}
} else {
if (date >= 10000) {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date).divide(new BigDecimal(10000))) + "万kW");
} else {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
}
}
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityVo1.setAnnotation(annotation);
... ... @@ -3133,11 +3133,11 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
// if (date >= 10000) {
// equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date).divide(new BigDecimal(10000))) + "万kW");
// } else {
// equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
// }
if (date >= 10000) {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date).divide(new BigDecimal(10000))) + "万kW");
} else {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
}
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityVo1.setAnnotation(annotation);
... ... @@ -3223,11 +3223,11 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
// if (date >= 10000) {
// equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date).divide(new BigDecimal(10000))) + "万kW");
// } else {
// equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
// }
if (date >= 10000) {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date).divide(new BigDecimal(10000))) + "万kW");
} else {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
}
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityVo1.setAnnotation(annotation);
... ... @@ -3279,12 +3279,12 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
// if (date >= 10000) {
//
// equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date).divide(new BigDecimal(10000))) + "万kW");
// } else {
// equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
// }
if (date >= 10000) {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date).divide(new BigDecimal(10000))) + "万kW");
} else {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kW");
}
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityVo1.setAnnotation(annotation);
... ...