From 67aab76b35f0ddb5c8b71313b81fa8867770a763 Mon Sep 17 00:00:00 2001
From: Administrator <zhubaomin>
Date: 星期三, 26 六月 2024 21:08:05 +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/p206V202404/TkDealTimingReportV202404.java | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealTimingReportV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealTimingReportV202404.java
index 51052ba..0cf2cb2 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealTimingReportV202404.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealTimingReportV202404.java
@@ -2,10 +2,10 @@
import com.dy.common.mw.protocol.Data;
import com.dy.common.mw.protocol.p206V202404.DataV202404;
-import com.dy.common.mw.protocol.p206V202404.upVos.*;
+import com.dy.common.mw.protocol.p206V202404.upVos.DataCd83Vo;
import com.dy.pipIrrGlobal.pojoPr.PrController;
-import com.dy.pipIrrGlobal.pojoRm.RmWorkReportHistory;
-import com.dy.pipIrrGlobal.pojoRm.RmWorkReportLast;
+import com.dy.pipIrrGlobal.pojoRm.RmTimingReportHistory;
+import com.dy.pipIrrGlobal.pojoRm.RmTimingReportLast;
import com.dy.rtuMw.server.rtuData.TaskSurpport;
import com.dy.rtuMw.server.rtuData.dbSv.DbSv;
import org.apache.logging.log4j.LogManager;
@@ -48,7 +48,7 @@
}
}
/**
- * 澶勭悊闃�寮�宸ヤ綔鎶ユ暟鎹�
+ * 澶勭悊闃�涓婃姤鏁版嵁
* @param sv 鏈嶅姟
* @param controller 鎺у埗鍣ㄥ璞�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
@@ -61,7 +61,7 @@
}
/**
- * 淇濆瓨鎴栨洿鏂版帶鍒跺櫒宸ヤ綔鎶ユ渶鏂版暟鎹�
+ * 淇濆瓨鎴栨洿鏂版帶鍒跺櫒璇ヤ笂鎶ユ渶鏂版暟鎹�
* @param sv 鏈嶅姟bean
* @param controller 鎺у埗鍣ㄥ璞�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
@@ -69,24 +69,24 @@
* @param cdData 鍔熻兘鏁版嵁
*/
private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd83Vo cdData)throws Exception {
- RmWorkReportLast po = sv.getRmWorkReportLast(rtuAddr) ;
+ RmTimingReportLast po = sv.getRmTimingReportLast(rtuAddr) ;
if(po == null){
- po = new RmWorkReportLast();
+ po = new RmTimingReportLast();
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.rtuAddr = rtuAddr;
po.valueFrom(dataV202404, cdData);
- sv.saveRmWorkReportLast(po) ;
+ sv.saveRmTimingReportLast(po) ;
}else{
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.valueFrom(dataV202404, cdData);
- sv.updateRmWorkReportLast(po);
+ sv.updateRmTimingReportLast(po);
}
}
/**
- * 淇濆瓨鎺у埗鍣ㄥ伐浣滄姤鍘嗗彶鏁版嵁
+ * 淇濆瓨鎴栨洿鏂版帶鍒跺櫒璇ヤ笂鎶ュ巻鍙叉暟鎹�
* @param sv 鏈嶅姟bean
* @param controller 鎺у埗鍣ㄥ璞�
* @param rtuAddr 鎺у埗鍣ㄥ湴鍧�
@@ -94,12 +94,11 @@
* @param cdData 鍔熻兘鏁版嵁
*/
private void saveHistory(DbSv sv, PrController controller, String rtuAddr, DataV202404 dataV202404, DataCd83Vo cdData)throws Exception {
- RmWorkReportHistory po = new RmWorkReportHistory();
+ RmTimingReportHistory po = new RmTimingReportHistory();
po.controllerId = controller==null?null:controller.getId();
po.intakeId = controller==null?null:controller.getIntakeId();
po.rtuAddr = rtuAddr;
po.valueFrom(dataV202404, cdData);
- sv.saveRmWorkReportHistory(po); ;
+ sv.saveRmTimingReportHistory(po); ;
}
-}
}
\ No newline at end of file
--
Gitblit v1.8.0