From bda423b1aae1d5322116511651ae03a54cdcd231 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 26 十一月 2024 17:25:39 +0800
Subject: [PATCH] 1、几个测试模块系统的log4j.xml配置中的编码修改； 2、RTU升级模拟器增加命令行设置服务端IP和端口功能； 3、应王江海要求，井电双控协议中也实现远程升级功能，因井电双控协议、阀控器协议不同，而双方协议中的升级子协议相同，所以通信中间件做增量开发、适应性修改，以适应这种混合协议情况，同时也提高通信中间件运行效率。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 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 54f2dde..d41a7c0 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;
@@ -14,8 +14,6 @@
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.stereotype.Service;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -105,8 +103,8 @@
List<VoOpenCloseValve> list = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params);
if (list != null && list.size() > 0) {
for (VoOpenCloseValve vo : list) {
- vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_()));
- vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_()));
+ vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
}
}
rsVo.obj = list;
@@ -132,8 +130,8 @@
List<VoOpenCloseValve> list = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params);
if (list != null && list.size() > 0) {
for (VoOpenCloseValve vo : list) {
- vo.setOpenType(CommonV1_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_()));
- vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_()));
+ vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
}
}
rsVo.obj = list;
--
Gitblit v1.8.0