From 43a19a4424f67c379934ed0d70e0d1b3512cd769 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 27 三月 2025 09:31:44 +0800
Subject: [PATCH] 灌溉计划表中增加项目ID字段，计划列表返回值中增加项目名称，项目状态改为整数表示
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/intake/IntakeSv.java | 113 ++++++++++++++++----------------------------------------
1 files changed, 32 insertions(+), 81 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 30360d9..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;
@@ -55,29 +52,10 @@
* @param qo
* @return
*/
- public QueryResultVo<List<VoIntake>> getNotOnlineIntakes(CommonQO qo) {
- DecimalFormat df = new DecimalFormat("0.00");
- /**
- * 琛ラ綈璧锋鏃堕棿锛屽鏋滃紑濮嬫椂闂翠负绌猴紝鍒欓粯璁や负褰撳墠鏃ユ湡
- */
- String timeStart = qo.getTimeStart();
- String timeStop = qo.getTimeStop();
-
- if(timeStop != null) {
- timeStop = timeStop + " 23:59:59";
- if(timeStart != null) {
- timeStart = timeStart + " 00:00:00";
- }else {
- timeStart = LocalDate.now() + " 00:00:00";
- }
- }else {
- timeStart = null;
- }
- qo.setTimeStart(timeStart);
- qo.setTimeStop(timeStop);
-
- // 鐢熸垚鏌ヨ鍙傛暟
+ public QueryResultVo<List<VoIntake>> getNotOnlineIntakes(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(rmOnHourReportHistoryMapper.getNotOnlineIntakesCount(params)).orElse(0L);
@@ -89,6 +67,24 @@
rsVo.calculateAndSet(itemTotal, params);
rsVo.obj = rmOnHourReportHistoryMapper.getNotOnlineIntakes(params);
+ return rsVo ;
+ }
+
+ /**
+ * 鏈�杩戞湭鎶ユ暟鐨勫彇姘村彛
+ * @param qo
+ * @return
+ */
+ public QueryResultVo<List<VoIntakeUnReported>> getUnReportedIntakes(CommonQO qo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo);
+ Long itemTotal = rmOnHourReportLastMapper.getUnReportedIntakesCount(params);
+
+ QueryResultVo<List<VoIntakeUnReported>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = rmOnHourReportLastMapper.getUnReportedIntakes(params);
return rsVo ;
}
@@ -142,7 +138,6 @@
* @return
*/
public QueryResultVo<List<VoBatteryVolt>> getUnderVoltIntakes(BatteryVoltQO qo) {
- qo.setBatteryVolt(batteryVolt);
// 鐢熸垚鏌ヨ鍙傛暟
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
@@ -186,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 ;
@@ -300,6 +283,8 @@
default:
vo.openTypeName = "鏈煡绫诲瀷寮�闃�";
}
+ }else{
+ vo.openTypeName = "鏈煡绫诲瀷寮�闃�";
}
}
}
@@ -357,6 +342,8 @@
default:
vo.closeTypeName = "鏈煡鍏抽榾绫诲瀷";
}
+ }else{
+ vo.closeTypeName = "鏈煡鍏抽榾绫诲瀷";
}
}
}
@@ -686,40 +673,4 @@
return rsVo ;
}
- /**
- * 鏈�杩戞湭鎶ユ暟鐨勫彇姘村彛
- * @param qo
- * @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);
-
- QueryResultVo<List<VoIntakeUnReported>> rsVo = new QueryResultVo<>() ;
- rsVo.pageSize = qo.pageSize ;
- rsVo.pageCurr = qo.pageCurr ;
-
- rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = rmOnHourReportLastMapper.getUnReportedIntakes(params);
- return rsVo ;
- }
}
--
Gitblit v1.8.0