修改待办任务 增加漏检 超时等待办任务的同步修改

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/impl/PlanTaskServiceImpl.java

@@ -7,6 +7,8 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import com.yeejoin.amos.maintenance.business.dao.mapper.InputItemMapper;
 import com.yeejoin.amos.maintenance.business.dao.mapper.PlanMapper;
@@ -21,6 +23,7 @@ import com.yeejoin.amos.maintenance.business.service.intfc.IPlanTaskService;
 import com.yeejoin.amos.maintenance.business.util.CommonResponse;
 import com.yeejoin.amos.maintenance.business.util.CommonResponseUtil;
 import com.yeejoin.amos.maintenance.business.util.PlanTaskUtil;
+import com.yeejoin.amos.maintenance.business.util.Toke;
 import com.yeejoin.amos.maintenance.business.vo.CalDateVo;
 import com.yeejoin.amos.maintenance.business.vo.PlanTaskVo;
 import com.yeejoin.amos.maintenance.common.enums.PlanTaskDetailIsFinishEnum;
@@ -44,6 +47,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
 
@@ -294,6 +298,19 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
         }
     }
 
+    private void updateTaskStatus(Plan plan){
+        Toke toke=  remoteSecurityService.getServerToken();
+        RequestContext.setToken(toke.getToke());
+        RequestContext.setProduct(toke.getProduct());
+        RequestContext.setAppKey(toke.getAppKey());
+        MessageModel model = new MessageModel();
+        model.setRelationId(String.valueOf(plan.getId()));
+        model.setMsgType("patrolSystem");
+        model.setIsRead(true);
+        log.info("修改待办任务参数-->{}", JSON.toJSON(model));
+        Systemctl.messageClient.update(model);
+    }
+
     /**
      * 自动任务执行
      */
@@ -341,6 +358,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
             if (!vo.getIsGenData()) {
                 paramMap.put("status", XJConstant.PLAN_STATUS_STOP);
                 planMapper.updPlanStatusOrGenDate(paramMap);
+                updateTaskStatus(plan);
                 continue;
             }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/quartz/JobService.java

 package com.yeejoin.amos.maintenance.quartz;
 
+import com.alibaba.fastjson.JSON;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.amos.maintenance.business.constants.XJConstant;
 import com.yeejoin.amos.maintenance.business.dao.mapper.CheckMapper;
 import com.yeejoin.amos.maintenance.business.dao.mapper.MsgMapper;
@@ -22,6 +25,7 @@ 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 org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -237,9 +241,25 @@ public class JobService implements IJobService {
                 checkInput.setPointClassifyName(arg.getClassifyName());
                 iCheckInputDao.saveAndFlush(checkInput);
             }
+            Plan plan = new Plan();
+            plan.setId(planTask.getPlanId());
+            updateTaskStatus(plan);
         }
     }
 
+    private void updateTaskStatus(Plan plan){
+        Toke toke=  remoteSecurityService.getServerToken();
+        RequestContext.setToken(toke.getToke());
+        RequestContext.setProduct(toke.getProduct());
+        RequestContext.setAppKey(toke.getAppKey());
+        MessageModel model = new MessageModel();
+        model.setRelationId(String.valueOf(plan.getId()));
+        model.setMsgType("patrolSystem");
+        model.setIsRead(true);
+        log.info("修改待办任务参数-->{}", JSON.toJSON(model));
+        Systemctl.messageClient.update(model);
+    }
+
     private void removeJob(String jobName) {
         log.debug("removeJob==jobName==" + jobName);
         QuartzManager.removeJob(jobName);

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/quartz/JobService.java

 package com.yeejoin.amos.patrol.quartz;
 
+import com.alibaba.fastjson.JSON;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.amos.patrol.business.constants.XJConstant;
 import com.yeejoin.amos.patrol.business.dao.mapper.*;
 import com.yeejoin.amos.patrol.business.dao.mapper.MsgMapper;
@@ -28,6 +31,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -199,6 +203,20 @@ public class JobService implements IJobService {
 		}
 	}
 
+	private void updateTaskStatus(Plan plan){
+		Toke toke=  remoteSecurityService.getServerToken();
+		RequestContext.setToken(toke.getToke());
+		RequestContext.setProduct(toke.getProduct());
+		RequestContext.setAppKey(toke.getAppKey());
+		MessageModel model = new MessageModel();
+		model.setRelationId(String.valueOf(plan.getId()));
+		model.setMsgType("patrolSystem");
+		model.setIsRead(true);
+		log.info("修改待办任务参数-->{}", JSON.toJSON(model));
+		Systemctl.messageClient.update(model);
+	}
+
+
 	/**
 	 * 创建漏检检查记录
 	 *
@@ -351,6 +369,11 @@ public class JobService implements IJobService {
 				checkInput.setPointClassifyName(arg.getClassifyName());
 				iCheckInputDao.saveAndFlush(checkInput);
 			}
+
+			//漏检修改APP待办通知状态不展示
+			Plan plan = new Plan();
+			plan.setId(planTask.getPlanId());
+			updateTaskStatus(plan);
 		}
 
 		String usrIds = planTask.getUserId();

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanTaskServiceImpl.java

@@ -16,6 +16,8 @@ import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.DepartmentModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.MessageModel;
 import com.yeejoin.amos.supervision.business.constants.XJConstant;
 import com.yeejoin.amos.supervision.business.dao.mapper.*;
 import com.yeejoin.amos.supervision.business.dao.repository.*;
@@ -363,6 +365,20 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 		return content;
 	}
 
+	private void updateTaskStatus(Plan plan){
+		Toke toke=  remoteSecurityService.getServerToken();
+		RequestContext.setToken(toke.getToke());
+		RequestContext.setProduct(toke.getProduct());
+		RequestContext.setAppKey(toke.getAppKey());
+		MessageModel model = new MessageModel();
+		model.setRelationId(String.valueOf(plan.getId()));
+		model.setMsgType("patrolSystem");
+		model.setIsRead(true);
+		log.info("修改待办任务参数-->{}", JSON.toJSON(model));
+		Systemctl.messageClient.update(model);
+	}
+
+
 	/**
 	 * 自动任务执行
 	 */
@@ -397,6 +413,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 				param.put("id", plan.getId());
 				param.put("status", PlanStatusEnum.OUT_TIME.getValue());
 				planMapper.updPlanStatusOrGenDate(param);
+				updateTaskStatus(plan);
 			}
 		}
 
@@ -440,6 +457,18 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 				//根据计划id查询关联的任务
 				List<PlanTask> planTaskByRouteId = planTaskMapper.getPlanTaskByRouteId(plan.getId());
 
+				//为2则为外部消防单位
+				if (plan.getIsFixedDate().equals("2")){
+					paramMap.put("status", PlanStatusEnum.OUT_TIME.getValue());
+					planMapper.updPlanStatusOrGenDate(paramMap);
+					updateTaskStatus(plan);
+					// 计划超时，修改计划下任务状态
+					planTaskMapper.updateTaskStatusByPlanId(plan.getId());
+					// 计划超时，修改计划下任务详情状态
+					planTaskMapper.updateTaskDetailStatusByPlanId(plan.getId());
+					continue;
+				}
+
 				if (!ValidationUtil.isEmpty(planTaskByRouteId)){
 					HashMap<String, Object> param = new HashMap<String, Object>();
 					param.put("pointId",plan.getId());
@@ -456,17 +485,10 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 				}else {
 					paramMap.put("status", PlanStatusEnum.OUT_TIME.getValue());
 					planMapper.updPlanStatusOrGenDate(paramMap);
+					updateTaskStatus(plan);
 					continue;
 				}
-				if (plan.getIsFixedDate().equals("2")){
-					paramMap.put("status", PlanStatusEnum.OUT_TIME.getValue());
-					planMapper.updPlanStatusOrGenDate(paramMap);
-					// 计划超时，修改计划下任务状态
-					planTaskMapper.updateTaskStatusByPlanId(plan.getId());
-					// 计划超时，修改计划下任务详情状态
-					planTaskMapper.updateTaskDetailStatusByPlanId(plan.getId());
-					continue;
-				}
+
 
 
 				if (!ObjectUtils.isEmpty(paramMap.get("status")) && paramMap.get("status").equals(PlanStatusEnum.OUT_TIME.getValue())){
@@ -474,6 +496,7 @@ public class PlanTaskServiceImpl implements IPlanTaskService {
 					planTaskMapper.updateTaskStatusByPlanId(plan.getId());
 					// 计划超时，修改计划下任务详情状态
 					planTaskMapper.updateTaskDetailStatusByPlanId(plan.getId());
+					updateTaskStatus(plan);
 				}
 				continue;
 			}

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_plan_task.xml

@@ -1028,7 +1028,7 @@
 			where
 				begin_time <= #{date,jdbcType=TIMESTAMP}
 			  and end_time > #{date,jdbcType=TIMESTAMP}
-			  and finish_status in (0, 1)
+			  and finish_status in (1)
 			  and status = 0
 			group by plan_id
 		)
@@ -1040,7 +1040,7 @@
 		where
 			begin_time <= #{date,jdbcType=TIMESTAMP}
 		  and end_time > #{date,jdbcType=TIMESTAMP}
-		  and finish_status in (0, 1)
+		  and finish_status in (1)
 		  and status = 0
 	</select>
 </mapper>
\ No newline at end of file