From 1a2b07f01ba4616fd9e894dddf474b56d020158c Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期一, 07 四月 2025 15:18:51 +0800
Subject: [PATCH] 整理版本

---
 pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealCloseValveReportV2.java |  317 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 317 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
new file mode 100644
index 0000000..18ee1ca
--- /dev/null
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V2/TkDealCloseValveReportV2.java
@@ -0,0 +1,317 @@
+package com.dy.rtuMw.server.rtuData.p206V2;
+
+import com.dy.common.mw.protocol.Data;
+import com.dy.common.mw.protocol.p206V2.DataV2;
+import com.dy.common.mw.protocol.p206V2.upVos.DataCd83CloseVo;
+import com.dy.common.util.DateTime;
+import com.dy.pipIrrGlobal.pojoPr.PrController;
+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;
+import org.apache.logging.log4j.Logger;
+
+/**
+ * @Author liurunyu
+ * @Date 2024/1/16 17:18
+ * @LastEditTime 2024/1/16 17:18
+ * @Description
+ */
+
+/**
+ * 澶勭悊鎺у埗鍣ㄥ叧闃�涓婃姤
+ */
+public class TkDealCloseValveReportV2 extends TaskSurpport {
+
+    private static final Logger log = LogManager.getLogger(TkDealCloseValveReportV2.class.getName()) ;
+
+    //绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
+    public static final String taskId = "TkDealCloseValveReportV2" ;
+    /**
+     * 鎵ц鑺傜偣浠诲姟: 澶勭悊鎺у埗鍣ㄥ叧闃�涓婃姤
+     * @param data 闇�瑕佸鐞嗙殑鏁版嵁
+     */
+    @Override
+    public void execute(Object data) {
+        Data d = (Data) data;
+        DataV2 dV2 = (DataV2) d.getSubData();
+        Object cdObj = dV2.subData;
+        if (cdObj != null && cdObj instanceof DataCd83CloseVo) {
+            Object[] objs = this.getTaskResults(TkPreGenObjsV2.taskId) ;
+            DbSv sv = (DbSv)objs[0] ;
+            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);
+            }
+        }
+    }
+
+    /**
+     * 鎶婂紑闃�娑堟伅瀛樺叆娑堟伅涓績
+     * @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鏈夊�硷級
+     * @param clientVo 鍐滄埛瀵硅薄
+     * @param controller 鎺у埗鍣ㄥ璞�
+     * @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
+     * @param dV2 涓婃姤鏁版嵁
+     * @param dataCd83CloseVo 鍏抽榾涓婃姤鏁版嵁瀵硅薄
+     */
+    private void doDeal(DbSv sv, SeClient clientVo, PrController controller, String rtuAddr, DataV2 dV2, DataCd83CloseVo dataCd83CloseVo) throws Exception {
+        RmOpenCloseValveLast poLast = sv.getRmOpenCloseValveLast(controller.getIntakeId()) ;
+        if(poLast == null){
+            //鏁版嵁搴撲腑涓嶅瓨鍦ㄨ鎺у埗鍣ㄧ殑寮�鍏抽榾鏁版嵁
+            //棣栧厛鐢熸垚鏈�鏂版暟鎹強鍘嗗彶鏁版嵁锛屽苟鍏堜繚瀛�
+            poLast = this.newRmOpenCloseValveLast(clientVo, controller, rtuAddr, dV2, dataCd83CloseVo);
+            this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV2, dataCd83CloseVo, poLast, null);
+            //淇濆瓨鏈�鏂版暟鎹�
+            sv.saveRmOpenCloseValveLast(poLast);
+        }else{
+            //鏁版嵁搴撲腑瀛樺湪璇ユ帶鍒跺櫒鐨勫紑鍏抽榾鏁版嵁
+            if(poLast.closeDt != null && poLast.clIcCardAddr != null && poLast.clIcCardNo != null){
+                if(poLast.closeDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt))
+                        && poLast.clIcCardAddr.equals(dataCd83CloseVo.icCardAddr)
+                        && poLast.clIcCardNo.equals(dataCd83CloseVo.icCardNo)){
+                    //閲嶅涓婃姤锛屽師鍥犳槸涓嬭鏁版嵁澶勭悊鎱簡锛屽氨閲嶅涓婃姤浜�
+                    return ;
+                }
+            }
+            if(poLast.clType == null){
+                //鍘熻褰曚笉瀛樺湪鍏抽榾鏁版嵁锛屾墍浠ュ綋鍓嶅叧闃�涓婃姤鏄柊鐨勪竴娆″叧闃�
+                if(poLast.opType == null || poLast.openDt == null){
+                    //鍘熻褰曚腑涓嶅瓨鍦ㄥ紑闃�鏁版嵁(鍗冲紑闃�涓庡叧闃�鏁版嵁閮芥病鏈夛紝杩欑鎯呭喌涓�鑸笉瀛樺湪)锛屾病鍔炴硶杩涜鍖归厤
+                    //鐢熸垚骞朵繚瀛樻柊鐨勫叧闃�涓婃姤鍘嗗彶鏁版嵁璁板綍
+                    this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV2, dataCd83CloseVo, poLast, null);
+                }else{
+                    //鍘熻褰曚腑瀛樺湪寮�闃�鏁版嵁锛岃繘琛屽巻鍙叉暟鎹尮閰�
+                    RmOpenCloseValveHistory poHistory = null ;
+                    if(poLast.lastHistoryId != null){
+                        poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId) ;
+                        if(poHistory != null){
+                            if(poHistory.openDt != null){
+                                //涓婇潰宸茬粡鍒ゆ柇浜唒oLast.openDt == null锛屾墍浠ユ澶勪竴鑸細鏄痯oHistory.openDt != null
+                                if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
+                                    //鍖归厤鎴愬姛
+                                    //褰撳墠鍏抽榾鏄師璁板綍涓紑闃�鐨勫搴斿叧闃�
+                                    this.updateCloseValve(clientVo, controller, poLast, poHistory, dV2, dataCd83CloseVo, false) ;
+                                    sv.updateRmOpenCloseValveHistory(poHistory);
+                                }else if(poHistory.openDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
+                                    //鍖归厤澶辫触(瀵逛簬after:绛変簬鎴栨櫄浜庨兘杩斿洖true)
+                                    //鏈湴鏈�鏂版暟鎹腑鐨勫紑闃�鏃堕棿鏅氫簬褰撳墠鍏抽榾涓婃姤涓殑寮�闃�鏃堕棿锛岃鏄庢槸琛ユ姤
+                                    this.dealSupplyReport() ;
+                                }else{
+                                    //鍖归厤澶辫触
+                                    //鏈湴鏈�鏂版暟鎹腑鐨勫紑闃�鏃堕棿鏃╀簬褰撳墠鍏抽榾涓婃姤涓殑寮�闃�鏃堕棿锛岃鏄庢槸鏂扮殑涓�娆″叧闃�鎶ワ紝鑰屼笖瀵瑰簲鍏抽榾鎶ョ殑涓婁竴娆″紑闃�鎶ユ湭鏀跺埌
+                                    this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV2, dataCd83CloseVo, poLast, true);
+                                }
+                            }else{
+                                //杩欑鎯呭喌涓嶅瓨鍦紝璁や负鍖归厤澶辫触
+                                //褰撳墠鍏抽榾涓嶆槸鍘熻褰曚腑寮�闃�鐨勫搴斿叧闃�锛岀敓鎴愬苟淇濆瓨鏂扮殑鍏抽榾涓婃姤鍘嗗彶鏁版嵁璁板綍
+                                this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV2, dataCd83CloseVo, poLast, true);
+                            }
+                        }else{
+                            //娌℃湁鍘嗗彶鏁版嵁锛岃繖绉嶆儏鍐典笉瀛樺湪锛岃涓哄尮閰嶅け璐ワ紝鐢熸垚骞朵繚瀛樻柊鐨勫叧闃�涓婃姤鍘嗗彶鏁版嵁璁板綍
+                            this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV2, dataCd83CloseVo, poLast, true);
+                        }
+                    }else{
+                        //娌℃湁鍘嗗彶鏁版嵁锛岃繖绉嶆儏鍐典笉瀛樺湪锛岃涓哄尮閰嶅け璐ワ紝鐢熸垚骞朵繚瀛樻柊鐨勫叧闃�涓婃姤鍘嗗彶鏁版嵁璁板綍
+                        this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV2, dataCd83CloseVo, poLast, true);
+                    }
+                }
+            }else if(poLast.opType != null){
+                //鍘熻褰曞瓨鍦ㄥ叧闃�鏁版嵁锛屼篃瀛樺湪寮�闃�鏁版嵁锛岄鍏堣繘琛屽紑鍏抽榾鏃堕棿瀵规瘮
+                if(poLast.closeDt != null && poLast.closeDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt))){
+                    //閲嶅涓婃姤浜嗭紝涓嶈繘琛屽鐞�
+                }else if(poLast.closeDt != null && poLast.closeDt.after(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.closeDt))){
+                    //琛ユ姤鐨勮涔呬箣鍓嶇殑鏁版嵁(瀵逛簬after:绛変簬鎴栨櫄浜庨兘杩斿洖true)
+                    this.dealSupplyReport() ;
+                }else {
+                    //鏄柊鐨勪笂鎶ュ叧闃�鏁版嵁
+                    //杩涜鍘嗗彶鏁版嵁鍖归厤
+                    RmOpenCloseValveHistory poHistory = null ;
+                    if(poLast.lastHistoryId != null) {
+                        poHistory = sv.getRmOpenCloseValveHistory(poLast.lastHistoryId);
+                        if (poHistory != null) {
+                            if(poHistory.openDt.equals(DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(dataCd83CloseVo.openDt))){
+                                //鍖归厤涓婁簡
+                                this.updateCloseValve(clientVo, controller, poLast, poHistory, dV2, dataCd83CloseVo, false) ;
+                                sv.updateRmOpenCloseValveHistory(poHistory);
+                            }else{
+                                //涓婁釜鍏抽榾鎶ユ湭涓婃姤
+                                this.updateCloseValve(clientVo, controller, poLast, null, dV2, dataCd83CloseVo, true) ;
+                                this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV2, dataCd83CloseVo, poLast, null);
+                            }
+                        }else{
+                            //杩欑鎯呭喌涓嶅瓨鍦紝浣嗕负瀹夊叏涔熻繘琛屽鐞嗭紝涔熻涓轰笂涓叧闃�鎶ユ湭涓婃姤
+                            this.updateCloseValve(clientVo, controller, poLast, null, dV2, dataCd83CloseVo, true) ;
+                            this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV2, dataCd83CloseVo, poLast, null);
+                        }
+                    }else{
+                        //杩欑鎯呭喌涓嶅瓨鍦紝浣嗕负瀹夊叏涔熻繘琛屽鐞嗭紝涔熻涓轰笂涓叧闃�鎶ユ湭涓婃姤
+                        this.updateCloseValve(clientVo, controller, poLast, null, dV2, dataCd83CloseVo, true) ;
+                        this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV2, dataCd83CloseVo, poLast, null);
+                    }
+                }
+            }else{
+                //if(po.opType == null)
+                //鍘熻褰曚笉瀛樺湪寮�闃�鏁版嵁涔熶笉瀛樺湪鍏抽榾鏁版嵁锛岃繖绉嶆儏鍐典笉瀛樺湪锛屼絾涓哄畨鍏ㄤ篃杩涜澶勭悊锛屼篃璁や负涓婁釜鍏抽榾鎶ユ湭涓婃姤
+                this.updateCloseValve(clientVo, controller, poLast, null, dV2, dataCd83CloseVo, true) ;
+                //鐢熸垚骞朵繚瀛樻柊鐨勫叧闃�涓婃姤鍘嗗彶鏁版嵁璁板綍锛屾病鏈夊搴旂殑寮�鍙戞暟鎹�
+                this.newHistoryDataDeal(sv, clientVo, controller, rtuAddr, dV2, dataCd83CloseVo, poLast, null);
+            }
+
+            sv.updateRmOpenCloseValveLast(poLast);
+        }
+    }
+
+    /**
+     * 澶勭悊琛ユ姤锛屾殏鏃舵棤閫昏緫
+     */
+    private void dealSupplyReport(){
+    }
+
+    /**
+     * 淇濆瓨鏂扮殑鍏抽榾涓婃姤鍘嗗彶鏁版嵁璁板綍锛屽苟鎶奍D璧嬪�肩粰鏈�鏂拌褰曠殑 lastHistoryId
+     * @param sv
+     * @param controller
+     * @param rtuAddr
+     * @param dV2
+     * @param dataCd83CloseVo
+     * @param poLast
+     * @param clearLastOpenValue
+     * @throws Exception
+     */
+    private void newHistoryDataDeal(DbSv sv,
+                                   SeClient clientVo,
+                                    PrController controller,
+                                    String rtuAddr,
+                                    DataV2 dV2,
+                                    DataCd83CloseVo dataCd83CloseVo,
+                                    RmOpenCloseValveLast poLast,
+                                    Boolean clearLastOpenValue)throws Exception {
+        RmOpenCloseValveHistory poHistory = this.newRmOpenCloseValveHistory(clientVo, controller, rtuAddr, dV2, dataCd83CloseVo) ;
+        sv.saveRmOpenCloseValveHistory(poHistory);
+        //鐢辨渶鏂版暟鎹寔鏈夊巻鍙叉暟鎹腑鐨勬渶鏂拌褰旾D锛屼互鏂逛究蹇�熸煡璇�
+        poLast.lastHistoryId = poHistory == null ? null: poHistory.id ;
+        if(clearLastOpenValue != null && clearLastOpenValue.booleanValue()){
+            poLast.clearOpenValue();
+        }
+    }
+
+    /**
+     * 鐢熸垚鏂扮殑鍏抽榾涓婃姤鏈�鏂版暟鎹褰�
+     * @param clientVo
+     * @param controller
+     * @param rtuAddr
+     * @param dV2
+     * @param dataCd83CloseVo
+     * @return
+     * @throws Exception
+     */
+    private RmOpenCloseValveLast newRmOpenCloseValveLast(SeClient clientVo,
+                                                         PrController controller,
+                                                         String rtuAddr,
+                                                         DataV2 dV2,
+                                                         DataCd83CloseVo dataCd83CloseVo)throws Exception {
+        RmOpenCloseValveLast po = new RmOpenCloseValveLast() ;
+        po.clientId = clientVo==null?null:clientVo.getId() ;
+        po.clientName = clientVo==null?null:clientVo.getName() ;
+        po.controllerId = controller==null?null:controller.getId() ;
+        po.intakeId = controller==null?null:controller.getIntakeId() ;
+        po.rtuAddr = rtuAddr ;
+        po.valueFrom(dV2, dataCd83CloseVo);
+        return po ;
+    }
+
+
+    /**
+     * 鐢熸垚鏂扮殑鍏抽榾涓婃姤鍘嗗彶鏁版嵁璁板綍
+     * @param clientVo
+     * @param controller
+     * @param rtuAddr
+     * @param dV2
+     * @param dataCd83CloseVo
+     * @return
+     * @throws Exception
+     */
+    private RmOpenCloseValveHistory newRmOpenCloseValveHistory(SeClient clientVo,
+                                                               PrController controller,
+                                                               String rtuAddr,
+                                                               DataV2 dV2,
+                                                               DataCd83CloseVo dataCd83CloseVo)throws Exception {
+        RmOpenCloseValveHistory po = new RmOpenCloseValveHistory() ;
+        po.clientId = clientVo==null?null:clientVo.getId() ;
+        po.clientName = clientVo==null?null:clientVo.getName() ;
+        po.controllerId = controller==null?null:controller.getId() ;
+        po.intakeId = controller==null?null:controller.getIntakeId() ;
+        po.rtuAddr = rtuAddr ;
+        po.valueFrom(dV2, dataCd83CloseVo);
+        return po ;
+    }
+
+
+    /**
+     * 鏇存柊鏁版嵁
+     * @param clientVo
+     * @param controller
+     * @param poLast
+     * @param poHistory
+     * @param dV2
+     * @param dataCd83CloseVo
+     * @param clearLastOpenValue
+     * @throws Exception
+     */
+    private void updateCloseValve(SeClient clientVo,
+                                  PrController controller,
+                                  RmOpenCloseValveLast poLast,
+                                  RmOpenCloseValveHistory poHistory,
+                                  DataV2 dV2,
+                                  DataCd83CloseVo dataCd83CloseVo,
+                                  boolean clearLastOpenValue) throws Exception {
+        poLast.clientId = clientVo==null?null:clientVo.getId() ;
+        poLast.clientName = clientVo==null?null:clientVo.getName() ;
+        poLast.controllerId = controller==null?null:controller.getId();
+        poLast.intakeId = controller==null?null:controller.getIntakeId();
+
+        poLast.updateFrom(dV2, dataCd83CloseVo, clearLastOpenValue);
+
+        if(poHistory != null){
+            poHistory.clientId = clientVo==null?null:clientVo.getId() ;
+            poHistory.clientName = clientVo==null?null:clientVo.getName() ;
+            poHistory.controllerId = controller==null?null:controller.getId();
+            poHistory.intakeId = controller==null?null:controller.getIntakeId();
+
+            poHistory.updateFrom(dV2, dataCd83CloseVo, false);
+        }
+
+    }
+}

--
Gitblit v1.8.0