From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 十月 2024 16:46:45 +0800
Subject: [PATCH] 1、苏有勋把开关阀报（功能码83）报中的控制器时钟去除掉了，通信中间件解决这个报文时，把开阀报中的开阀时间当作控制器时钟，把关阀报中的关阀时间作为控制器时钟； 2、优化代码。
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
index c49c3c0..4eebda0 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
@@ -7,6 +7,7 @@
import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
import com.dy.common.mw.protocol.p206V1_0_0.upVos.*;
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;
import com.dy.common.mw.protocol.Data;
@@ -19,8 +20,12 @@
import java.text.ParseException;
import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
public class TkPreGenObjs extends TaskSurpport {
+
+ private static final Map<String, Boolean> onceUpDataRtus = new HashMap<>();
private static final Logger log = LogManager.getLogger(TkPreGenObjs.class.getName()) ;
@@ -35,7 +40,20 @@
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 DataV1_0_1){
+ DataV1_0_1 dataV1_0_1 = (DataV1_0_1)d.subData ;
+ if(dataV1_0_1.subData != null && dataV1_0_1.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 ;
@@ -46,14 +64,13 @@
controllerTramp = sv.getPrControllerTrampByRtuAddr(rtuAddr);
if(controllerTramp == null){
//绗竴娆″彂鐜�
- controllerTramp = new PrControllerTramp(null, rtuAddr, d.getProtocol(), new Date()) ;
+ controllerTramp = new PrControllerTramp(null, rtuAddr, d.getProtocol(), new Date(), ServerProperties.orgTag) ;
//绗竴娆″彂鐜帮紝涓嬪彂娓呯┖RTU鍘嗗彶鍛戒护锛屼互浣垮叾閲嶆柊寮�濮嬭褰曟柊鍦扮偣鐨勬暟鎹�
this.sendClearCommand(rtuAddr, d.protocol);
}
}else{
if(d.subData != null && d.subData instanceof DataV1_0_1){
- DataV1_0_1 d1 = (DataV1_0_1)d.subData ;
- clientVo = this.getClient(sv, d1);
+ clientVo = this.getClient(sv, (DataV1_0_1)d.subData);
}
}
//涓嶈鏄惁涓烘祦娴帶鍒跺櫒锛圧TU瀹炰綋锛夛紝閮借杩涜涓嬫宸ヤ綔锛岃褰曞叾涓婃姤鐨勪竴浜涙暟鎹紝褰撶粦瀹氭帶鍒跺櫒鍚庯紝鏁版嵁鑷姩鏈変簡褰掑睘
--
Gitblit v1.8.0