From 1ecdb3c0a96ca995473a0d60dd003197636d87fe Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 05 二月 2025 15:13:14 +0800
Subject: [PATCH] 取水口综合信息-基本信息中增加地址属性
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java | 49 +++++++------------------------------------------
1 files changed, 7 insertions(+), 42 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 e9bcc22..45472a9 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
@@ -41,9 +41,6 @@
@Autowired
private RmLossDayLastMapper rmLossDayLastMapper;
- @Value("${rtu.batteryVolt}")
- private Double batteryVolt;
-
@Value("${rtu.signalIntensity.weak}")
private Integer weak;
@@ -79,25 +76,6 @@
* @return
*/
public QueryResultVo<List<VoIntakeUnReported>> getUnReportedIntakes(CommonQO qo) {
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
- if(timeStart == "") {
- timeStart = null;
- }
- if(timeStop == "") {
- timeStop = null;
- }
- if(timeStart != null && timeStart != "") {
- timeStart = timeStart + " 00:00:00";
- }
- qo.setTimeStart(timeStart);
-
- if(timeStop != null && timeStop != "") {
- timeStop = timeStop + " 23:59:59";
- }
- qo.setTimeStop(timeStop);
-
-
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
Long itemTotal = rmOnHourReportLastMapper.getUnReportedIntakesCount(params);
@@ -160,7 +138,6 @@
* @return
*/
public QueryResultVo<List<VoBatteryVolt>> getUnderVoltIntakes(BatteryVoltQO qo) {
- qo.setBatteryVolt(batteryVolt);
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
@@ -204,33 +181,21 @@
/**
* 鑾峰彇浠庢湭寮�杩囬榾鐨勫彇姘村彛
+ * @param qo
+ * @param idStart
+ * @param idEnd
* @return
*/
- public QueryResultVo<List<VoIntake>> getNeverOpenValveIntakes(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);
-
+ public QueryResultVo<List<VoIntakeUnOpenValve>> getNeverOpenValveIntakes(CommonQO qo, Long idStart, Long idEnd) {
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+ params.put("idStart", idStart) ;
+ params.put("idEnd", idEnd) ;
// 鑾峰彇绗﹀悎鏉′欢鐨勮褰曟暟
Long itemTotal = Optional.ofNullable(rmOpenCloseValveHistoryMapper.getNeverOpenValveIntakesCount(params)).orElse(0L);
- QueryResultVo<List<VoIntake>> rsVo = new QueryResultVo<>() ;
+ QueryResultVo<List<VoIntakeUnOpenValve>> rsVo = new QueryResultVo<>() ;
rsVo.pageSize = qo.pageSize ;
rsVo.pageCurr = qo.pageCurr ;
--
Gitblit v1.8.0