From 203223860baa19deb6860eb2ba3181910d662980 Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 17 四月 2025 14:22:59 +0800
Subject: [PATCH] 1. 轮灌组被终止时灌溉时长为实际数值。2. 计划历史表按照创建时间倒排序。3. 发布计划时判断是否同项目下未完成计划，是否其他项目下使用了本计划的轮灌组且计划未完成。4. 根据计划ID获取计划最新状态。
---
pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java | 41 +++++++++++++++++++++++++++++++++++++----
1 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java
index 0a4edc5..def6e7b 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-statistics/src/main/java/com/dy/pipIrrStatistics/special/SpecialSv.java
@@ -4,12 +4,12 @@
import com.dy.common.util.DateTime;
import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoSpecial.SpecialMapper;
+import com.dy.pipIrrGlobal.voSpecial.VoAbnormalCloseValve;
import com.dy.pipIrrGlobal.voSpecial.VoSteal;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.common.utils.PojoUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-
import java.util.List;
import java.util.Map;
import java.util.Optional;
@@ -31,13 +31,14 @@
/**
* 娑夊珜鍋锋按缁熻
- * @param qo
- * @return
+ * @param qo 鏌ヨ鍙傛暟
+ * @return 鏁版嵁闆嗗悎
*/
public QueryResultVo<List<VoSteal>> steal(QoSteal qo) throws Exception {
- if(qo.fromDt != null && qo.fromDt != "") {
+ if(qo.fromDt != null && !qo.fromDt.trim().equals("")) {
qo.fromDate = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.fromDt + " 00:00:00") ;
}
+
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
Long itemTotal = Optional.ofNullable(this.dao.selectStealTotal(params)).orElse(0L);
@@ -58,4 +59,36 @@
return rsVo ;
}
+
+ /**
+ * 寮傚父鍏抽榾缁熻
+ * @param qo 鏌ヨ鍙傛暟
+ * @return 鏁版嵁闆嗗悎
+ */
+ public QueryResultVo<List<VoAbnormalCloseValve>> abnormalCloseValve(QoAbnormalCloseValve qo) throws Exception {
+ if(qo.atDt != null && !qo.atDt.trim().equals("")) {
+ qo.atDateStart = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.atDt + " 00:00:00") ;
+ qo.atDateEnd = DateTime.dateFrom_yyyy_MM_dd_HH_mm_ss(qo.atDt + " 23:59:59") ;
+ }
+
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(qo) ;
+
+ Long itemTotal = Optional.ofNullable(this.dao.selectAbnormalCloseValveTotal(params)).orElse(0L);
+
+ QueryResultVo<List<VoAbnormalCloseValve>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = qo.pageSize ;
+ rsVo.pageCurr = qo.pageCurr ;
+ rsVo.calculateAndSet(itemTotal, params);
+
+ List<VoAbnormalCloseValve> list = this.dao.selectAbnormalCloseValveSome(params) ;
+ if (list != null && list.size() > 0) {
+ for (VoAbnormalCloseValve vo : list) {
+ vo.openType = CommonV1.openCloseValveType(vo.opType) ;
+ vo.closeType = CommonV1.openCloseValveType(vo.clType) ;
+ }
+ }
+ rsVo.obj = list;
+ return rsVo ;
+ }
+
}
--
Gitblit v1.8.0