From 47033c5e68ced6ff6b6e2f8163f0a95dbc3bc321 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 12 二月 2025 17:14:33 +0800
Subject: [PATCH] 1、开关阀及报警消息中增加日期时间; 2、版本2协议中增加消息功能。

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealCloseValveReportV2.java |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealCloseValveReportV2.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealCloseValveReportV2.java
index f2f2919..18ee1ca 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealCloseValveReportV2.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealCloseValveReportV2.java
@@ -8,6 +8,8 @@
 import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveHistory;
 import com.dy.pipIrrGlobal.pojoRm.RmOpenCloseValveLast;
 import com.dy.pipIrrGlobal.pojoSe.SeClient;
+import com.dy.rtuMw.server.msCenter.MsCenterUnit;
+import com.dy.rtuMw.server.msCenter.MsObj;
 import com.dy.rtuMw.server.rtuData.TaskSurpport;
 import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
 import org.apache.logging.log4j.LogManager;
@@ -44,6 +46,7 @@
             PrController controller = (PrController)objs[1] ;
             SeClient clientVo = (SeClient)objs[3] ;//杩欎釜鍊煎璞′腑鍙湁id鍜宯ame浼氭湁鍊�
             try{
+                this.toMsCenter(clientVo, controller, d.getRtuAddr(), dV2, (DataCd83CloseVo)cdObj) ;
                 this.doDeal(sv, clientVo, controller, d.getRtuAddr(), dV2, (DataCd83CloseVo)cdObj) ;
             }catch (Exception e){
                 log.error("淇濆瓨鎺у埗鍣ㄥ紑闃�涓婃姤鏃跺彂鐢熷紓甯�", e);
@@ -52,6 +55,28 @@
     }
 
     /**
+     * 鎶婂紑闃�娑堟伅瀛樺叆娑堟伅涓績
+     * @param clientVo
+     * @param controller
+     * @param rtuAddr
+     * @param dV2
+     * @param dataCd83CloseVo
+     */
+    private void toMsCenter(SeClient clientVo, PrController controller, String rtuAddr, DataV2 dV2, DataCd83CloseVo dataCd83CloseVo){
+        if(clientVo != null && controller != null){
+            MsObj msObj = new MsObj() ;
+            msObj.put("name", "鍏抽榾");
+            msObj.put("clientId", clientVo.getId());
+            msObj.put("clientName", clientVo.getName());
+            msObj.put("clientAddress", clientVo.getAddress());
+            msObj.put("icCardNo", dataCd83CloseVo.icCardNo);
+            msObj.put("rtuAddr", rtuAddr);
+            msObj.put("intakeId", controller.getIntakeId());
+            msObj.put("dt", dV2.dt);
+            MsCenterUnit.getInstance().pushMs(msObj);
+        }
+    }
+    /**
      * 淇濆瓨鏁版嵁
      * @param sv 鏈嶅姟
      * @param clientVo 鍐滄埛瀵硅薄锛堜笉涓虹┖鏃讹紝鍙湁id鍜宯ame鏈夊�硷級

--
Gitblit v1.8.0