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-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java
index 2af426b..0a5441c 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intakeController/IntakeControllerSv.java
@@ -98,13 +98,22 @@
return prControllerTrampMapper.deleteByPrimaryKey(controllerId);
}
- //澧�
+ /**
+ * 娓呯┖娴佹氮鎺у埗鍣�
+ * @param
+ * @return
+ */
+ public Integer emptyTrampController() {
+ return prControllerTrampMapper.emptyTrampController();
+ }
+
+ //娴佹氮鎺у埗鍣ㄥ
public Integer addTrampController(PrControllerTramp record){
return prControllerTrampMapper.insertSelective(record);
}
-/*鏌�*/
+/*娴佹氮鎺у埗鍣ㄦ煡*/
public QueryResultVo<List<PrControllerTramp>> getTrampControllers(TrampControllerQueryVo queryVo){
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
@@ -119,4 +128,12 @@
return rsVo;
}
+ /**
+ * 淇敼缁戝畾璁板綍閫氳繃鍙栨按鍙�
+ * @param record
+ * @return
+ */
+ public Integer updateBindRecord(PrIntakeController record){
+ return prIntakeControllerMapper.updateByIntakeSelective(record);
+ }
}
--
Gitblit v1.8.0