重新拉个分支

2025年4月1日14:37:32

modules/qingyuan/src/main/java/com/thing/qingyuan/board/dto/EnergyBuildDataDTO.java

@@ -9,11 +9,11 @@ import java.math.BigDecimal;
 public class EnergyBuildDataDTO {
 
     @Schema(description = "用电量")
-    private BigDecimal electricValue;
+    private BigDecimal electricValue = BigDecimal.ZERO;
     @Schema(description = "用水量")
-    private BigDecimal waterValue;
+    private BigDecimal waterValue = BigDecimal.ZERO;
     @Schema(description = "蒸汽量")
-    private BigDecimal steamValue;
+    private BigDecimal steamValue = BigDecimal.ZERO;
     @Schema(description = "压缩空气量")
-    private BigDecimal airValue;
+    private BigDecimal airValue = BigDecimal.ZERO;
 }

modules/qingyuan/src/main/java/com/thing/qingyuan/board/service/impl/BoardNewServiceImpl.java

@@ -599,34 +599,33 @@ public class BoardNewServiceImpl implements BoardNewService {
         //年时间
         Long dayTime = DateTimeUtils.dateToStamp(year + "-01-01 00:00:00");
         //次年第一天的时间戳
-        Long nextYearDayTime = DateTimeUtils.dateToStamp(
-                LocalDate.parse(year + "-01-01").plusYears(1).format(DateTimeFormatter.ofPattern("yyyy-MM-dd 00:00:00"))
-        );
+        String yearEndTime = DateTimeUtils.getYearEndTime(day);
+        Long endTime = DateTimeUtils.convertTimeToLong(yearEndTime);
 
         //获取此租户编码
         Long realTenantCode = UserContext.getRealTenantCode();
 
         //查询这一年的  "总用电": "G01","总用水": "G03","总蒸汽": "G02","总压缩空气": "D_V0000151_1","天然气"："C2"用能情况
-        List<TsKvDTO> tsKvByCodeAndAttrs = tsKvService.findTsKvByCodeAndAttrs("CO_" + realTenantCode, Lists.newArrayList("G01", "G03", "G02", "D_V0000151_1","C2"), dayTime, nextYearDayTime, true);
+        List<TsKvDTO> tsKvByCodeAndAttrs = tsKvService.findTsKvByCodeAndAttrs("CO_" + realTenantCode, Lists.newArrayList("G01", "G03", "G02", "D_V0000151_1","C2"), dayTime, endTime, true);
         if(CollectionUtil.isNotEmpty(tsKvByCodeAndAttrs)){
             for (TsKvDTO tsKvDTO : tsKvByCodeAndAttrs) {
                 String code = tsKvDTO.getThingCode();
                 String value = tsKvDTO.getVal();
                 if ("G01".equals(code)) {
                     // 年用电量
-                    result.setElectricDayValue(new BigDecimal(value).setScale(2, BigDecimal.ROUND_HALF_UP));
+                    result.setElectricDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
                 } else if ("G03".equals(code)) {
                     // 年用水量
-                    result.setWaterDayValue(new BigDecimal(value).setScale(2, BigDecimal.ROUND_HALF_UP));
+                    result.setWaterDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
                 } else if ("G02".equals(code)) {
                     // 年蒸汽量
-                    result.setSteamDayValue(new BigDecimal(value).setScale(2, BigDecimal.ROUND_HALF_UP));
+                    result.setSteamDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
                 } else if ("D_V0000151_1".equals(code)) {
                     // 年压缩空气量
-                    result.setAirDayValue(new BigDecimal(value).setScale(2, BigDecimal.ROUND_HALF_UP));
+                    result.setAirDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
                 } else if ("C2".equals(code)) {
                     // 年天然气用量
-                    result.setGasDayValue(new BigDecimal(value).setScale(2, BigDecimal.ROUND_HALF_UP));
+                    result.setGasDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
                 }
             }
         }