From ba097279abfc4bd9e65dc9d7a9b8a5fe8ebd5fc1 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 22 七月 2024 14:17:20 +0800
Subject: [PATCH] 实现协议中各种命令结果日志数据库永久更新保存功能log日志显示

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java
index 43f32fe..86b5fe4 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealCloseValveReportV202404.java
@@ -4,8 +4,8 @@
 import com.dy.common.mw.protocol.p206V202404.DataV202404;
 import com.dy.common.mw.protocol.p206V202404.upVos.DataCd85Vo;
 import com.dy.pipIrrGlobal.pojoPr.PrController;
-import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseHistory;
-import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseLast;
+import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
+import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast;
 import com.dy.rtuMw.server.rtuData.TaskSurpport;
 import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
 import org.apache.logging.log4j.LogManager;
@@ -18,7 +18,7 @@
  * @Description
  */
 public class TkDealCloseValveReportV202404 extends TaskSurpport {
-    private static final Logger log = LogManager.getLogger(TkDealTimingReportV202404.class.getName());
+    private static final Logger log = LogManager.getLogger(TkDealCloseValveReportV202404.class.getName());
 
     //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
     public static final String taskId = "TkDealCloseValveReportV202404";
@@ -69,19 +69,19 @@
      * @param cdData 鍔熻兘鏁版嵁
      */
     private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd85Vo cdData)throws Exception {
-        RmOpenCloseLast po = sv.getRmOpenCloseLast(rtuAddr);
+        RmOpenCloseValveLast po = sv.getRmOpenCloseValveLast(controller.getIntakeId());
         if(po == null){
-            po = new RmOpenCloseLast();
+            po = new RmOpenCloseValveLast();
             po.controllerId = controller==null?null:controller.getId();
             po.intakeId = controller==null?null:controller.getIntakeId();
             po.rtuAddr = rtuAddr;
             po.valueFrom85(dataV202404, cdData);
-            sv.saveRmOpenCloseLast(po);
+            sv.saveRmOpenCloseValveLast(po);
         }else{
             po.controllerId = controller==null?null:controller.getId();
             po.intakeId = controller==null?null:controller.getIntakeId();
             po.valueFrom85(dataV202404, cdData);
-            sv.updateRmOpenCloseLast(po);
+            sv.updateRmOpenCloseValveLast(po);
         }
     }
 
@@ -94,11 +94,11 @@
      * @param cdData 鍔熻兘鏁版嵁
      */
     private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd85Vo cdData)throws Exception {
-        RmOpenCloseHistory po = new RmOpenCloseHistory();
+        RmOpenCloseValveHistory po = new RmOpenCloseValveHistory();
         po.controllerId = controller==null?null:controller.getId();
         po.intakeId = controller==null?null:controller.getIntakeId();
         po.rtuAddr = rtuAddr;
         po.valueFrom85(dataV202404, cdData);
-        sv.saveRmOpenCloseHistory(po); ;
+        sv.saveRmOpenCloseValveHistory(po); ;
     }
 }

--
Gitblit v1.8.0