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-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java
index 270dc86..f7b0230 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoRm/UgRtuControllerMapper.java
@@ -1,9 +1,9 @@
package com.dy.pipIrrGlobal.daoRm;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuController;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuController;
import com.dy.pipIrrGlobal.voPr.VoController;
+import com.dy.pipIrrGlobal.voUg.VoUgResult;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -24,6 +24,13 @@
* @return deleteCount
*/
int deleteByPrimaryKey(Long id);
+ /**
+ * delete by task key
+ *
+ * @param taskId task id
+ * @return deleteCount
+ */
+ int deleteByTaskId(@Param("taskId")Long taskId);
/**
* insert record to table
@@ -88,6 +95,19 @@
*/
Long selectCountByTaskAndCon(@Param("taskId") Long taskId, @Param("conId") Long conId) ;
+ /**
+ * 鍒嗛〉鏌ヨ涓�涓崌绾т换鍔′腑鎵�鏈夋帶鍒跺櫒鍗囩骇缁撴煡 鏁伴噺
+ *
+ * @param params
+ * @return
+ */
+ Long selectControllerUpgradeResultsCount(Map<?, ?> params) ;
+ /**
+ * 鍒嗛〉鏌ヨ涓�涓崌绾т换鍔′腑鎵�鏈夋帶鍒跺櫒鍗囩骇缁撴煡
+ * @param params
+ * @return
+ */
+ List<VoUgResult> selectControllerUpgradeResults(Map<?, ?> params);
/**
* update record selective
@@ -104,4 +124,11 @@
* @return update count
*/
int updateByPrimaryKey(UgRtuController record);
+
+ /**
+ * 鏇存柊鍗囩骇RTU鐨勫崌绾у畬鎴愮姸鎬�
+ * @param params
+ * @return
+ */
+ int updateRtuUpgradeState(Map<?, ?> params) ;
}
\ No newline at end of file
--
Gitblit v1.8.0