From 4f99f59668c9160ca60958b7347944def26f2228 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期日, 27 四月 2025 10:58:53 +0800
Subject: [PATCH] 回退配置
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 267 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 221 insertions(+), 46 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 8c0e998..cdc76d5 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,9 +1,7 @@
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;
@@ -12,17 +10,21 @@
import com.dy.pipIrrGlobal.pojoIr.IrPlanSchedule;
import com.dy.pipIrrGlobal.voIr.*;
import com.dy.pipIrrGlobal.voRm.VoIntakeVc;
+import com.dy.pipIrrWechat.command.CommandSv;
+import com.dy.pipIrrWechat.command.dto.AutomaticClose;
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.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.*;
/**
* @author ZhuBaoMin
@@ -64,11 +66,20 @@
@Autowired
private RmCommandHistoryMapper rmdCommandHistoryMapper;
+ @Autowired
+ private CommandSv commandSv;
+
+ @Value("${webchat.irr.plan.delay}")
+ private Integer irrPlanDelay ;//杞亴涓鍒掑紑闃�鐨勫欢杩熸椂闀�
+
+ private static final Integer irrPlanDelayDefault = 5 ;//杞亴涓鍒掑紑闃�鐨勯粯璁ゅ欢杩熸椂闀�
+
/**
* 娣诲姞鐏屾簤璁″垝
* @param po
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public Long addIrrigatePlan(IrIrrigatePlan po) {
irrigatePlanMapper.insert(po);
return po.getId();
@@ -79,6 +90,7 @@
* @param planSimple
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public Map deletePlan(PlanSimple planSimple) {
Long planId = planSimple.getPlanId();
Long operatorId = planSimple.getOperatorId();
@@ -121,6 +133,142 @@
map.put("content", null);
return map;
}
+ }
+
+ /**
+ * 鍙戝竷鐏屾簤璁″垝
+ * @param planSimple
+ * @return
+ */
+ public Map publishPlan(PlanSimple planSimple) {
+ Long planId = planSimple.getPlanId();
+ Long operatorId = planSimple.getOperatorId();
+ Byte operateType = 1;
+
+ if(irrigatePlanMapper.hasPlan_CurrentProject(planId) > 0) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "褰撳墠椤圭洰瀛樺湪鏈畬鎴愮殑鐏屾簤璁″垝");
+ map.put("content", null);
+ return map;
+ }
+
+ if(irrigatePlanMapper.hasPlan_OtherProject(planId) > 0) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "寰呭彂甯冭鍒掔殑杞亴缁勫湪鍏朵粬椤圭洰鐨勭亴婧夎鍒掍腑锛屼笖璇ヨ鍒掑皻鏈畬鎴�");
+ map.put("content", null);
+ return map;
+ }
+
+ /**
+ * 鑾峰彇鐏屾簤璁″垝淇℃伅
+ * 鏇存柊鐏屾簤璁″垝璧锋鏃堕棿鍙婅鍒掔姸鎬�
+ */
+ VoPlanSimple plan = irrigatePlanMapper.getPlanSimple(planId);
+ if(plan == null){
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "鎮ㄨ鍙戝竷鐨勮鍒掍笉瀛樺湪锛屾垨璇ヨ鍒掑凡鍙戝竷");
+ map.put("content", null);
+ return map;
+ }
+
+ Byte startupMode = plan.getStartupMode();
+ Integer duration = plan.getDuration();
+ Date planStartTime = plan.getPlanStartTime();
+ Date planStopTime = null;
+
+ if(startupMode == 1){
+ planStartTime = new Date();
+ }
+ LocalDateTime startTime = planStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
+ if(startupMode == 1){
+ // 娴嬭瘯闃舵寤跺悗2鍒嗛挓锛屾寮忓彂甯冧负5鍒嗛挓
+ //startTime = startTime.plusMinutes(2);
+ //startTime = startTime.plusMinutes(5);
+ if(irrPlanDelay == null || irrPlanDelay <= 0) {
+ irrPlanDelay = irrPlanDelayDefault ;
+ }
+ startTime = startTime.plusMinutes(irrPlanDelay);
+ }
+ planStartTime = Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant());
+ LocalDateTime stopTime = startTime.plusMinutes(duration);
+ planStopTime = Date.from(stopTime.atZone(ZoneId.systemDefault()).toInstant());
+
+ // 鏍规嵁璁″垝ID鏇存柊璁″垝淇℃伅锛堣捣姝㈡椂闂淬�佽鍒掔姸鎬侊級
+ if(this.updatePlanTimes(planStartTime, planStopTime, planId) == 0) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "璁″垝淇℃伅鏇存柊澶辫触");
+ map.put("content", null);
+ return map;
+ }
+
+ // 鏇存柊姣忎釜鐏屾簤娆″簭鐨勫紑濮嬫椂闂�
+ List<VoIrrigateSchedule> schedules = getSchedulesByPlanId(planId);
+ Date scheduleStartTime = null;
+ Integer sort = 0;
+ for(VoIrrigateSchedule schedule : schedules){
+ if(scheduleStartTime == null) {
+ scheduleStartTime = planStartTime;
+ }
+ this.updateScheduleStartTime(schedule.getScheduleId(), scheduleStartTime);
+
+ // 璁＄畻涓嬩竴缁勭殑寮�濮嬫椂闂�
+ LocalDateTime LocalscheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
+ LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration());
+ LocalscheduleStartTime = LocalscheduleStartTime.minusMinutes(2);
+ scheduleStartTime = Date.from(LocalscheduleStartTime.atZone(ZoneId.systemDefault()).toInstant());
+ }
+
+ // 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
+ IrPlanOperate planOperate = new IrPlanOperate();
+ planOperate.setPlanId(planId);
+ planOperate.setOperator(operatorId);
+ planOperate.setOperateType(OperateTypeENUM.PUBLISH.getCode());
+ planOperate.setOperateTime(new Date());
+ if(addPlanOperate(planOperate) == 0){
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍澶辫触");
+ map.put("content", null);
+ return map;
+ }
+
+ schedules = getSchedulesByPlanId(planId);
+ for(VoIrrigateSchedule schedule : schedules) {
+ Long groupId = schedule.getGroupId();
+ List<Long> intakeIds = getIntakeIdsByGroupId(groupId);
+ for(Long intakeId : intakeIds) {
+ if(schedule.getDuration() > 0) {
+ // 浠婂彂甯冪亴婧夋椂闀垮ぇ浜�0鐨�
+ AutomaticClose automaticClose = new AutomaticClose();
+ automaticClose.setIntakeId(intakeId);
+ automaticClose.setPlannedOpenTime(schedule.getStartTime());
+ automaticClose.setMinutes(schedule.getDuration());
+ automaticClose.setOperator(operatorId);
+ automaticClose.setOpenType(Byte.valueOf("1"));
+
+ commandSv.planedOpenTimedClose(automaticClose, planId, operateType, schedule.getStartTime(), schedule.getDuration());
+ }
+ }
+ }
+
+ Map map = new HashMap<>();
+ map.put("success", true);
+ map.put("msg", "鐏屾簤椤圭洰鍒犻櫎鎴愬姛");
+ map.put("content", null);
+ return map;
+ }
+
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�
+ * @param planId
+ * @return
+ */
+ public Integer getPlanLatestState(Long planId) {
+ return irrigatePlanMapper.getPlanLatestState(planId);
}
/**
@@ -173,6 +321,7 @@
* @param po
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public Integer updatePlan(IrIrrigatePlan po) {
return irrigatePlanMapper.updateByPrimaryKeySelective(po);
}
@@ -189,8 +338,18 @@
* 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
* @return
*/
- public List<VoPlans> getCompletedPlans() {
- return irrigatePlanMapper.getCompletedPlans();
+ 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 ;
}
/**
@@ -226,6 +385,7 @@
* @param po
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public Long addPlanOperate(IrPlanOperate po) {
irPlanOperateMapper.insert(po);
return po.getId();
@@ -236,6 +396,7 @@
* @param po
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public Long addIrrigateSchedule(IrIrrigateSchedule po) {
irIrrigateScheduleMapper.insert(po);
return po.getId();
@@ -246,6 +407,7 @@
* @param planId
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public Integer terminateSchedule(Long planId) {
return irIrrigateScheduleMapper.terminateSchedule(planId);
}
@@ -273,29 +435,10 @@
* @param po
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public Long addPlanSchedule(IrPlanSchedule po) {
irPlanScheduleMapper.insert(po);
return po.getId();
- }
-
- /**
- * 鏍规嵁璁″垝ID鑾峰彇璁″垝绠�鍗曚俊鎭垪琛�
- * @param planId
- * @return
- */
- 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);
}
/**
@@ -304,6 +447,7 @@
* @param startTime
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public Integer updateScheduleStartTime(Long scheduleId, Date startTime) {
return irIrrigateScheduleMapper.updateScheduleStartTime(scheduleId, startTime);
}
@@ -333,12 +477,19 @@
* @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);
+
+ Date terminateTime = Optional.ofNullable(irPlanOperateMapper.getTerminateTime(planId)).orElse(null);
+
List<VoGroupResult> groupResults = irIrrigateGroupMapper.getGroupResult(planId);
if(groupResults == null || groupResults.size() == 0){
return null;
}
-
- VoPlanDetails planDetails = irrigatePlanMapper.getPlanDetails(planId);
for (VoGroupResult groupResult : groupResults) {
List<VoIntakeResult> intakeResults = irIntakeOperateMapper.getIntakeResult(planId, groupResult.getGroupId());
@@ -350,21 +501,45 @@
planDetails.setGroups(groupResults);
return planDetails;
+ }
- //JSONArray array_groupResult = (JSONArray) JSON.toJSON(groupResults);
- //for(int i = 0; i < array_groupResult.size(); i++){
- // JSONObject job_groupResult = array_groupResult.getJSONObject(i);
- // Long groupId = job_groupResult.getLong("groupId");
- //
- // List<VoIntakeResult> intakeResults = irIntakeOperateMapper.getIntakeResult(planId, groupId);
- // if(intakeResults != null) {
- // JSONArray array_intakeResult = (JSONArray) JSON.toJSON(intakeResults);
- // job_groupResult.put("publishResult", array_intakeResult);
- // }
- //}
- //
- //List<VoGroupResult> publishResults = array_groupResult.toJavaList(VoGroupResult.class);
- //return publishResults;
+ /**
+ * 鏍规嵁璁″垝ID鑾峰彇璁″垝缁堟鎿嶄綔缁撴灉
+ * @param planId
+ * @return
+ */
+ public VoPlanDetails getTerminateResults(Long planId) {
+ // 鑾峰彇璁″垝缁堟鏃堕棿
+ Date terminateTime = Optional.ofNullable(irPlanOperateMapper.getTerminateTime(planId)).orElse(null);
+
+ VoPlanDetails planDetails = irrigatePlanMapper.getPlanDetails_terminate(planId, terminateTime);
+ if(planDetails == null){
+ return null;
+ }
+ Integer failureCount = Optional.ofNullable(irIntakeOperateMapper.getFailureCount(planId)).orElse(0);
+ planDetails.setFailureCount(failureCount);
+
+ List<VoGroupResult> groupResults = irIrrigateGroupMapper.getGroupResult_terminate(planId, terminateTime);
+ 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;
}
+
+ @Transactional(rollbackFor = Exception.class)
+ Integer updatePlanTimes(Date planStartTime, Date planEndTime, Long planId){
+ return irrigatePlanMapper.updatePlanTimes(planStartTime, planEndTime, planId);
+ }
+
+
}
--
Gitblit v1.8.0