From fab1dc83c6b5413e967e7623796dc2fc8ab3bd1d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 07 二月 2025 15:46:51 +0800
Subject: [PATCH] 涉嫌偷水功能返回数据中属性类型修改
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsSv.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsSv.java
index 620ad5f..09d573f 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/largeScreen/Ls4StatisticsSv.java
@@ -72,14 +72,16 @@
Date dtAtXHourBefore = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(DateTime.lastXHour_yyyy_MM_dd_HH_mm_ss(24)) ;//X涓皬鏃跺墠
VoCurrentInfo vo = new VoCurrentInfo() ;
Integer[] result = this.queryMwOnAndOffLine() ;
- vo.totalCountOfOnLine = result[0] ;
- vo.totalCountOfOffLine = totalCountOfIntake - vo.totalCountOfOnLine; ;
- vo.totalCountOfOpenValve = this.dao.totalCountOfOpenValve(dtAtXHourBefore) ;
- vo.totalCountOfCloseValve = this.dao.totalCountOfCloseValve(dtAtXHourBefore) ;
- vo.totalCountOfUnknownValve = totalCountOfIntake - vo.totalCountOfOpenValve - vo.totalCountOfCloseValve ;
- vo.totalCountOfAlarm = this.dao.totalCountOfAlarm(dtAtXHourBefore) ;
- vo.totalCountOfNoAlarm = this.dao.totalCountOfNoAlarm(dtAtXHourBefore) ;
- vo.totalCountOfUnknownAlarm = totalCountOfIntake - vo.totalCountOfAlarm - vo.totalCountOfNoAlarm ;
+ vo.cTotalCountOfOnLine = result[0] ;
+ vo.cTotalCountOfOffLine = totalCountOfIntake - vo.cTotalCountOfOnLine;
+
+ vo.cTotalCountOfOpenValve = this.dao.totalCountOfOpenValve(dtAtXHourBefore) ;
+ vo.cTotalCountOfCloseValve = this.dao.totalCountOfCloseValve(dtAtXHourBefore) ;
+ vo.cTotalCountOfUnknownValve = totalCountOfIntake - vo.cTotalCountOfOpenValve - vo.cTotalCountOfCloseValve;
+
+ vo.cTotalCountOfAlarm = this.dao.totalCountOfAlarm(dtAtXHourBefore) ;
+ vo.cTotalCountOfNoAlarm = this.dao.totalCountOfNoAlarm(dtAtXHourBefore) ;
+ vo.cTotalCountOfUnknownAlarm = totalCountOfIntake - vo.cTotalCountOfAlarm - vo.cTotalCountOfNoAlarm;
return vo ;
}
@@ -87,8 +89,20 @@
* 鐩戞祴淇℃伅缁熻
* @return
*/
- public VoMonitorInfo monitorInfo(Date startDt){
+ public VoMonitorInfo monitorInfo(Date fromDt){
VoMonitorInfo vo = new VoMonitorInfo() ;
+ vo.mTotalCountOfReport = this.dao.mTotalCountOfReport(fromDt) ;
+ vo.mTotalCountOfNoReport = this.dao.mTotalCountOfNoReport(fromDt) ;
+ vo.mTotalCountOfNeverReport = this.dao.mTotalCountOfNeverReport() ;
+
+ vo.mTotalCountOfOpenValve = this.dao.mTotalCountOfOpenValve(fromDt) ;
+ vo.mTotalCountOfCloseValve = this.dao.mTotalCountOfCloseValve(fromDt) ;
+ vo.mTotalCountOfNeverOpenValve = this.dao.mTotalCountOfNeverOpenValve() ;
+
+ vo.mTotalCountOfAlarm = this.dao.mTotalCountOfAlarm(fromDt) ;
+ vo.mTotalCountOfNoAlarm = this.dao.mTotalCountOfNoAlarm(fromDt) ;
+ vo.mTotalCountOfNeverAlarm = this.dao.mTotalCountOfNeverAlarm() ;
+
return vo ;
}
--
Gitblit v1.8.0