From 3f17034c768ba4fc330e01f014b4f880e6a1569c Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 12 三月 2024 16:03:30 +0800
Subject: [PATCH] 2024-03-12 朱宝民 增加已挂失，未补卡接口
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
index a4771a6..807efb2 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java
@@ -10,6 +10,11 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
public class TkPreGenObjs extends TaskSurpport {
private static final Logger log = LogManager.getLogger(TkPreGenObjs.class.getName()) ;
@@ -22,24 +27,25 @@
* @param data 闇�瑕佸鐞嗙殑鏁版嵁
*/
@Override
- public void execute(Object data) {
+ 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(sv != null){
- PrController controller = sv.getPrControllerByRtuAddr(rtuAddr) ;
+ PrController controller = sv.getControllersByRtuAddrAndIntakeNotNull(rtuAddr) ;
+ PrControllerTramp controllerTramp = null ;
if(controller == null){
- //鏁版嵁搴撲腑鏈煡璇㈠埌鎺у埗鍣紙RTU瀹炰綋锛�
+ //鏁版嵁搴撲腑鏈煡璇�(宸茬粡缁戝畾涓旀帶鍒跺櫒鍦板潃鐩哥)鍒版帶鍒跺櫒锛圧TU瀹炰綋锛�
//娴佹氮鑰呮帶鍒跺櫒
- PrControllerTramp rtuTramp = sv.getPrControllerTrampByRtuAddr(rtuAddr);
- if(rtuTramp == null){
- rtuTramp = new PrControllerTramp(null, rtuAddr, d.getProtocol(), DateTime.yyyy_MM_dd_HH_mm_ss()) ;
- this.taskResult = new Object[]{sv, null, rtuTramp} ;
- this.toNextOneTask(data, TkDealControllerTramp.taskId);
+ controllerTramp = sv.getPrControllerTrampByRtuAddr(rtuAddr);
+ if(controllerTramp == null){
+ controllerTramp = new PrControllerTramp(null, rtuAddr, d.getProtocol(), new Date()) ;
+ //this.taskResult = new Object[]{sv, null, rtuTramp} ;
+ //this.toNextOneTask(data, TkDealControllerTramp.taskId);
}
}
- //涓嶈鏄惁涓烘祦娴帶鍒跺櫒锛圧TU瀹炰綋锛夛紝閮借杩涜涓嬫宸ヤ綔
- this.taskResult = new Object[]{sv, controller, null} ;
+ //涓嶈鏄惁涓烘祦娴帶鍒跺櫒锛圧TU瀹炰綋锛夛紝閮借杩涜涓嬫宸ヤ綔锛岃褰曞叾涓婃姤鐨勪竴浜涙暟鎹紝褰撶粦瀹氭帶鍒跺櫒鍚庯紝鏁版嵁鑷姩鏈変簡褰掑睘
+ this.taskResult = new Object[]{sv, controller, controllerTramp} ;
this.toNextTasks(data);
}else{
log.error("涓ラ噸閿欒锛屾湭鑳藉緱鍒癉bSv瀵硅薄");
--
Gitblit v1.8.0