孔广洋 / synthesize_energy_project · 提交

转到一个项目

作者 kgy
提交 81b715227c4d04b824d8a700eab6aeb9add3837c 1 个父辈 7212bea3

单位转换

内嵌 并排对比
正在显示 1 个修改的文件 包含 61 行增加 和 12 行删除
... ... @@ -2662,9 +2662,17 @@ public class ProjectServiceImpl implements ProjectService {
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
if (flag) {
equipmentCapacityVo1.setTotal(poweredBy + "kW");
if (Double.parseDouble(poweredBy) >= 10000){
equipmentCapacityVo1.setTotal(Double.parseDouble(poweredBy) / 10000 + "万kW");
}else {
equipmentCapacityVo1.setTotal(poweredBy + "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);
... ... @@ -2757,7 +2765,11 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
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);
... ... @@ -2843,7 +2855,11 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
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);
... ... @@ -2895,7 +2911,12 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
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);
... ... @@ -2908,9 +2929,17 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
if (flag) {
equipmentCapacityVo.setTotal(poweredBy + "kW");
if (Double.parseDouble(poweredBy) >= 10000){
equipmentCapacityVo.setTotal(Double.parseDouble(poweredBy) / 10000 + "万kW");
}else {
equipmentCapacityVo.setTotal(poweredBy + "kW");
}
} else {
equipmentCapacityVo.setTotal(df.format(date) + "kW");
if (date >= 10000){
equipmentCapacityVo.setTotal(df.format(date / 10000) + "万kW");
}else {
equipmentCapacityVo.setTotal(df.format(date) + "kW");
}
}
equipmentCapacityVo.setList(list);
equipmentCapacityVo.setAnnotation(annotations);
... ... @@ -3743,7 +3772,11 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
if (date >= 10000){
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date).divide(new BigDecimal(10000))) + "万kWh");
}else {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
}
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
... ... @@ -3809,7 +3842,11 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
if (date >= 10000){
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date / 10000)) + "万kWh");
}else {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
}
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
... ... @@ -3868,7 +3905,11 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
if (date >= 10000){
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date / 10000)) + "万kWh");
}else {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
}
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
... ... @@ -3915,7 +3956,11 @@ public class ProjectServiceImpl implements ProjectService {
date += Double.parseDouble(capacityDto.getData());
}
EquipmentCapacityDto2 equipmentCapacityVo1 = new EquipmentCapacityDto2();
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
if (date >= 10000){
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date / 10000)) + "万kWh");
}else {
equipmentCapacityVo1.setTotal(format.apply(new BigDecimal(date)) + "kWh");
}
List<EquipmentCapacityDto> collect = list2.stream().filter(item -> !item.getData().equals("0.00")).collect(Collectors.toList());
equipmentCapacityVo1.setList(collect);
equipmentCapacityDto.setEquipmentCapacityDto2(equipmentCapacityVo1);
... ... @@ -3926,7 +3971,11 @@ public class ProjectServiceImpl implements ProjectService {
for (EquipmentCapacityDto capacityDto : list) {
date += Double.parseDouble(capacityDto.getData());
}
equipmentCapacityVo.setTotal(format.apply(new BigDecimal(date)) + "kWh");
if (date >= 10000){
equipmentCapacityVo.setTotal(format.apply(new BigDecimal(date / 10000)) + "万kWh");
}else {
equipmentCapacityVo.setTotal(format.apply(new BigDecimal(date)) + "kWh");
}
equipmentCapacityVo.setList(list);
return equipmentCapacityVo;
}
... ...