From 7730ff87c26c6e78fea91c85008f9805b6f4258f Mon Sep 17 00:00:00 2001 From: lishuai Date: Thu, 3 Apr 2025 15:54:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BF=E8=83=BD?= =?UTF-8?q?=E6=BA=90=E5=88=A4=E6=96=ADcode=202025=E5=B9=B44=E6=9C=883?= =?UTF-8?q?=E6=97=A515:54:38?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qingyuan/board/dto/EnergyDayDataDTO.java | 10 ++++---- .../service/impl/BoardNewServiceImpl.java | 25 +++++++++---------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/board/dto/EnergyDayDataDTO.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/board/dto/EnergyDayDataDTO.java index a8ad582..9c85658 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/board/dto/EnergyDayDataDTO.java +++ b/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; } diff --git a/modules/qingyuan/src/main/java/com/thing/qingyuan/board/service/impl/BoardNewServiceImpl.java b/modules/qingyuan/src/main/java/com/thing/qingyuan/board/service/impl/BoardNewServiceImpl.java index a61a5dc..16c3a4c 100644 --- a/modules/qingyuan/src/main/java/com/thing/qingyuan/board/service/impl/BoardNewServiceImpl.java +++ b/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 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 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)); }