From 44eb64bef08ce231ac95d5ee482b046014dc8afa Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 08 九月 2025 11:29:26 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java | 200 +++++++++++++++++++++++++++----------------------
1 files changed, 110 insertions(+), 90 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 2a3bbf3..614ff75 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
@@ -16,7 +16,6 @@
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;
@@ -70,43 +69,36 @@
private CommandSv commandSv;
@Value("${wechat.irr.plan.delay:5}")
- private Integer irrPlanDelay ;//杞亴涓鍒掑紑闃�鐨勫欢杩熸椂闀�
+ private Integer irrPlanDelay;//杞亴涓鍒掑紑闃�鐨勫欢杩熸椂闀�
- private static final Integer irrPlanDelayDefault = 5 ;//杞亴涓鍒掑紑闃�鐨勯粯璁ゅ欢杩熸椂闀�
+ private static final Integer irrPlanDelayDefault = 5;//杞亴涓鍒掑紑闃�鐨勯粯璁ゅ欢杩熸椂闀�
@Value("${wechat.irr.plan.preOpeningTime:10}")
private Integer preOpeningTime;
- /**
- * 娣诲姞鐏屾簤璁″垝
- * @param po
- * @return
- */
+ @Value("${wechat.irr.plan.planTerminateLimitMinutes:5}")
+ private Integer planTerminateLimitMinutes; // 璁″垝缁堟鍚庨檺鍒跺彂甯冩柊璁″垝鐨勬椂闂撮棿闅�(鍒嗛挓)
+
@Transactional(rollbackFor = Exception.class)
public Long addIrrigatePlan(IrIrrigatePlan po) {
irrigatePlanMapper.insert(po);
return po.getId();
}
- /**
- * 鍒犻櫎鐏屾簤璁″垝
- * @param planSimple
- * @return
- */
@Transactional(rollbackFor = Exception.class)
public Map deletePlan(PlanSimple planSimple) {
Long planId = planSimple.getPlanId();
Long operatorId = planSimple.getOperatorId();
Integer planState = irrigatePlanMapper.getPlanState(planId);
- if(planState == null) {
+ if (planState == null) {
Map map = new HashMap<>();
map.put("success", false);
map.put("msg", "鐏屾簤璁″垝涓嶅瓨鍦�");
map.put("content", null);
return map;
}
- if(planState != 1) {
+ if (planState != 1) {
Map map = new HashMap<>();
map.put("success", false);
map.put("msg", "鐏屾簤璁″垝闈炶崏绋跨姸鎬侊紝涓嶅厑璁稿垹闄�");
@@ -117,7 +109,7 @@
try {
irrigatePlanMapper.deleteByPrimaryKey(planId);
// 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
- IrPlanOperate planOperate = new IrPlanOperate();
+ IrPlanOperate planOperate = new IrPlanOperate();
planOperate.setPlanId(planId);
planOperate.setOperator(operatorId);
planOperate.setOperateType(OperateTypeENUM.DELETE.getCode());
@@ -138,17 +130,13 @@
}
}
- /**
- * 鍙戝竷鐏屾簤璁″垝
- * @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) {
+ // 妫�鏌ュ綋鍓嶉」鐩槸鍚﹀瓨鍦ㄦ湭瀹屾垚鐨勭亴婧夎鍒�
+ if (irrigatePlanMapper.hasPlan_CurrentProject(planId) > 0) {
Map map = new HashMap<>();
map.put("success", false);
map.put("msg", "褰撳墠椤圭洰瀛樺湪鏈畬鎴愮殑鐏屾簤璁″垝");
@@ -156,7 +144,8 @@
return map;
}
- if(irrigatePlanMapper.hasPlan_OtherProject(planId) > 0) {
+ // 妫�鏌ュ叾浠栭」鐩腑鏄惁瀛樺湪鏈畬鎴愮殑鐏屾簤璁″垝
+ if (irrigatePlanMapper.hasPlan_OtherProject(planId) > 0) {
Map map = new HashMap<>();
map.put("success", false);
map.put("msg", "寰呭彂甯冭鍒掔殑杞亴缁勫湪鍏朵粬椤圭洰鐨勭亴婧夎鍒掍腑锛屼笖璇ヨ鍒掑皻鏈畬鎴�");
@@ -164,12 +153,21 @@
return map;
}
- /**
- * 鑾峰彇鐏屾簤璁″垝淇℃伅
- * 鏇存柊鐏屾簤璁″垝璧锋鏃堕棿鍙婅鍒掔姸鎬�
- */
+ // 妫�鏌�5鍒嗛挓鍐呮槸鍚︽湁缁堟鐨勮鍒掞紝涓旇疆鐏岀粍鏈夐噸鍙�
+ Long lastTerminatedPlanId = irPlanOperateMapper.getLastTerminatedPlanId(planTerminateLimitMinutes);
+ if (lastTerminatedPlanId != null) {
+ // 妫�鏌ュ綋鍓嶈鍒掍笌鏈�杩戠粓姝㈣鍒掔殑杞亴缁勬槸鍚︽湁閲嶅彔
+ if (irrigatePlanMapper.hasPlanOverlapWithTerminated(planId, lastTerminatedPlanId) > 0) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "涓婁竴涓鍒掔粓姝㈠悗" + planTerminateLimitMinutes + "鍒嗛挓鍐呬笉鑳藉彂甯冩柊璁″垝");
+ map.put("content", null);
+ return map;
+ }
+ }
+
VoPlanSimple plan = irrigatePlanMapper.getPlanSimple(planId);
- if(plan == null){
+ if (plan == null) {
Map map = new HashMap<>();
map.put("success", false);
map.put("msg", "鎮ㄨ鍙戝竷鐨勮鍒掍笉瀛樺湪锛屾垨璇ヨ鍒掑凡鍙戝竷");
@@ -182,25 +180,56 @@
Date planStartTime = plan.getPlanStartTime();
Date planStopTime = null;
- if(startupMode == 1){
+ if (startupMode == 1) {
planStartTime = new Date();
}
- LocalDateTime startTime = planStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime();
- if(startupMode == 1){
+ 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 ;
+ 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());
+
+ List<VoIrrigateSchedule> schedules = getSchedulesByPlanId(planId);
+ Date scheduleStartTime = null;
+ LocalDateTime lastScheduleEndTime = null;
+ Integer sort = 0;
+
+ for (VoIrrigateSchedule schedule : schedules) {
+ if (scheduleStartTime == null) {
+ scheduleStartTime = planStartTime;
+ }
+ this.updateScheduleStartTime(schedule.getScheduleId(), scheduleStartTime);
+
+ LocalDateTime currentScheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+ LocalDateTime currentScheduleEndTime = currentScheduleStartTime.plusMinutes(schedule.getDuration());
+
+ lastScheduleEndTime = currentScheduleEndTime;
+
+ LocalDateTime LocalscheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+ LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration());
+ LocalscheduleStartTime = LocalscheduleStartTime.minusMinutes(preOpeningTime);
+ scheduleStartTime = Date.from(LocalscheduleStartTime.atZone(ZoneId.systemDefault()).toInstant());
- // 鏍规嵁璁″垝ID鏇存柊璁″垝淇℃伅锛堣捣姝㈡椂闂淬�佽鍒掔姸鎬侊級
- if(this.updatePlanTimes(planStartTime, planStopTime, planId) == 0) {
+ if (scheduleStartTime.before(planStartTime)) {
+ scheduleStartTime = planStartTime;
+ }
+ }
+
+ if (lastScheduleEndTime != null) {
+ planStopTime = Date.from(lastScheduleEndTime.atZone(ZoneId.systemDefault()).toInstant());
+ } else {
+ // 濡傛灉娌℃湁鐏屾簤娆″簭锛屽垯浣跨敤鍘熸潵鐨勮绠楁柟寮�
+ LocalDateTime stopTime = startTime.plusMinutes(duration);
+ planStopTime = Date.from(stopTime.atZone(ZoneId.systemDefault()).toInstant());
+ }
+
+ if (this.updatePlanTimes(planStartTime, planStopTime, planId) == 0) {
Map map = new HashMap<>();
map.put("success", false);
map.put("msg", "璁″垝淇℃伅鏇存柊澶辫触");
@@ -208,35 +237,12 @@
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(preOpeningTime);
- scheduleStartTime = Date.from(LocalscheduleStartTime.atZone(ZoneId.systemDefault()).toInstant());
-
- // 纭繚涓嬩竴缁勭殑寮�濮嬫椂闂翠笉鏃╀簬璁″垝寮�濮嬫椂闂�
- if(scheduleStartTime.before(planStartTime)) {
- scheduleStartTime = planStartTime;
- }
- }
-
- // 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
- IrPlanOperate planOperate = new IrPlanOperate();
+ IrPlanOperate planOperate = new IrPlanOperate();
planOperate.setPlanId(planId);
planOperate.setOperator(operatorId);
planOperate.setOperateType(OperateTypeENUM.PUBLISH.getCode());
planOperate.setOperateTime(new Date());
- if(addPlanOperate(planOperate) == 0){
+ if (addPlanOperate(planOperate) == 0) {
Map map = new HashMap<>();
map.put("success", false);
map.put("msg", "娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍澶辫触");
@@ -245,11 +251,18 @@
}
schedules = getSchedulesByPlanId(planId);
- for(VoIrrigateSchedule schedule : schedules) {
+ for (VoIrrigateSchedule schedule : schedules) {
Long groupId = schedule.getGroupId();
List<Long> intakeIds = getIntakeIdsByGroupId(groupId);
- for(Long intakeId : intakeIds) {
- if(schedule.getDuration() > 0) {
+ if(intakeIds == null || intakeIds.size() <= 0) {
+ Map map = new HashMap<>();
+ map.put("success", false);
+ map.put("msg", "褰撳墠杞亴缁勫唴娌℃湁鏈夋晥鐨勫彇姘村彛");
+ map.put("content", null);
+ return map;
+ }
+ for (Long intakeId : intakeIds) {
+ if (schedule.getDuration() > 0) {
// 浠婂彂甯冪亴婧夋椂闀垮ぇ浜�0鐨�
AutomaticClose automaticClose = new AutomaticClose();
automaticClose.setIntakeId(intakeId);
@@ -272,6 +285,7 @@
/**
* 鏍规嵁璁″垝ID鑾峰彇璁″垝鏈�鏂扮姸鎬�
+ *
* @param planId
* @return
*/
@@ -281,6 +295,7 @@
/**
* 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈣鍒掔殑缁撴潫鏃堕棿锛氭湭鍒犻櫎銆佹湭缁堟銆佸凡鍙戝竷銆佸綋鍓嶆椂闂村皬浜庤鍒掔粨鏉熸椂闂�
+ *
* @param planId
* @return
*/
@@ -290,6 +305,7 @@
/**
* 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙D锛堝凡鍙戝竷寮�鍙戝懡浠わ紝鏃犺鏄惁鎴愬姛锛�
+ *
* @param planId
* @return
*/
@@ -299,6 +315,7 @@
/**
* 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍛戒护ID鍒楄〃
+ *
* @param planId
* @return
*/
@@ -308,6 +325,7 @@
/**
* 鏍规嵁璁″垝ID鑾峰彇寰呯粓姝㈢殑鍙栨按鍙ｅ垪琛紙寮�闃�鎴愬姛鐨勶級
+ *
* @param planId
* @return
*/
@@ -317,6 +335,7 @@
/**
* 鏍规嵁鍛戒护鏃ュ織ID鑾峰彇鍙栨按鍙ｅ強铏氭嫙鍗′俊鎭紝缁堟鐏屾簤璁″垝鏃朵娇鐢紝鐢ㄦ潵鎵ц杩滅▼鍏抽榾
+ *
* @param commandId
* @return
*/
@@ -326,6 +345,7 @@
/**
* 淇敼鐏屾簤璁″垝
+ *
* @param po
* @return
*/
@@ -336,7 +356,8 @@
/**
* 鑾峰彇鏈畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
- * @return
+ *
+ * @return
*/
public List<VoPlans> getNotCompletePlans() {
return irrigatePlanMapper.getNotCompletePlans();
@@ -344,24 +365,26 @@
/**
* 鑾峰彇宸插畬鎴愮殑璁″垝鍒楄〃锛屽皬绋嬪簭璁″垝鍒楄〃椤典娇鐢�
+ *
* @return
*/
public QueryResultVo<List<VoPlans>> getCompletedPlans(QueryConditionVo queryVo) {
- Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(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 ;
+ 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 ;
+ return rsVo;
}
/**
* 鏍规嵁鎸囧畾鐨勮鍒扞D鑾峰彇鍚姩妯″紡
+ *
* @param planId
* @return
*/
@@ -390,6 +413,7 @@
/**
* 娣诲姞鐏屾簤璁″垝鎿嶄綔璁板綍
+ *
* @param po
* @return
*/
@@ -401,6 +425,7 @@
/**
* 娣诲姞鐏屾簤娆″簭璁板綍
+ *
* @param po
* @return
*/
@@ -412,6 +437,7 @@
/**
* 鏍规嵁璁″垝ID缁堟鐏屾簤娆″簭锛屽皢鐏屾簤娆″簭鐨勫綋鍓嶇姸鎬佹敼涓哄凡缁堟
+ *
* @param planId
* @return
*/
@@ -422,6 +448,7 @@
/**
* 鏍规嵁璁″垝ID鑾峰彇鐏屾簤娆″簭璁板綍
+ *
* @param planId
* @return
*/
@@ -431,6 +458,7 @@
/**
* 鏍规嵁缁処D鑾峰彇鍙栨按鍙D闆嗗悎
+ *
* @param groupId
* @return
*/
@@ -440,6 +468,7 @@
/**
* 娣诲姞璁″垝娆″簭鍏宠仈璁板綍
+ *
* @param po
* @return
*/
@@ -451,6 +480,7 @@
/**
* 鏍规嵁鐏屾簤娆″簭ID鏇存柊娆″簭寮�濮嬫椂闂�
+ *
* @param scheduleId
* @param startTime
* @return
@@ -472,6 +502,7 @@
/**
* 鏍规嵁鐏屾簤鍗曞厓ID鑾峰彇鍙栨按鍙D
+ *
* @param unitId
* @return
*/
@@ -479,14 +510,9 @@
return irIrrigateUnitMapper.getIntakeIdByUnitId(unitId);
}
- /**
- * 鏍规嵁璁″垝ID鑾峰彇璁″垝鍙戝竷缁撴灉
- * @param planId
- * @return
- */
public VoPlanDetails getPublishResults(Long planId) {
VoPlanDetails planDetails = irrigatePlanMapper.getPlanDetails(planId);
- if(planDetails == null){
+ if (planDetails == null) {
return null;
}
Integer failureCount = Optional.ofNullable(irIntakeOperateMapper.getFailureCount(planId)).orElse(0);
@@ -495,46 +521,40 @@
Date terminateTime = Optional.ofNullable(irPlanOperateMapper.getTerminateTime(planId)).orElse(null);
List<VoGroupResult> groupResults = irIrrigateGroupMapper.getGroupResult(planId);
- if(groupResults == null || groupResults.size() == 0){
+ if (groupResults == null || groupResults.size() == 0) {
return null;
}
for (VoGroupResult groupResult : groupResults) {
List<VoIntakeResult> intakeResults = irIntakeOperateMapper.getIntakeResult(planId, groupResult.getGroupId());
- if(intakeResults != null) {
+ if (intakeResults != null) {
groupResult.setPublishResult(intakeResults);
}
}
planDetails.setGroups(groupResults);
return planDetails;
-
}
- /**
- * 鏍规嵁璁″垝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){
+ 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){
+ if (groupResults == null || groupResults.size() == 0) {
return null;
}
for (VoGroupResult groupResult : groupResults) {
List<VoIntakeResult> intakeResults = irIntakeOperateMapper.getIntakeResult(planId, groupResult.getGroupId());
- if(intakeResults != null) {
+ if (intakeResults != null) {
groupResult.setPublishResult(intakeResults);
}
}
@@ -545,7 +565,7 @@
}
@Transactional(rollbackFor = Exception.class)
- Integer updatePlanTimes(Date planStartTime, Date planEndTime, Long planId){
+ Integer updatePlanTimes(Date planStartTime, Date planEndTime, Long planId) {
return irrigatePlanMapper.updatePlanTimes(planStartTime, planEndTime, planId);
}
--
Gitblit v1.8.0