From 76d5cfc674f9b1033baafbe3ac71f06ed001f289 Mon Sep 17 00:00:00 2001 From: Administrator <zhubaomin> Date: 星期四, 07 三月 2024 10:49:27 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java index 4e6f9df..09e93dd 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-accept/src/main/java/com/dy/aceMw/server/rtuData/p206V1_0_0/TkDealAutoReport.java @@ -12,8 +12,6 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import java.util.Date; - /** * @Author liurunyu * @Date 2024/1/16 14:11 @@ -58,7 +56,7 @@ * @param dataCdC0Vo 鑷姤鏁版嵁瀵硅薄 */ private void saveOrUpdateLast(DbSv sv, PrController controller, String rtuAddr, DataV1_0_1 dV1_0_1, DataCdC0Vo dataCdC0Vo) throws Exception { - RmAutoReportLast po = sv.getRmLastAutoReport(rtuAddr) ; + RmAutoReportLast po = sv.getRmAutoReportLast(rtuAddr) ; if(po == null){ po = new RmAutoReportLast(null, controller==null?null:controller.getId(), controller==null?null:controller.getId(), rtuAddr, @@ -69,7 +67,7 @@ sv.saveRmAutoReportLast(po) ; }else{ po = this.update(po, dV1_0_1, dataCdC0Vo) ; - sv.saveRmAutoReportLast(po); + sv.updateRmAutoReportLast(po); } } -- Gitblit v1.8.0