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/Task.java | 4 +++-
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java | 11 ++---------
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkPreGenObjs.java | 18 ++++++++++++------
pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TaskSurpport.java | 4 +++-
4 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
index 1dc182d..2be6b7c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoPr/PrControllerMapper.java
@@ -5,7 +5,6 @@
import com.dy.pipIrrGlobal.voPr.VoController;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
-import org.springframework.security.access.method.P;
import java.util.List;
import java.util.Map;
@@ -50,21 +49,15 @@
* @param rtuAddr
* @return
*/
- List<Map<String, Object>> getControllersByCode(@Param("rtuAddr") String rtuAddr);
+ List<Map<String, Object>> getControllersByAddr(@Param("rtuAddr") String rtuAddr);
/**
* 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃
* @param rtuAddr
* @return
*/
- List<PrController> getControllersByRtuAddr(@Param("rtuAddr") String rtuAddr);
+ //List<PrController> getControllersByRtuAddr(@Param("rtuAddr") String rtuAddr);
- /**
- * 鏍规嵁鎺у埗鍣ㄧ紪鍙疯幏鍙栨帶鍒跺櫒鍒楄〃
- * @param rtuAddr
- * @return
- */
- List<PrController> getControllersByRtuAddr(@Param("rtuAddr") String rtuAddr);
/**
* 鏍规嵁鎺у埗鍣ㄧ紪鍙烽�昏緫鍒犻櫎鎺у埗
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/Task.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/Task.java
index 66f221b..e460a61 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/Task.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/Task.java
@@ -1,5 +1,7 @@
package com.dy.aceMw.server.rtuData;
+import java.text.ParseException;
+
public interface Task {
@@ -14,7 +16,7 @@
* 鎵ц鑺傜偣浠诲姟
* @param data 闇�瑕佸鐞嗙殑鏁版嵁
*/
- public void execute(Object data) ;
+ public void execute(Object data) throws ParseException;
/**
* 寰楀埌鏈换鍔¤妭鐐瑰鐞嗕骇鐢熺殑涓棿缁撴灉锛屼互渚涙湰鑺傜偣鎵�鍦ㄦ爲鏋濈殑涓嬬骇浠诲姟鑺傜偣鍙婃湰鏍戞灊鐨勫乏渚э紙鏍瑰湪涓婏級鎵�鏈夋爲鏋濈殑鑺傜偣搴旂敤鏈粨鏋�
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TaskSurpport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TaskSurpport.java
index 5842211..2b0a8c7 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TaskSurpport.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/TaskSurpport.java
@@ -3,6 +3,8 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+import java.text.ParseException;
+
/**
* 閮ㄥ垎瀹炵幇Task
*/
@@ -26,7 +28,7 @@
* @param data 闇�瑕佸鐞嗙殑鏁版嵁
*/
@Override
- public abstract void execute(Object data) ;
+ public abstract void execute(Object data) throws ParseException;
/**
* 浠诲姟閲囩敤瀵硅薄姹狅紝浠ヤ究閲嶇敤浠诲姟瀵硅薄锛�
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