From 7bd3b76929e9a126b237ab9e1c8c82e7d20a4a6a Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 14 二月 2025 16:42:46 +0800
Subject: [PATCH] 开关阀记录中，对于当前未关阀的记录，不进行关阀类型名称翻译
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
index a2f274c..0bf3b74 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
@@ -1,6 +1,6 @@
package com.dy.pipIrrRemote.report;
-import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
+import com.dy.common.mw.protocol.p206V1.CommonV1;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.voRm.VoOnHour;
@@ -103,8 +103,12 @@
List<VoOpenCloseValve> list = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params);
if (list != null && list.size() > 0) {
for (VoOpenCloseValve vo : list) {
- vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
- vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
+ if(vo.getClType() != null) {
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType() == null ? (byte) 100 : vo.getClType()));
+ }else{
+ vo.setCloseType("");
+ }
}
}
rsVo.obj = list;
@@ -130,8 +134,12 @@
List<VoOpenCloseValve> list = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params);
if (list != null && list.size() > 0) {
for (VoOpenCloseValve vo : list) {
- vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
- vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
+ if(vo.getClType() != null){
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ }else{
+ vo.setCloseType("");
+ }
}
}
rsVo.obj = list;
--
Gitblit v1.8.0