From 927beadbb05d22759efc4d60c931f906bffa511d Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 28 十月 2024 20:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 131 +++++++++----------------------------------
1 files changed, 27 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..54f2dde 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_0_0.CommonV1_0_1;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoRm.*;
import com.dy.pipIrrGlobal.voRm.VoOnHour;
@@ -13,6 +14,8 @@
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.stereotype.Service;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -49,16 +52,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 +72,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 +92,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 +102,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_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_()));
+ vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_()));
+ }
+ }
+ rsVo.obj = list;
return rsVo ;
}
@@ -147,27 +119,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 +129,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_0_1.openCloseValveType(vo.getOpenType_()==null?(byte)100:vo.getOpenType_()));
+ vo.setCloseType(CommonV1_0_1.openCloseValveType(vo.getCloseType_()==null?(byte)100:vo.getCloseType_()));
+ }
+ }
+ rsVo.obj = list;
return rsVo ;
}
@@ -187,16 +146,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 +166,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 +186,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 +206,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