From fbd4cf5aeb4274938c12030e5d235c65c20c19c3 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期三, 15 五月 2024 16:36:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202404.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202405.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202404.java
similarity index 65%
rename from pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202405.java
rename to pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202404.java
index 4621eea..9f6d275 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202405.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerTrampV202404.java
@@ -3,19 +3,21 @@
import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
-import com.dy.rtuMw.server.rtuData.p206V1_0_0.TkPreGenObjs;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+
+import java.util.Date;
+
/**
* @Author liurunyu
* @Date 2024/5/8 14:18
*/
-public class TkDealControllerTrampV202405 extends TaskSurpport {
+public class TkDealControllerTrampV202404 extends TaskSurpport {
- private static final Logger log = LogManager.getLogger(TkDealControllerTrampV202405.class.getName()) ;
+ private static final Logger log = LogManager.getLogger(TkDealControllerTrampV202404.class.getName()) ;
//绫籌D锛屼竴瀹氫笌Tree.xml閰嶇疆鏂囦欢涓厤缃竴鑷�
- public static final String taskId = "TkDealControllerTrampV202405" ;
+ public static final String taskId = "TkDealControllerTrampV202404" ;
/**
* 鎵ц鑺傜偣浠诲姟
@@ -23,11 +25,17 @@
*/
@Override
public void execute(Object data) {
- Object[] objs = this.getTaskResults(TkPreGenObjs.taskId) ;
+ Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId) ;
PrControllerTramp tramp = (PrControllerTramp)objs[2] ;
if(tramp != null){
DbSv sv = (DbSv)objs[0] ;
- sv.savePrConctrollerTramp(tramp);
+ if(tramp.id == null){
+ sv.savePrConctrollerTramp(tramp);
+ }else{
+ tramp.findDt = new Date() ;
+ sv.updatePrConctrollerTramp(tramp) ;
+ }
+
}
}
}
--
Gitblit v1.8.0