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-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 46 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java
index 84b38f9..a1803ac 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/flowMonitoring/FlowmeterSv.java
@@ -1,10 +1,16 @@
package com.dy.pipIrrProject.flowMonitoring;
+import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoPr.PrFlowmeterMapper;
import com.dy.pipIrrGlobal.pojoPr.PrFlowmeter;
+import com.dy.pipIrrGlobal.voPr.VoFlowMeter;
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;
/**
* @author ZhuBaoMin
@@ -42,7 +48,45 @@
* @param flowmeterId
* @return
*/
- public Integer getRecordCountOfFlowmeter(Long flowmeterId) {
- return prFlowmeterMapper.getRecordCountOfFlowmeter(flowmeterId);
+ public Integer getRecordCountOfFlowmeterByCode(Long flowmeterId) {
+ return prFlowmeterMapper.getRecordCountOfFlowmeterByCode(flowmeterId);
+ }
+
+
+ /**
+ * 鏍规嵁鎸囧畾鏉′欢寰楀埌娴侀噺璁″疄浣撹褰�
+ * @param queryVo 缁欑殑鏉′欢
+ * @return 娴侀噺璁″疄浣撻泦鍚�
+ */
+ public QueryResultVo<List<VoFlowMeter>> getFlowMeters(QueryVoFlowMeter queryVo){
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
+ Integer itemTotal = prFlowmeterMapper.getRecordCountOfFlowMeterByOthers(params);
+ QueryResultVo<List<VoFlowMeter>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
+ // 璁＄畻绗﹀悎鏉′欢鐨勮褰曟暟
+ rsVo.calculateAndSet(itemTotal.longValue(), params);
+ rsVo.obj = prFlowmeterMapper.getFlowMeters(params);
+
+ return rsVo ;
+ }
+
+ /**
+ * 寰楀埌鍏ㄩ儴娴侀噺璁�
+ * @return
+ */
+ public List<PrFlowmeter> getFlowMeterAll(){
+ List<PrFlowmeter> all = prFlowmeterMapper.selectAll();
+ return all;
+ }
+
+ /**
+ * 缁欐祦閲忚琛ㄥ姞鐩戞祴绔橧D澶栭敭
+ * @param
+ * @return
+ */
+ public Integer flowmeterAddMonId(PrFlowmeter record){
+ return prFlowmeterMapper.flowmeterAddMonId(record);
}
}
--
Gitblit v1.8.0