From 9c32918e2d2db0dcc8b3a3af2be72831252019d9 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 08 二月 2025 09:28:02 +0800
Subject: [PATCH] 涉嫌偷水功能完善代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 129 ++++++++----------------------------------
1 files changed, 25 insertions(+), 104 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
index 2131e44..d41a7c0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java
@@ -1,5 +1,6 @@
package com.dy.pipIrrRemote.report;
+import com.dy.common.mw.protocol.p206V1.CommonV1;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.voRm.VoOnHour;
@@ -49,16 +50,7 @@
* @return
*/
public QueryResultVo<List<VoOnHour>> getOnHourReportsHistory(OnHourQO qo) {
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- qo.setTimeStart(timeStart);
- }
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- qo.setTimeStop(timeStop);
- }
+ qo.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmOnHourReportHistoryMapper.getOnHourReportsCount_history(params);
@@ -78,16 +70,7 @@
* @return
*/
public QueryResultVo<List<VoOnHour>> getOnHourReportsLast(OnHourQO qo) {
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- qo.setTimeStart(timeStart);
- }
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- qo.setTimeStop(timeStop);
- }
+ qo.completionTime();
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmOnHourReportLastMapper.getOnHourReportsCount_last(params);
@@ -107,27 +90,7 @@
* @return
*/
public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_history(OpenCloseValveQO qo) {
- String timeStart_open = qo.getTimeStart_open();
- String timeStop_open = qo.getTimeStop_open();
- if(timeStart_open != null) {
- timeStart_open = timeStart_open + " 00:00:00";
- qo.setTimeStop_open(timeStart_open);
- }
- if(timeStop_open != null) {
- timeStop_open = timeStop_open + " 23:59:59";
- qo.setTimeStop_open(timeStop_open);
- }
-
- String timeStart_close = qo.getTimeStart_close();
- String timeStop_close = qo.getTimeStop_close();
- if(timeStart_close != null) {
- timeStart_close = timeStart_close + " 00:00:00";
- qo.setTimeStart_close(timeStart_close);
- }
- if(timeStop_close != null) {
- timeStop_close = timeStop_close + " 23:59:59";
- qo.setTimeStop_close(timeStop_close);
- }
+ qo.completionTimeNoEmpty() ;
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmOpenCloseValveHistoryMapper.getOpenCloseValveReportsCount_history(params);
@@ -137,7 +100,14 @@
rsVo.pageCurr = qo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params);
+ List<VoOpenCloseValve> list = rmOpenCloseValveHistoryMapper.getOpenCloseValveReports_history(params);
+ if (list != null && list.size() > 0) {
+ for (VoOpenCloseValve vo : list) {
+ vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ }
+ }
+ rsVo.obj = list;
return rsVo ;
}
@@ -147,27 +117,7 @@
* @return
*/
public QueryResultVo<List<VoOpenCloseValve>> getOpenCloseValveReports_last(OpenCloseValveQO qo) {
- String timeStart_open = qo.getTimeStart_open();
- String timeStop_open = qo.getTimeStop_open();
- if(timeStart_open != null) {
- timeStart_open = timeStart_open + " 00:00:00";
- qo.setTimeStop_open(timeStart_open);
- }
- if(timeStop_open != null) {
- timeStop_open = timeStop_open + " 23:59:59";
- qo.setTimeStop_open(timeStop_open);
- }
-
- String timeStart_close = qo.getTimeStart_close();
- String timeStop_close = qo.getTimeStop_close();
- if(timeStart_close != null) {
- timeStart_close = timeStart_close + " 00:00:00";
- qo.setTimeStart_close(timeStart_close);
- }
- if(timeStop_close != null) {
- timeStop_close = timeStop_close + " 23:59:59";
- qo.setTimeStop_close(timeStop_close);
- }
+ qo.completionTime() ;
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmOpenCloseValveLastMapper.getOpenCloseValveReportsCount_last(params);
@@ -177,7 +127,14 @@
rsVo.pageCurr = qo.pageCurr ;
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params);
+ List<VoOpenCloseValve> list = rmOpenCloseValveLastMapper.getOpenCloseValveReports_last(params);
+ if (list != null && list.size() > 0) {
+ for (VoOpenCloseValve vo : list) {
+ vo.setOpenType(CommonV1.openCloseValveType(vo.getOpType()==null?(byte)100:vo.getOpType()));
+ vo.setCloseType(CommonV1.openCloseValveType(vo.getClType()==null?(byte)100:vo.getClType()));
+ }
+ }
+ rsVo.obj = list;
return rsVo ;
}
@@ -187,16 +144,7 @@
* @return
*/
public QueryResultVo<List<VoTiming>> getTimingReportsHistory(OnHourQO qo) {
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- qo.setTimeStart(timeStart);
- }
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- qo.setTimeStop(timeStop);
- }
+ qo.completionTime() ;
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmTimingReportHistoryMapper.getTimingReportsCount_history(params);
@@ -216,16 +164,7 @@
* @return
*/
public QueryResultVo<List<VoTiming>> getTimingReportsLast(OnHourQO qo) {
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- qo.setTimeStart(timeStart);
- }
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- qo.setTimeStop(timeStop);
- }
+ qo.completionTime() ;
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmTimingReportLastMapper.getTimingReportsCount_last(params);
@@ -245,16 +184,7 @@
* @return
*/
public QueryResultVo<List<VoWork>> getWorkReportsHistory(OnHourQO qo) {
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- qo.setTimeStart(timeStart);
- }
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- qo.setTimeStop(timeStop);
- }
+ qo.completionTime() ;
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmWorkReportHistoryMapper.getWorkReportsCount_history(params);
@@ -274,16 +204,7 @@
* @return
*/
public QueryResultVo<List<VoWork>> getWorkReportsLast(OnHourQO qo) {
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- qo.setTimeStart(timeStart);
- }
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- qo.setTimeStop(timeStop);
- }
+ qo.completionTime() ;
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmWorkReportLastMapper.getWorkReportsCount_last(params);
--
Gitblit v1.8.0