From e4aa9db5e3c91c969adf2361f8069b8c54244e1a Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 15 四月 2025 12:02:39 +0800
Subject: [PATCH] 获取轮灌组详情接口，对轮灌组增加终止状态判断
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 268 insertions(+), 19 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
index e205fb6..abb4064 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
@@ -1,16 +1,29 @@
package com.dy.pipIrrWechat.irrigatePlan;
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.common.webUtil.QueryConditionVo;
+import com.dy.common.webUtil.QueryResultVo;
import com.dy.pipIrrGlobal.daoIr.*;
+import com.dy.pipIrrGlobal.daoRm.RmCommandHistoryMapper;
import com.dy.pipIrrGlobal.pojoIr.IrIrrigatePlan;
import com.dy.pipIrrGlobal.pojoIr.IrIrrigateSchedule;
-import com.dy.pipIrrGlobal.pojoIr.IrOpeningSchedule;
import com.dy.pipIrrGlobal.pojoIr.IrPlanOperate;
-import com.dy.pipIrrGlobal.voIr.VoIrrigateSchedule;
+import com.dy.pipIrrGlobal.pojoIr.IrPlanSchedule;
+import com.dy.pipIrrGlobal.voIr.*;
+import com.dy.pipIrrGlobal.voRm.VoIntakeVc;
+import com.dy.pipIrrGlobal.voSe.VoClient;
+import com.dy.pipIrrWechat.irrigatePlan.dto.PlanSimple;
+import com.dy.pipIrrWechat.irrigatePlan.enums.OperateTypeENUM;
import lombok.extern.slf4j.Slf4j;
+import org.apache.dubbo.common.utils.PojoUtils;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.List;
+import java.util.*;
/**
* @author ZhuBaoMin
@@ -40,6 +53,18 @@
@Autowired
private IrIrrigateUnitMapper irIrrigateUnitMapper;
+ @Autowired
+ private IrPlanScheduleMapper irPlanScheduleMapper;
+
+ @Autowired
+ private IrGroupIntakeMapper irGroupIntakeMapper;
+
+ @Autowired
+ private IrIntakeOperateMapper irIntakeOperateMapper;
+
+ @Autowired
+ private RmCommandHistoryMapper rmdCommandHistoryMapper;
+
/**
* 娣诲姞鐏屾簤璁″垝
* @param po
@@ -50,18 +75,162 @@
return po.getId();
}
- //public List<VoIrrigatePlan> getIrrigatePlans(Map<?, ?> params {
- // return irrigatePlanMapper.getIrrigatePlans(params);
- //}
+ /**
+ * 鍒犻櫎鐏屾簤璁″垝
+ * @param planSimple
+ * @return
+ */
+ public Map deletePlan(PlanSimple planSimple) {
+ Long planId = planSimple.getPlanId();
+ Long operatorId = planSimple.getOperatorId();
+
+ Integer planState = irrigatePlanMapper.getPlanState(planId);
+ if(planState == null) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "鐏屾簤璁″垝涓嶅瓨鍦�");
+ map.put("content", null);
+ return map;
+ }
+ if(planState != 1) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "鐏屾簤璁″垝闈炶崏绋跨姸鎬侊紝涓嶅厑璁稿垹闄�");
+ map.put("content", null);
+ return map;
+ }
+
+ try {
+ irrigatePlanMapper.deleteByPrimaryKey(planId);
+ // 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
+ IrPlanOperate planOperate = new IrPlanOperate();
+ planOperate.setPlanId(planId);
+ planOperate.setOperator(operatorId);
+ planOperate.setOperateType(OperateTypeENUM.DELETE.getCode());
+ planOperate.setOperateTime(new Date());
+ addPlanOperate(planOperate);
+
+ Map map = new HashMap<>();
+ map.put("success", true);
+ map.put("msg", "鐏屾簤椤圭洰鍒犻櫎鎴愬姛");
+ map.put("content", null);
+ return map;
+ } catch (Exception e) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "鐏屾簤椤圭洰鍒犻櫎澶辫触");
+ map.put("content", null);
+ return map;
+ }
+ }
/**
- * 鍙戝竷鎸囧畾鐨勭亴婧夎鍒�
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈣鍒掔殑缁撴潫鏃堕棿锛氭湭鍒犻櫎銆佹湭缁堟銆佸凡鍙戝竷銆佸綋鍓嶆椂闂村皬浜庤鍒掔粨鏉熸椂闂�
* @param planId
* @return
*/
- public Integer publishIrrigatePlan(Long planId) {
- return irrigatePlanMapper.publishIrrigatePlan(planId);
+ public Date getToTerminatePlan(Long planId) {
+ return irrigatePlanMapper.getToTerminatePlan(planId);
}
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙D锛堝凡鍙戝竷寮�鍙戝懡浠わ紝鏃犺鏄惁鎴愬姛锛�
+ * @param planId
+ * @return
+ */
+ public List<Long> getToTerminateIntakeIds(Long planId) {
+ return irIntakeOperateMapper.getToTerminateIntakeIds(planId);
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍛戒护ID鍒楄〃
+ * @param planId
+ * @return
+ */
+ public List<Long> getTerminateCommandIds(Long planId) {
+ return irIntakeOperateMapper.getTerminateCommandIds(planId);
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙ｅ垪琛紙寮�闃�鎴愬姛鐨勶級
+ * @param planId
+ * @return
+ */
+ public List<VoToTerminateIntakes> getToTerminateIntakes(Long planId) {
+ return irIntakeOperateMapper.getToTerminateIntakes(planId);
+ }
+
+ /**
+ * 鏍规嵁鍛戒护鏃ュ織ID鑾峰彇鍙栨按鍙ｅ強铏氭嫙鍗′俊鎭紝缁堟鐏屾簤璁″垝鏃朵娇鐢紝鐢ㄦ潵鎵ц杩滅▼鍏抽榾
+ * @param commandId
+ * @return
+ */
+ public VoIntakeVc getValveOpen(Long commandId) {
+ return rmdCommandHistoryMapper.getValveOpen(commandId);
+ }
+
+ /**
+ * 淇敼鐏屾簤璁″垝
+ * @param po
+ * @return
+ */
+ public Integer updatePlan(IrIrrigatePlan po) {
+ return irrigatePlanMapper.updateByPrimaryKeySelective(po);
+ }
+
+ /**
+ * 鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * @return
+ */
+ public List<VoPlans> getNotCompletePlans() {
+ return irrigatePlanMapper.getNotCompletePlans();
+ }
+
+ /**
+ * 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ * @return
+ */
+ public QueryResultVo<List<VoPlans>> getCompletedPlans(QueryConditionVo queryVo) {
+ Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo) ;
+
+ Long itemTotal = (long)irrigatePlanMapper.getCompletedPlansCount(params);
+ QueryResultVo<List<VoPlans>> rsVo = new QueryResultVo<>() ;
+ rsVo.pageSize = queryVo.pageSize ;
+ rsVo.pageCurr = queryVo.pageCurr ;
+
+ rsVo.calculateAndSet(itemTotal, params);
+ rsVo.obj = irrigatePlanMapper.getCompletedPlans(params);
+
+ return rsVo ;
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鐨勮鍒扞D鑾峰彇鍚姩妯″紡
+ * @param planId
+ * @return
+ */
+ public Byte getStartupMode(Long planId) {
+ return irrigatePlanMapper.getStartupMode(planId);
+ }
+
+ /**
+ * 鏍规嵁鎸囧畾鐨勬潯浠惰幏鍙栬鍒掑垪琛�
+ * @param queryVo
+ * @return
+ */
+ //public QueryResultVo<List<VoIrrigatePlan>> getIrrigatePlans(QoIrrigatePlan queryVo) {
+ // Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryVo);
+ //
+ // Long itemTotal = irrigatePlanMapper.getIrrigatePlanCount(params);
+ //
+ // QueryResultVo<List<VoIrrigatePlan>> rsVo = new QueryResultVo<>();
+ // rsVo.pageSize = queryVo.pageSize;
+ // rsVo.pageCurr = queryVo.pageCurr;
+ //
+ // rsVo.calculateAndSet(itemTotal, params);
+ // rsVo.obj = irrigatePlanMapper.getIrrigatePlans(params);
+ // return rsVo;
+ //}
/**
* 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
@@ -84,32 +253,81 @@
}
/**
- * 鏍规嵁璁″垝ID鑾峰彇鐏屾簤娆″簭
+ * 鏍规嵁璁″垝ID缁堟鐏屾簤娆″簭锛屽皢鐏屾簤娆″簭鐨勫綋鍓嶇姸鎬佹敼涓哄凡缁堟
* @param planId
* @return
*/
- public List<VoIrrigateSchedule> getIrrigateSchedules(Long planId) {
- return irIrrigateScheduleMapper.getIrrigateSchedules(planId);
+ public Integer terminateSchedule(Long planId) {
+ return irIrrigateScheduleMapper.terminateSchedule(planId);
}
/**
- * 娣诲姞寮�闃�璁″垝
+ * 鏍规嵁璁″垝ID鑾峰彇鐏屾簤娆″簭璁板綍
+ * @param planId
+ * @return
+ */
+ public List<VoIrrigateSchedule> getSchedulesByPlanId(Long planId) {
+ return irIrrigateScheduleMapper.getSchedulesByPlanId(planId);
+ }
+
+ /**
+ * 鏍规嵁缁処D鑾峰彇鍙栨按鍙D闆嗗悎
+ * @param groupId
+ * @return
+ */
+ public List<Long> getIntakeIdsByGroupId(Long groupId) {
+ return irGroupIntakeMapper.getIntakeIdsByGroupId(groupId);
+ }
+
+ /**
+ * 娣诲姞璁″垝娆″簭鍏宠仈璁板綍
* @param po
* @return
*/
- public Long addOpeningSchedule(IrOpeningSchedule po) {
- irOpeningScheduleMapper.insert(po);
+ public Long addPlanSchedule(IrPlanSchedule po) {
+ irPlanScheduleMapper.insert(po);
return po.getId();
}
/**
- * 鏍规嵁杞亴缁処D鑾峰彇鍙栨按鍙D鍒楄〃
- * @param groupId
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝绠�鍗曚俊鎭垪琛�
+ * @param planId
* @return
*/
- public List<Long> getIntakesByGroupId(Long groupId) {
- return irIrrigateGroupMapper.getIntakesByGroupId(groupId);
+ public VoPlanSimple getPlanSimple(Long planId) {
+ return irrigatePlanMapper.getPlanSimple(planId);
}
+
+ /**
+ * 鏍规嵁璁″垝ID鏇存柊璁″垝淇℃伅锛堣捣姝㈡椂闂淬�佽鍒掔姸鎬侊級
+ * @param planStartTime
+ * @param planEndTime
+ * @param planId
+ * @return
+ */
+ public Integer updatePlanTimes(Date planStartTime, Date planEndTime, Long planId) {
+ return irrigatePlanMapper.updatePlanTimes(planStartTime, planEndTime, planId);
+ }
+
+ /**
+ * 鏍规嵁鐏屾簤娆″簭ID鏇存柊娆″簭寮�濮嬫椂闂�
+ * @param scheduleId
+ * @param startTime
+ * @return
+ */
+ public Integer updateScheduleStartTime(Long scheduleId, Date startTime) {
+ return irIrrigateScheduleMapper.updateScheduleStartTime(scheduleId, startTime);
+ }
+
+ ///**
+ // * 娣诲姞寮�闃�璁″垝
+ // * @param po
+ // * @return
+ // */
+ //public Long addOpeningSchedule(IrOpeningSchedule po) {
+ // irOpeningScheduleMapper.insert(po);
+ // return po.getId();
+ //}
/**
* 鏍规嵁鐏屾簤鍗曞厓ID鑾峰彇鍙栨按鍙D
@@ -119,4 +337,35 @@
public Long getIntakeIdByUnitId(Long unitId) {
return irIrrigateUnitMapper.getIntakeIdByUnitId(unitId);
}
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝鍙戝竷缁撴灉
+ * @param planId
+ * @return
+ */
+ public VoPlanDetails getPublishResults(Long planId) {
+ VoPlanDetails planDetails = irrigatePlanMapper.getPlanDetails(planId);
+ if(planDetails == null){
+ return null;
+ }
+
+ Integer failureCount = Optional.ofNullable(irIntakeOperateMapper.getFailureCount(planId)).orElse(0);
+ planDetails.setFailureCount(failureCount);
+
+ List<VoGroupResult> groupResults = irIrrigateGroupMapper.getGroupResult(planId);
+ if(groupResults == null || groupResults.size() == 0){
+ return null;
+ }
+
+ for (VoGroupResult groupResult : groupResults) {
+ List<VoIntakeResult> intakeResults = irIntakeOperateMapper.getIntakeResult(planId, groupResult.getGroupId());
+ if(intakeResults != null) {
+ groupResult.setPublishResult(intakeResults);
+ }
+ }
+
+ planDetails.setGroups(groupResults);
+ return planDetails;
+
+ }
}
--
Gitblit v1.8.0