From ebde5d02c0287643321370441077ec3cf64e8112 Mon Sep 17 00:00:00 2001 From: "3067418132@qq.com" Date: Thu, 16 Jul 2026 09:45:06 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=85=BC=E5=AE=B9=E4=BE=9D=E8=B7=9E?= =?UTF-8?q?=E6=B5=81=E9=87=8F=E8=AE=A1=E7=83=AD=E9=87=8F=E8=BE=93=E5=87=BA?= =?UTF-8?q?=EF=BC=8C=E7=9B=AE=E5=89=8D=E4=B8=BA=E4=BA=86=E5=BF=AB=EF=BC=8C?= =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=88=A4=E6=96=AD=E9=A1=B9=E7=9B=AEid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataResultServiceImpl.java | 4 +++ .../service/impl/MeterManageServiceImpl.java | 28 ++++++++++++++----- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java index f7e99dc..a271a0b 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java @@ -327,6 +327,10 @@ public class DataResultServiceImpl implements DataResultService { momentCoolingStr = Constant.MOMENT_HOT; outTempStr = Constant.TEMP; intTempStr = Constant.PRE; + } else if (isHotCollection == 1 && projectId.equals("34")) { + momentCoolingStr = "0003"; + outTempStr = "0035"; + intTempStr = "0033"; } // 查询温度低的冷量计 String registerAddr = meterManageMapper.selectRegisterAddr(projectId, intTempStr); diff --git a/user-service/src/main/java/com/mh/user/service/impl/MeterManageServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/MeterManageServiceImpl.java index f4dd6d9..9a174dc 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/MeterManageServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/MeterManageServiceImpl.java @@ -142,13 +142,24 @@ public class MeterManageServiceImpl implements MeterManageService { dto.setIntTemp(formatValue(meter.getCurValue())); } } else if (projectType == 1) { - // 1：热量计，瞬时热量，进出水温度 - if ("0020".equalsIgnoreCase(meter.getRegisterAddr())) { - dto.setMomentCooling(formatValue(meter.getCurValue())); - } else if ("0073".equalsIgnoreCase(meter.getRegisterAddr())) { - dto.setOutTemp(formatValue(meter.getCurValue())); - } else if ("0075".equalsIgnoreCase(meter.getRegisterAddr())) { - dto.setIntTemp(formatValue(meter.getCurValue())); + if (projectId == 34L) { + // 1：热量计，瞬时热量，进出水温度 + if ("0003".equalsIgnoreCase(meter.getRegisterAddr())) { + dto.setMomentCooling(formatValue(meter.getCurValue())); + } else if ("0033".equalsIgnoreCase(meter.getRegisterAddr())) { + dto.setOutTemp(formatValue(meter.getCurValue())); + } else if ("0035".equalsIgnoreCase(meter.getRegisterAddr())) { + dto.setIntTemp(formatValue(meter.getCurValue())); + } + } else { + // 1：热量计，瞬时热量，进出水温度 + if ("0020".equalsIgnoreCase(meter.getRegisterAddr())) { + dto.setMomentCooling(formatValue(meter.getCurValue())); + } else if ("0073".equalsIgnoreCase(meter.getRegisterAddr())) { + dto.setOutTemp(formatValue(meter.getCurValue())); + } else if ("0075".equalsIgnoreCase(meter.getRegisterAddr())) { + dto.setIntTemp(formatValue(meter.getCurValue())); + } } } else if (projectType == 2) { // 2：蒸汽流量计，瞬时流量，压力温度 @@ -289,6 +300,9 @@ public class MeterManageServiceImpl implements MeterManageService { } else if (meterManageMapper.queryIsHotCollection(systemId, projectId, "0002", Constant.FLOW_METER) > 0 || projectId.equals("20")) { // 判断是否包含蒸汽流量计 return 2; + } else if (meterManageMapper.queryIsHotCollection(systemId, projectId, "0017", Constant.COOLING_METER) > 0 || projectId.equals("34")) { + // 判断是否依跞流量计 + return 1; } else { return 0; }