From b397edee2be2dfcc3f28eeac50298b4de26b1afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 13 十二月 2024 16:53:45 +0800
Subject: [PATCH] 取水口日取水量表中，出现一些大数，明显不正确，发析系统日志，发现一些阀控器会上报一些累计流量为0的数据，且无规律，推测是其不能从水表读取到累计流量时会上报0值。如果间歇上报0值，间歇上报一些非0值，非0值减去0值，就会出现大数，一天中出现几次那么会大数进行累加，数值将更大。为此变更算法，规避这种情况，但也会丢失一些流量值。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
index bd975f9..77eb655 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeCtrl.java
@@ -12,7 +12,8 @@
import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
import com.dy.pipIrrGlobal.rtuMw.Web2RtuMw;
-import com.dy.pipIrrGlobal.voUg.VoUgRtuResult;
+import com.dy.pipIrrGlobal.voUg.VoUgRtuResult4Failure;
+import com.dy.pipIrrGlobal.voUg.VoUgRtuResult4Success;
import com.dy.pipIrrGlobal.voUg.VoWatch;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
@@ -144,6 +145,7 @@
BaseResponse res = sendGetRequest2Mw(restTemplate, rqUrl) ;
if(res != null){
if(res.isSuccess()){
+ RtuUpgradeStateReceiverCtrl.afterMwForceOverCurUgTask();
String msg = res.getContent()==null?null:(String)res.getContent() ;
if(msg == null){
msg = res.getMsg() ;
@@ -232,9 +234,9 @@
@RequestMapping(value = "/exportUgFail", method = RequestMethod.GET)
public void exportUgFail(HttpServletResponse response) throws Exception {
setExcelRespProp(response, "鍗囩骇澶辫触RTU鍒楄〃");
- List<VoUgRtuResult> rsList = resSv.exportUgFail();
+ List<VoUgRtuResult4Failure> rsList = resSv.exportUgFail();
EasyExcel.write(response.getOutputStream())
- .head(VoUgRtuResult.class)
+ .head(VoUgRtuResult4Failure.class)
.excelType(ExcelTypeEnum.XLSX)
.sheet("鍗囩骇澶辫触RTU鍒楄〃")
.doWrite(rsList);
@@ -248,9 +250,9 @@
@RequestMapping(value = "/exportUgSuccess", method = RequestMethod.GET)
public void exportUgSuccess(HttpServletResponse response) throws Exception {
setExcelRespProp(response, "鍗囩骇鎴愬姛RTU鍒楄〃");
- List<VoUgRtuResult> rsList = resSv.exportUgSuccess();
+ List<VoUgRtuResult4Success> rsList = resSv.exportUgSuccess();
EasyExcel.write(response.getOutputStream())
- .head(VoUgRtuResult.class)
+ .head(VoUgRtuResult4Success.class)
.excelType(ExcelTypeEnum.XLSX)
.sheet("鍗囩骇鎴愬姛RTU鍒楄〃")
.doWrite(rsList);
--
Gitblit v1.8.0