From bc443e83a8fd8aaeded0b123b5e471a4493ecc21 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 15 一月 2025 13:41:27 +0800
Subject: [PATCH] 修改一个bug
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/report/ReportSv.java | 132 ++++---------------------------------------
1 files changed, 13 insertions(+), 119 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 8a0af3b..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,6 +1,6 @@
package com.dy.pipIrrRemote.report;
-import com.dy.common.mw.protocol.p206V1_0_0.CommonV1_0_1;
+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;
@@ -14,8 +14,6 @@
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;
@@ -52,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);
@@ -81,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);
@@ -110,37 +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 = timeStart_open + " 00:00:00";
- } else {
- timeStart_open = LocalDateTime.now().minusDays(30) + " 00:00:00";
- }
- qo.setTimeStart_open(timeStart_open);
-
- if(timeStop_open != null && timeStop_open != "") {
- timeStop_open = timeStop_open + " 23:59:59";
- }else {
- timeStop_open = LocalDate.now() + " 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 = timeStart_close + " 00:00:00";
- } else {
- timeStart_close = LocalDate.now().minusDays(30) + " 00:00:00";
- }
- qo.setTimeStart_close(timeStart_close);
-
- if(timeStop_close != null && timeStop_close != "") {
- timeStop_close = timeStop_close + " 23:59:59";
- }else {
- timeStop_close = LocalDate.now() + " 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);
@@ -153,8 +103,8 @@
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_()));
+ 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;
@@ -167,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.setTimeStart_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);
@@ -200,8 +130,8 @@
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_()));
+ 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;
@@ -214,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);
@@ -243,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);
@@ -272,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);
@@ -301,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