From d9765e031e100e1d8eea34e086cb9c81766e1a00 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 21 二月 2025 09:52:14 +0800
Subject: [PATCH] 针对王江海制定的协议： 1、优化相关注释； 2、优化代码； 3、协议中报警信息有变化：外门报警改为电池电压报警、增加阀门开关状态、增加阀门堵转报警等。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java | 66 +++++++++++++++++++++++++++++++-
1 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java
index 53bb25c..21a6d95 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkPreGenObjsV202404.java
@@ -3,10 +3,12 @@
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.CommandType;
import com.dy.common.mw.protocol.Data;
-import com.dy.common.mw.protocol.p206V202404.CodeV202404;
+import com.dy.common.mw.protocol.p206V202404.*;
+import com.dy.common.mw.protocol.p206V202404.upVos.*;
import com.dy.common.springUtil.SpringContextUtil;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
+import com.dy.pipIrrGlobal.pojoSe.SeClient;
import com.dy.rtuMw.server.ServerProperties;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
@@ -16,11 +18,16 @@
import java.text.ParseException;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @Author liurunyu
* @Date 2024/5/8 14:18
*/
public class TkPreGenObjsV202404 extends TaskSurpport {
+
+ private static final Map<String, Boolean> onceUpDataRtus = new HashMap<>();
private static final Logger log = LogManager.getLogger(TkPreGenObjsV202404.class.getName()) ;
@@ -35,10 +42,24 @@
public void execute(Object data) throws ParseException {
Data d = (Data)data ;
String rtuAddr = d.getRtuAddr() ;//TkRtuData閲屽垽鏂簡rtuAddr涓虹┖
- DbSv sv = (DbSv) SpringContextUtil.getBean(DbSv.class) ;
+ if(d.subData != null && d.subData instanceof DataV202404){
+ DataV202404 dataV1 = (DataV202404)d.subData ;
+ if(dataV1.subData != null && dataV1.subData instanceof DataCd02Vo){
+ //杩囨护鎺夊績璺虫暟鎹�
+ if(onceUpDataRtus.containsKey(rtuAddr)){
+ return ;
+ }
+ }
+ }
+ if(!onceUpDataRtus.containsKey(rtuAddr)){
+ onceUpDataRtus.put(rtuAddr, true) ;
+ }
+
+ DbSv sv = SpringContextUtil.getBean(DbSv.class) ;
if(sv != null){
PrController controller = sv.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
PrControllerTramp controllerTramp = null ;
+ SeClient clientVo = null ;//杩欎釜鍊煎璞′腑鍙湁id銆乶ame銆乤ddress浼氭湁鍊�
if(controller == null){
//鏁版嵁搴撲腑鏈煡璇㈠埌鎺у埗鍣紙RTU瀹炰綋锛�(宸茬粡缁戝畾涓旀帶鍒跺櫒鍦板潃鐩哥)
//娴佹氮鑰呮帶鍒跺櫒
@@ -49,9 +70,13 @@
//绗竴娆″彂鐜帮紝涓嬪彂娓呯┖RTU鍘嗗彶鍛戒护锛屼互浣垮叾閲嶆柊寮�濮嬭褰曟柊鍦扮偣鐨勬暟鎹�
this.sendClearCommand(rtuAddr, d.protocol);
}
+ }else{
+ if(d.subData != null && d.subData instanceof DataV202404){
+ clientVo = this.getClient(sv, (DataV202404)d.subData);
+ }
}
//涓嶈鏄惁涓烘祦娴帶鍒跺櫒锛圧TU瀹炰綋锛夛紝閮借杩涜涓嬫宸ヤ綔锛岃褰曞叾涓婃姤鐨勪竴浜涙暟鎹紝褰撶粦瀹氭帶鍒跺櫒鍚庯紝鏁版嵁鑷姩鏈変簡褰掑睘
- this.taskResult = new Object[]{sv, controller, controllerTramp} ;
+ this.taskResult = new Object[]{sv, controller, controllerTramp, clientVo} ;
this.toNextTasks(data);
}else{
log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒癉bSv瀵硅薄");
@@ -59,6 +84,41 @@
}
/**
+ * 寰楀埌鐩稿叧鍐滄埛淇℃伅
+ */
+ private SeClient getClient(DbSv sv, DataV202404 d1){
+ SeClient clientVo = null ;
+ if(d1.subData != null &&
+ (d1.subData instanceof DataCd84Vo ||
+ d1.subData instanceof DataCd85Vo ||
+ d1.subData instanceof DataCd80_5BVo)){
+ //寮�闃�鎶ワ紝鍏抽榾鎶ワ紝闃�寮�宸ヤ綔鎶�
+ String icCardAddr = null ;
+ String icCardNo = null ;
+ if(d1.subData instanceof DataCd84Vo){
+ DataCd84Vo vo = (DataCd84Vo)d1.subData ;
+ icCardAddr = vo.icCardAddr ;
+ icCardNo = vo.icCardNo ;
+ }else if(d1.subData instanceof DataCd85Vo){
+ DataCd85Vo vo = (DataCd85Vo)d1.subData ;
+ icCardAddr = vo.icCardAddr ;
+ icCardNo = vo.icCardNo ;
+ }else if(d1.subData instanceof DataCd80_5BVo){
+ DataCd80_5BVo vo = (DataCd80_5BVo)d1.subData ;
+ icCardAddr = vo.icCardAddr ;
+ icCardNo = vo.icCardNo ;
+ }
+ if(icCardAddr != null && icCardNo != null){
+ if(icCardAddr.equals(ProtocolConstantV206V202404.vsCardAddr)){
+ clientVo = sv.getClientIdAndNameByVsCardNo(icCardNo) ;
+ }else{
+ clientVo = sv.getClientIdAndNameByCardAddrAndCardNo(icCardAddr, icCardNo) ;
+ }
+ }
+ }
+ return clientVo ;
+ }
+ /**
* 鍙戦�佹竻绌篟TU鐨勫懡浠�
* @param rtuAddr
* @param protocol
--
Gitblit v1.8.0