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/RtuUpgradeSv.java | 67 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 28 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java
index 626af0e..018f0dc 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/rtuUpgrage/RtuUpgradeSv.java
@@ -4,9 +4,9 @@
import com.dy.pipIrrGlobal.daoRm.UgRtuControllerMapper;
import com.dy.pipIrrGlobal.daoRm.UgRtuProgramMapper;
import com.dy.pipIrrGlobal.daoRm.UgRtuTaskMapper;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuProgram;
-import com.dy.pipIrrGlobal.pojoRm.UgRtuTask;
-import com.dy.pipIrrGlobal.voRm.VoUpgradeDetail;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuProgram;
+import com.dy.pipIrrGlobal.pojoUg.UgRtuTask;
+import com.dy.pipIrrGlobal.voUg.VoUpgradeDetail;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -58,24 +58,6 @@
}
/**
- * 鏌ヨ涓�涓崌绾т换鍔℃湁鍏充俊鎭�
- * @return 鍗囩骇浠诲姟鏈夊叧淇℃伅
- */
- public List<VoUpgradeDetail> selectTaskDetail(String taskId){
- return this.tdao.selectTaskDetail(Long.valueOf(taskId)) ;
- }
-
-
- /**
- * 淇濆瓨鍗囩骇浠诲姟涓烘墽琛岀姸鎬�
- * @param taskId 浠诲姟ID
- */
- public void setUpgradeTaskExecuted(String taskId){
- this.tdao.executeById(Long.valueOf(taskId)) ;
- }
-
-
- /**
* 淇濆瓨RTU鍗囩骇缁撴潫鐘舵��
* @param taskId
* @param rtu
@@ -87,17 +69,46 @@
cdao.updateRtuUpgradeState(params) ;
}
- /////////////////////////////////////////////////////
- //
- // 浠ヤ笅妯℃嫙鏁版嵁
- //
- /////////////////////////////////////////////////////
/**
- * 閫氫俊涓婚敭鏌ヨ涓�涓崌绾т换鍔�
+ * 鏌ヨ涓�涓崌绾т换鍔℃湁鍏充俊鎭�
+ * @return 鍗囩骇浠诲姟鏈夊叧淇℃伅
+ */
+ public VoUpgradeDetail selectTaskDetail(String taskId){
+ List<VoUpgradeDetail> list = this.tdao.selectTaskDetail(Long.valueOf(taskId)) ;
+ if(list != null && list.size() > 0){
+ return list.get(0) ;
+ }
+ return null ;
+ }
+
+ /**
+ * 淇濆瓨鍗囩骇浠诲姟涓烘墽琛岀姸鎬�
+ * @param taskId 浠诲姟ID
+ */
+ public void setUpgradeTaskExecuted(String taskId){
+ this.tdao.executeById(Long.valueOf(taskId)) ;
+ }
+
+
+ /**
+ * 璁剧疆鍗囩骇浠诲姟宸茬粡瀹屾垚
+ * @param taskId
+ */
+ public void updateTaskOver(String taskId){
+ tdao.overById(Long.valueOf(taskId)) ;
+ }
+
+ /////////////////////////////////////////////////////
+ //
+ // 浠ヤ笅婕旂ず鍗囩骇鍔熻兘鐢ㄥ埌
+ //
+ /////////////////////////////////////////////////////
+
+ /**
+ * 鏌ヨ鏈�鏂颁竴涓崌绾т换鍔�
* @return
*/
public UgRtuTask selectLastTask(){
return tdao.selectLastTask();
}
-
}
--
Gitblit v1.8.0