pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoIr/IrIrrigatePlanMapper.java
@@ -115,4 +115,25 @@ * @return */ Integer getPlanState(@Param("planId") Long planId); /** * 判断当前项目是否存在已发布、未终止、未删除、未完成的计划，发布计划前判断使用 * @param planId * @return */ Integer hasPlan_CurrentProject(Long planId); /** * 判断当前计划包含的轮灌组是否与其他项目下计划包含的轮灌组有交集，且其他项目的计划状态为已发布、未终止、未删除、未完成，发布计划前判断使用 * @param planId * @return */ Integer hasPlan_OtherProject(Long planId); /** * 根据计划ID获取计划最新状态 * @param planId * @return */ Integer getPlanLatestState(@Param("planId") Long planId); } pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigateGroupMapper.xml
@@ -318,9 +318,20 @@ IF(#{terminateTime} < sche.start_time, 6, IF(#{terminateTime} < DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), 5, 4)) AS state, IF(#{terminateTime} > sche.start_time, sche.start_time, NULL) AS startTime, IF(#{terminateTime} > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), IF(#{terminateTime} > sche.start_time, #{terminateTime}, NULL)) AS stopTime, sche.duration, IF(#{terminateTime} > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), IF(#{terminateTime} > sche.start_time, #{terminateTime}, NULL)) AS stopTime, <!--sche.duration,--> IF( TIMESTAMPDIFF(MINUTE, IF(#{terminateTime} > sche.start_time, sche.start_time, NULL), IF(#{terminateTime} > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), IF(#{terminateTime} > sche.start_time, #{terminateTime}, NULL)) ) = 0, 1, TIMESTAMPDIFF(MINUTE, IF(#{terminateTime} > sche.start_time, sche.start_time, NULL), IF(#{terminateTime} > DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), DATE_ADD(sche.start_time, INTERVAL sche.duration MINUTE), IF(#{terminateTime} > sche.start_time, #{terminateTime}, NULL)) )) AS duration, NULL AS publishResult FROM ir_irrigate_group grp INNER JOIN ir_irrigate_schedule sche ON sche.group_id = grp.id pipIrr-platform/pipIrr-global/src/main/resources/mapper/IrIrrigatePlanMapper.xml
@@ -325,8 +325,9 @@ IF(plan.executing_state = 3, 5, 4) AS planState FROM ir_irrigate_plan plan INNER JOIN ir_project pro ON pro.id = plan.project_id WHERE plan.deleted = 0 AND ((plan.plan_state = 2 AND NOW() >= plan.plan_stop_time) OR (plan.executing_state = 3)) ORDER BY plan.plan_state DESC INNER JOIN ir_plan_operate po ON po.plan_id = plan.id WHERE plan.deleted = 0 AND ((plan.plan_state = 2 AND NOW() >= plan.plan_stop_time) OR (plan.executing_state = 3)) AND po.operate_type = 1 ORDER BY po.operate_time DESC <trim prefix="limit "> <if test="start != null and count != null"> #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER} @@ -374,8 +375,13 @@ SELECT plan.plan_name AS planName, pro.project_name AS projectName, IF(#{terminateTime} < plan.plan_start_time, 6, IF(#{terminateTime} < plan.plan_stop_time, 5, 4)) AS state, <!-- IF(#{terminateTime} < plan.plan_start_time, 6,--> <!-- IF(#{terminateTime} < plan.plan_stop_time, 5, 4)) AS state,--> IF(plan.executing_state = 3, 5, IF(NOW() < plan_start_time, 2, IF(NOW() < plan_stop_time, 3, 4) ) ) AS state, plan.plan_start_time AS planStartTime, plan.plan_stop_time AS planStopTime, #{terminateTime} AS realStopTime, @@ -383,7 +389,7 @@ NULL AS failureCount FROM ir_irrigate_plan plan INNER JOIN ir_project pro ON pro.id = plan.project_id WHERE plan.id =2025041515194900009 WHERE plan.id = #{planId} AND plan.deleted = 0 </select> @@ -396,4 +402,54 @@ AND deleted = 0 </select> <!--判断当前项目是否存在已发布、未终止、未删除、未完成的计划，发布计划前判断使用--> <select id="hasPlan_CurrentProject" resultType="java.lang.Integer"> SELECT COUNT(*) AS recordCount FROM ir_irrigate_plan WHERE project_id = (SELECT project_id FROM ir_irrigate_plan WHERE id = #{planId}) AND id != #{planId} AND plan_state = 2 AND executing_state != 3 AND deleted = 0 AND NOW() < plan_stop_time </select> <!--判断当前计划包含的轮灌组是否与其他项目下计划包含的轮灌组有交集，且其他项目的计划状态为已发布、未终止、未删除、未完成，发布计划前判断使用--> <select id="hasPlan_OtherProject" resultType="java.lang.Integer"> SELECT EXISTS( SELECT sche.group_id FROM ir_irrigate_plan plan INNER JOIN ir_plan_schedule ps ON ps.plan_id = plan.id INNER JOIN ir_irrigate_schedule sche ON sche.id = ps.schedule_id WHERE plan.project_id != (SELECT project_id FROM ir_irrigate_plan WHERE id = #{planId}) AND plan_state = 2 AND executing_state != 3 AND deleted = 0 AND NOW() < plan_stop_time INTERSECT SELECT sche.group_id FROM ir_irrigate_schedule sche INNER JOIN ir_plan_schedule ps ON schedule_id = sche.id WHERE ps.plan_id = #{planId} LIMIT 1 ) AS has_intersection </select> <!--根据计划ID获取计划最新状态--> <select id="getPlanLatestState" resultType="java.lang.Integer"> SELECT IF(plan_state = 1, 1, IF(executing_state = 3, 5, IF(NOW() < plan_start_time, 2, IF(NOW() < plan_stop_time, 3, 4) ) ) ) AS planState FROM ir_irrigate_plan WHERE deleted = 0 AND id = #{planId} </select> </mapper> pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanCtrl.java
@@ -199,87 +199,113 @@ return BaseResponseUtils.buildErrorMsg(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage()); } Long planId = planSimple.getPlanId(); Long operatorId = planSimple.getOperatorId(); Byte operateType = 1; Map map_result = irrigatePlanSv.publishPlan(planSimple); if(map_result.get("success").equals(false)) { return BaseResponseUtils.buildErrorMsg(map_result.get("msg").toString()); } return BaseResponseUtils.buildSuccess() ; /** * 获取灌溉计划信息 * 更新灌溉计划起止时间及计划状态 */ VoPlanSimple plan = irrigatePlanSv.getPlanSimple(planId); if(plan == null){ return BaseResponseUtils.buildErrorMsg("您要发布的计划不存在，或该计划已发布"); //Long planId = planSimple.getPlanId(); //Long operatorId = planSimple.getOperatorId(); //Byte operateType = 1; // ///** // * 获取灌溉计划信息 // * 更新灌溉计划起止时间及计划状态 // */ //VoPlanSimple plan = irrigatePlanSv.getPlanSimple(planId); //if(plan == null){ // return BaseResponseUtils.buildErrorMsg("您要发布的计划不存在，或该计划已发布"); //} // //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); //} //planStartTime = Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()); //LocalDateTime stopTime = startTime.plusMinutes(duration); //planStopTime = Date.from(stopTime.atZone(ZoneId.systemDefault()).toInstant()); // // //if(irrigatePlanSv.updatePlanTimes(planStartTime, planStopTime, planId) == 0) { // return BaseResponseUtils.buildErrorMsg("计划信息更新失败"); //} // //// 更新每个灌溉次序的开始时间 //List<VoIrrigateSchedule> schedules = irrigatePlanSv.getSchedulesByPlanId(planId); //Date scheduleStartTime = null; //Integer sort = 0; //for(VoIrrigateSchedule schedule : schedules){ // if(scheduleStartTime == null) { // scheduleStartTime = planStartTime; // } // irrigatePlanSv.updateScheduleStartTime(schedule.getScheduleId(), scheduleStartTime); // // // 计算下一组的开始时间 // LocalDateTime LocalscheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime(); // LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration()); // 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(irrigatePlanSv.addPlanOperate(planOperate) == 0){ // return BaseResponseUtils.buildErrorMsg("添加灌溉计划操作记录失败"); //} // //schedules = irrigatePlanSv.getSchedulesByPlanId(planId); //for(VoIrrigateSchedule schedule : schedules) { // Long groupId = schedule.getGroupId(); // List<Long> intakeIds = irrigatePlanSv.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()); // } // } //} // //return BaseResponseUtils.buildSuccess(); } /** * 根据计划ID获取计划最新状态 * @param planId * @return */ @GetMapping(path = "/getPlanLatestState") public BaseResponse<Integer> getPlanLatestState(@RequestParam Long planId) { if(planId == null) { return BaseResponseUtils.buildErrorMsg("计划ID不能为空"); } Byte startupMode = plan.getStartupMode(); Integer duration = plan.getDuration(); Date planStartTime = plan.getPlanStartTime(); Date planStopTime = null; if(startupMode == 1){ planStartTime = new Date(); try { return BaseResponseUtils.buildSuccess(irrigatePlanSv.getPlanLatestState(planId)); } catch (Exception e) { log.error("获取未完的计划异常", e); return BaseResponseUtils.buildException(e.getMessage()); } LocalDateTime startTime = planStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime(); if(startupMode == 1){ // 测试阶段延后2分钟，正式发布为5分钟 startTime = startTime.plusMinutes(2); //startTime = startTime.plusMinutes(5); } planStartTime = Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()); LocalDateTime stopTime = startTime.plusMinutes(duration); planStopTime = Date.from(stopTime.atZone(ZoneId.systemDefault()).toInstant()); if(irrigatePlanSv.updatePlanTimes(planStartTime, planStopTime, planId) == 0) { return BaseResponseUtils.buildErrorMsg("计划信息更新失败"); } // 更新每个灌溉次序的开始时间 List<VoIrrigateSchedule> schedules = irrigatePlanSv.getSchedulesByPlanId(planId); Date scheduleStartTime = null; Integer sort = 0; for(VoIrrigateSchedule schedule : schedules){ if(scheduleStartTime == null) { scheduleStartTime = planStartTime; } irrigatePlanSv.updateScheduleStartTime(schedule.getScheduleId(), scheduleStartTime); // 计算下一组的开始时间 LocalDateTime LocalscheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime(); LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration()); 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(irrigatePlanSv.addPlanOperate(planOperate) == 0){ return BaseResponseUtils.buildErrorMsg("添加灌溉计划操作记录失败"); } schedules = irrigatePlanSv.getSchedulesByPlanId(planId); for(VoIrrigateSchedule schedule : schedules) { Long groupId = schedule.getGroupId(); List<Long> intakeIds = irrigatePlanSv.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()); } } } return BaseResponseUtils.buildSuccess(); } /** pipIrr-platform/pipIrr-web/pipIrr-web-wechat/src/main/java/com/dy/pipIrrWechat/irrigatePlan/IrrigatePlanSv.java
@@ -1,9 +1,5 @@ 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.*; @@ -14,7 +10,8 @@ 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.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; @@ -23,6 +20,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; /** @@ -64,6 +63,9 @@ @Autowired private RmCommandHistoryMapper rmdCommandHistoryMapper; @Autowired private CommandSv commandSv; /** * 添加灌溉计划 @@ -122,6 +124,137 @@ 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); } planStartTime = Date.from(startTime.atZone(ZoneId.systemDefault()).toInstant()); LocalDateTime stopTime = startTime.plusMinutes(duration); planStopTime = Date.from(stopTime.atZone(ZoneId.systemDefault()).toInstant()); // 根据计划ID更新计划信息（起止时间、计划状态） if(irrigatePlanMapper.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; } updateScheduleStartTime(schedule.getScheduleId(), scheduleStartTime); // 计算下一组的开始时间 LocalDateTime LocalscheduleStartTime = scheduleStartTime.toInstant().atZone(ZoneId.systemDefault()) .toLocalDateTime(); LocalscheduleStartTime = LocalscheduleStartTime.plusMinutes(schedule.getDuration()); 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); } /** @@ -287,26 +420,6 @@ 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); } /**
