From ee711d38f66222915bc81332c98af677fa5cd96c Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 16 七月 2024 22:17:02 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 65 insertions(+), 2 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 6770b91..8c39b08 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
@@ -3,6 +3,11 @@
import com.dy.common.mw.protocol.Command;
import com.dy.common.mw.protocol.CommandType;
import com.dy.common.mw.protocol.p206V1_0_0.CodeV1_0_1;
+import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
+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;
@@ -15,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()) ;
@@ -31,23 +40,41 @@
public void execute(Object data) throws ParseException {
Data d = (Data)data ;
String rtuAddr = d.getRtuAddr() ;//TkRtuData閲屽垽鏂簡rtuAddr涓虹┖
+ 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 = (DbSv)SpringContextUtil.getBean(DbSv.class) ;
if(sv != null){
PrController controller = sv.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
PrControllerTramp controllerTramp = null ;
+ SeClient clientVo = null ;//杩欎釜鍊煎璞′腑鍙湁id鍜宯ame浼氭湁鍊�
if(controller == null){
//鏁版嵁搴撲腑鏈煡璇㈠埌鎺у埗鍣紙RTU瀹炰綋锛�(宸茬粡缁戝畾涓旀帶鍒跺櫒鍦板潃鐩哥)
//娴佹氮鑰呮帶鍒跺櫒
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){
+ clientVo = this.getClient(sv, (DataV1_0_1)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瀵硅薄");
@@ -55,6 +82,42 @@
}
/**
+ * 寰楀埌鐩稿叧鍐滄埛淇℃伅
+ */
+ private SeClient getClient(DbSv sv, DataV1_0_1 d1){
+ SeClient clientVo = null ;
+ if(d1.subData != null &&
+ (d1.subData instanceof DataCd83OpenVo ||
+ d1.subData instanceof DataCd83CloseVo ||
+ d1.subData instanceof DataCd84Vo)){
+ //寮�闃�鍚庯紝鍏抽榾鎶ワ紝闃�寮�宸ヤ綔鎶�
+ String icCardAddr = null ;
+ String icCardNo = null ;
+ if(d1.subData instanceof DataCd83OpenVo){
+ DataCd83OpenVo vo = (DataCd83OpenVo)d1.subData ;
+ icCardAddr = vo.icCardAddr ;
+ icCardNo = vo.icCardNo ;
+ }else if(d1.subData instanceof DataCd83CloseVo){
+ DataCd83CloseVo vo = (DataCd83CloseVo)d1.subData ;
+ icCardAddr = vo.icCardAddr ;
+ icCardNo = vo.icCardNo ;
+ }else if(d1.subData instanceof DataCd84Vo){
+ DataCd84Vo vo = (DataCd84Vo)d1.subData ;
+ icCardAddr = vo.cardAddr ;
+ icCardNo = vo.cardNo ;
+ }
+ if(icCardAddr != null && icCardNo != null){
+ if(icCardAddr.equals(ProtocolConstantV206V1_0_0.vsCardAddr)){
+ clientVo = sv.getClientIdAndNameByVsCardNo(icCardNo) ;
+ }else{
+ clientVo = sv.getClientIdAndNameByCardAddrAndCardNo(icCardAddr, icCardNo) ;
+ }
+ }
+ }
+ return clientVo ;
+ }
+
+ /**
* 鍙戦�佹竻绌篟TU鐨勫懡浠�
* @param rtuAddr
* @param protocol
--
Gitblit v1.8.0