From 35fed440bbfe79b032f63c236a235b123d28c65d Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期四, 08 八月 2024 11:05:26 +0800
Subject: [PATCH] 指定时间段内开卡总数量（物理卡）,优化代码
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java | 100 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 86 insertions(+), 14 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
index f2ea363..4dbc9b0 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java
@@ -25,7 +25,6 @@
import java.text.DecimalFormat;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -198,13 +197,14 @@
String timeStart = qo.getTimeStart();
String timeStop = qo.getTimeStop();
- if(timeStart != null) {
+ if(timeStart != null && timeStart != "") {
timeStart = timeStart + " 00:00:00";
- }else {
+ } else {
timeStart = LocalDate.now() + " 00:00:00";
}
qo.setTimeStart(timeStart);
- if(timeStop != null) {
+
+ if(timeStop != null && timeStop != "") {
timeStop = timeStop + " 23:59:59";
}else {
timeStop = LocalDate.now() + " 23:59:59";
@@ -236,13 +236,14 @@
String timeStart = qo.getTimeStart();
String timeStop = qo.getTimeStop();
- if(timeStart != null) {
+ if(timeStart != null && timeStart != "") {
timeStart = timeStart + " 00:00:00";
- }else {
+ } else {
timeStart = LocalDate.now() + " 00:00:00";
}
qo.setTimeStart(timeStart);
- if(timeStop != null) {
+
+ if(timeStop != null && timeStop != "") {
timeStop = timeStop + " 23:59:59";
}else {
timeStop = LocalDate.now() + " 23:59:59";
@@ -274,13 +275,14 @@
String timeStart = qo.getTimeStart();
String timeStop = qo.getTimeStop();
- if(timeStart != null) {
+ if(timeStart != null && timeStart != "") {
timeStart = timeStart + " 00:00:00";
- }else {
+ } else {
timeStart = LocalDate.now() + " 00:00:00";
}
qo.setTimeStart(timeStart);
- if(timeStop != null) {
+
+ if(timeStop != null && timeStop != "") {
timeStop = timeStop + " 23:59:59";
}else {
timeStop = LocalDate.now() + " 23:59:59";
@@ -434,7 +436,7 @@
if(timeStart != null && timeStart != "") {
timeStart = timeStart + " 00:00:00";
} else {
- timeStart = LocalDateTime.of(2024, 1, 1, 0, 0, 0).toString();
+ timeStart = LocalDate.now() + " 00:00:00";
}
qo.setTimeStart(timeStart);
@@ -474,7 +476,7 @@
if(timeStart != null && timeStart != "") {
timeStart = timeStart + " 00:00:00";
} else {
- timeStart = LocalDateTime.of(2024, 1, 1, 0, 0, 0).toString();
+ timeStart = LocalDate.now() + " 00:00:00";
}
qo.setTimeStart(timeStart);
@@ -515,7 +517,7 @@
if(timeStart != null && timeStart != "") {
timeStart = timeStart + " 00:00:00";
} else {
- timeStart = LocalDateTime.of(2024, 1, 1, 0, 0, 0).toString();
+ timeStart = LocalDate.now() + " 00:00:00";
}
qo.setTimeStart(timeStart);
@@ -554,7 +556,7 @@
if(timeStart != null && timeStart != "") {
timeStart = timeStart + " 00:00:00";
} else {
- timeStart = LocalDateTime.of(2024, 1, 1, 0, 0, 0).toString();
+ timeStart = LocalDate.now() + " 00:00:00";
}
qo.setTimeStart(timeStart);
@@ -577,4 +579,74 @@
rsVo.obj = rmOpenCloseValveHistoryMapper.getUseWaterDurationGtValueIntakes(params);
return rsVo ;
}
+
+ /**
+ * 鎸囧畾鏃堕棿娈� 鏈夊紑闃� 鏃犲叧闃�鐨勫彇姘村彛
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoIntake>> getHaveOpenNoCloseIntakes(CommonQO qo) {
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+ if(timeStart != null && timeStart != "") {
+ timeStart = timeStart + " 00:00:00";
+ } else {
+ timeStart = LocalDate.now() + " 00:00:00";
+ }
+ qo.setTimeStart(timeStart);
+
+ if(timeStop != null && timeStop != "") {
+ timeStop = timeStop + " 23:59:59";
+ }else {
+ timeStop = LocalDate.now() + " 23:59:59";
+ }
+ qo.setTimeStop(timeStop);
+
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmOpenCloseValveHistoryMapper.getHaveOpenNoCloseIntakesCount(params);
+
+ QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmOpenCloseValveHistoryMapper.getHaveOpenNoCloseIntakes(params);
+ return rsVo ;
+ }
+
+ /**
+ * 鎸囧畾鏃堕棿娈� 鏃犲紑闃� 鏈夊叧闃�鐨勫彇姘村彛
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoIntake>> getNoOpenHaveCloseIntakes(CommonQO qo) {
+ String timeStart = qo.getTimeStart();
+ String timeStop = qo.getTimeStop();
+ if(timeStart != null && timeStart != "") {
+ timeStart = timeStart + " 00:00:00";
+ } else {
+ timeStart = LocalDate.now() + " 00:00:00";
+ }
+ qo.setTimeStart(timeStart);
+
+ if(timeStop != null && timeStop != "") {
+ timeStop = timeStop + " 23:59:59";
+ }else {
+ timeStop = LocalDate.now() + " 23:59:59";
+ }
+ qo.setTimeStop(timeStop);
+
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmOpenCloseValveHistoryMapper.getNoOpenHaveCloseIntakesCount(params);
+
+ QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmOpenCloseValveHistoryMapper.getNoOpenHaveCloseIntakes(params);
+ return rsVo ;
+ }
}
--
Gitblit v1.8.0