From 8ed16da7d96f1b0b954d75c20ea5177d23ad9eaf Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期二, 16 一月 2024 16:32:07 +0800
Subject: [PATCH] 2024-01-16 朱宝民 合并代码
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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 a8b3f16..142c96b 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
@@ -4,10 +4,15 @@
import com.dy.aceMw.server.rtuData.dbSv.DbSv;
import com.dy.common.mw.protocol.Data;
import com.dy.common.springUtil.SpringContextUtil;
+import com.dy.common.util.DateTime;
import com.dy.pipIrrGlobal.pojoPr.PrController;
import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
public class TkPreGenObjs extends TaskSurpport {
@@ -21,7 +26,8 @@
* @param data 闇�瑕佸鐞嗙殑鏁版嵁
*/
@Override
- public void execute(Object data) {
+ public void execute(Object data) throws ParseException {
+ DateFormat fmt =new SimpleDateFormat(("yyyy_MM_dd_HH_mm_ss"));
Data d = (Data)data ;
String rtuAddr = d.getRtuAddr() ;//TkRtuData閲屽垽鏂簡rtuAddr涓虹┖
DbSv sv = (DbSv)SpringContextUtil.getBean(DbSv.class) ;
@@ -31,11 +37,11 @@
//鏁版嵁搴撲腑鏈煡璇㈠埌鎺у埗鍣紙RTU瀹炰綋锛�
//娴佹氮鑰呮帶鍒跺櫒
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);
- //}
+ if(rtuTramp == null){
+ rtuTramp = new PrControllerTramp(null, rtuAddr, d.getProtocol(), fmt.parse(DateTime.yyyy_MM_dd_HH_mm_ss())) ;
+ this.taskResult = new Object[]{sv, null, rtuTramp} ;
+ this.toNextOneTask(data, TkDealControllerTramp.taskId);
+ }
}
//涓嶈鏄惁涓烘祦娴帶鍒跺櫒锛圧TU瀹炰綋锛夛紝閮借杩涜涓嬫宸ヤ綔
this.taskResult = new Object[]{sv, controller, null} ;
--
Gitblit v1.8.0