修改看板能源判断code

2025年4月3日15:54:38

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

@@ -9,13 +9,13 @@ import java.math.BigDecimal;
 public class EnergyDayDataDTO {
 
     @Schema(description = "日用电量")
-    private BigDecimal electricDayValue;
+    private BigDecimal electricDayValue = BigDecimal.ZERO;
     @Schema(description = "日水电量")
-    private BigDecimal waterDayValue;
+    private BigDecimal waterDayValue= BigDecimal.ZERO;
     @Schema(description = "日蒸汽电量")
-    private BigDecimal steamDayValue;
+    private BigDecimal steamDayValue= BigDecimal.ZERO;
     @Schema(description = "日压缩空气量")
-    private BigDecimal airDayValue;
+    private BigDecimal airDayValue= BigDecimal.ZERO;
     @Schema(description = "日天然气量")
-    private BigDecimal gasDayValue;
+    private BigDecimal gasDayValue= BigDecimal.ZERO;
 }

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

@@ -2,7 +2,6 @@ package com.thing.qingyuan.board.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.google.common.collect.Lists;
-import com.thing.common.core.exception.SysException;
 import com.thing.common.core.utils.DateTimeUtils;
 import com.thing.common.data.tskv.TsKvDTO;
 import com.thing.common.tskv.service.TsKvService;
@@ -52,21 +51,21 @@ public class BoardNewServiceImpl implements BoardNewService {
         List<TsKvDTO> tsKvByCodeAndAttrs = tsKvService.findTsKvByCodeAndAttrs("CO_" + realTenantCode, Lists.newArrayList("A29mm", "B2mm", "E3mm", "D2mm","C2mm"), dayTime, endTime, true);
         if(CollectionUtil.isNotEmpty(tsKvByCodeAndAttrs)){
             for (TsKvDTO tsKvDTO : tsKvByCodeAndAttrs) {
-                String code = tsKvDTO.getThingCode();
+                String attrKey = tsKvDTO.getAttrKey();
                 String value = tsKvDTO.getVal();
-                if ("A29mm".equals(code)) {
+                if ("A29mm".equals(attrKey)) {
                     // 月用电量
                     result.setElectricDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
-                } else if ("B2mm".equals(code)) {
+                } else if ("B2mm".equals(attrKey)) {
                     // 月用水量
                     result.setWaterDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
-                } else if ("E3mm".equals(code)) {
+                } else if ("E3mm".equals(attrKey)) {
                     // 月蒸汽量
                     result.setSteamDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
-                } else if ("D2mm".equals(code)) {
+                } else if ("D2mm".equals(attrKey)) {
                     // 月压缩空气量
                     result.setAirDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
-                } else if ("C2mm".equals(code)) {
+                } else if ("C2mm".equals(attrKey)) {
                     // 月天然气用量
                     result.setGasDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
                 }
@@ -91,21 +90,21 @@ public class BoardNewServiceImpl implements BoardNewService {
         List<TsKvDTO> tsKvByCodeAndAttrs = tsKvService.findTsKvByCodeAndAttrs("CO_" + realTenantCode, Lists.newArrayList("A29yy", "B2yy", "E3yy", "D2yy","C2yy"), dayTime, endTime, true);
         if(CollectionUtil.isNotEmpty(tsKvByCodeAndAttrs)){
             for (TsKvDTO tsKvDTO : tsKvByCodeAndAttrs) {
-                String code = tsKvDTO.getThingCode();
+                String attrKey = tsKvDTO.getAttrKey();
                 String value = tsKvDTO.getVal();
-                if ("A29yy".equals(code)) {
+                if ("A29yy".equals(attrKey)) {
                     // 年用电量
                     result.setElectricDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
-                } else if ("B2yy".equals(code)) {
+                } else if ("B2yy".equals(attrKey)) {
                     // 年用水量
                     result.setWaterDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
-                } else if ("E3yy".equals(code)) {
+                } else if ("E3yy".equals(attrKey)) {
                     // 年蒸汽量
                     result.setSteamDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
-                } else if ("D2yy".equals(code)) {
+                } else if ("D2yy".equals(attrKey)) {
                     // 年压缩空气量
                     result.setAirDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
-                } else if ("C2yy".equals(code)) {
+                } else if ("C2yy".equals(attrKey)) {
                     // 年天然气用量
                     result.setGasDayValue(new BigDecimal(value).setScale(2, RoundingMode.HALF_UP));
                 }