From 3c2c295ec48587fe9d9f656e0baa74c71a3884f7 Mon Sep 17 00:00:00 2001 From: liurunyu <lry9898@163.com> Date: 星期日, 27 十月 2024 16:46:45 +0800 Subject: [PATCH] 1、苏有勋把开关阀报(功能码83)报中的控制器时钟去除掉了,通信中间件解决这个报文时,把开阀报中的开阀时间当作控制器时钟,把关阀报中的关阀时间作为控制器时钟; 2、优化代码。 --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java index 1260bd9..5f0657c 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkDealClientAmountDay.java @@ -3,15 +3,10 @@ import com.dy.common.mw.protocol.Data; import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1; import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83CloseVo; -import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd83OpenVo; -import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd84Vo; -import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCdC0Vo; import com.dy.common.util.DateTime; import com.dy.pipIrrGlobal.pojoPr.PrController; import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDay; import com.dy.pipIrrGlobal.pojoRm.RmClientAmountDayLast; -import com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDay; -import com.dy.pipIrrGlobal.pojoRm.RmIntakeAmountDayLast; import com.dy.pipIrrGlobal.pojoSe.SeClient; import com.dy.rtuMw.server.rtuData.TaskSurpport; import com.dy.rtuMw.server.rtuData.dbSv.DbSv; @@ -108,12 +103,10 @@ poHistory = this.updateRmClientAmountBySameDateNewData(clientVo, poHistory, poLast, dV1_0_1, cdData); sv.updateRmClientAmountDay(poHistory); } - sv.saveRmClientAmountLast(poLast); }else if(upYmd.after(poLast.dt)){ //鏂扮殑鏃ユ湡 poLast = this.updateRmClientAmountLastByNewDateNewData(clientVo, dV1_0_1, cdData, poLast); this.newAndSaveHistoryDataDeal(sv, clientVo, dV1_0_1, cdData, poLast); - sv.saveRmClientAmountLast(poLast); }else{ //杩欑鎯呭喌涓嶅瓨鍦� } -- Gitblit v1.8.0