1.漏检增加记录点名称、路线名称、计划名称

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/entity/mybatis/PlanTaskPointInputItemBo.java

 package com.yeejoin.amos.maintenance.business.entity.mybatis;
 
+import lombok.Data;
+
 import java.util.Date;
 
+/**
+ * @author DELL
+ */
+@Data
 public class PlanTaskPointInputItemBo {
 
 	/**
@@ -65,153 +71,32 @@ public class PlanTaskPointInputItemBo {
 	private String inputName;
 
 	private Long classifyId;
-		
-   //新增执行部门	
+
+	/**
+	 * 执行部门
+	 */
 	private String depId;
-	//执行人名称
+	/**
+	 * 执行人名称
+	 */
 	private String userName;
-	//执行部门名称
-	private String depName;
-	
-	
-	
-	
-	
-	
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getDepName() {
-		return depName;
-	}
-
-	public void setDepName(String depName) {
-		this.depName = depName;
-	}
-
-	public Long getInputItemId() {
-		return inputItemId;
-	}
-
-	public void setInputItemId(Long inputItemId) {
-		this.inputItemId = inputItemId;
-	}
-
-	public int getOrderNo() {
-		return orderNo;
-	}
-
-	public void setOrderNo(int orderNo) {
-		this.orderNo = orderNo;
-	}
-
-	public long getPointId() {
-		return pointId;
-	}
-
-	public void setPointId(long pointId) {
-		this.pointId = pointId;
-	}
-
-	public long getPlanTaskId() {
-		return planTaskId;
-	}
-
-	public void setPlanTaskId(long planTaskId) {
-		this.planTaskId = planTaskId;
-	}
-
-	public long getRouteId() {
-		return routeId;
-	}
-
-	public void setRouteId(long routeId) {
-		this.routeId = routeId;
-	}
-
-	public long getPlanId() {
-		return planId;
-	}
 
-	public void setPlanId(long planId) {
-		this.planId = planId;
-	}
-
-	public String getUserId() {
-		return userId;
-	}
-
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-
-	public String getOrgCode() {
-		return orgCode;
-	}
-
-	public void setOrgCode(String orgCode) {
-		this.orgCode = orgCode;
-	}
-
-	public Date getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-	
-	public long getRoutePointItemId() {
-		return routePointItemId;
-	}
-
-	public void setRoutePointItemId(long routePointItemId) {
-		this.routePointItemId = routePointItemId;
-	}
-
-	public long getPlanTaskDetailId() {
-		return planTaskDetailId;
-	}
-
-	public void setPlanTaskDetailId(long planTaskDetailId) {
-		this.planTaskDetailId = planTaskDetailId;
-	}
-	
-	public String getClassifyName() {
-		return classifyName;
-	}
-
-	public void setClassifyName(String classifyName) {
-		this.classifyName = classifyName;
-	}
-
-	public Long getClassifyId() {
-		return classifyId;
-	}
-
-	public void setClassifyId(Long classifyId) {
-		this.classifyId = classifyId;
-	}
-
-	public String getInputName() {
-		return inputName;
-	}
-
-	public void setInputName(String inputName) {
-		this.inputName = inputName;
-	}
-
-	public String getDepId() {
-		return depId;
-	}
+	/**
+	 * 执行部门名称
+	 */
+	private String depName;
 
-	public void setDepId(String depId) {
-		this.depId = depId;
-	}
+	/**
+	 * 冗余字段：点名称
+	 */
+	private String pointName;
+	/**
+	 * 冗余字段：路线名称
+	 */
+	private String routeName;
+	/**
+	 * 冗余字段：计划名称
+	 */
+	private String planName;
 	
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-maintenance-biz/src/main/java/com/yeejoin/amos/maintenance/business/service/intfc/IPlanTaskService.java

 package com.yeejoin.amos.maintenance.business.service.intfc;
 
-import java.text.ParseException;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import com.yeejoin.amos.maintenance.business.entity.mybatis.CheckChkExListBo;
-import com.yeejoin.amos.maintenance.business.vo.CodeOrderVo;
-import com.yeejoin.amos.maintenance.business.vo.LeavePlanTaskVo;
+import com.yeejoin.amos.maintenance.business.param.CheckPtListPageParam;
+import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam;
 import com.yeejoin.amos.maintenance.business.vo.PlanTaskVo;
 import com.yeejoin.amos.maintenance.core.common.request.CommonPageable;
+import com.yeejoin.amos.maintenance.dao.entity.PlanTask;
 import org.springframework.data.domain.Page;
 
-import com.yeejoin.amos.maintenance.business.param.CheckPtListPageParam;
-import com.yeejoin.amos.maintenance.business.param.PlanTaskPageParam;
-import com.yeejoin.amos.maintenance.core.common.response.AppPointCheckRespone;
-import com.yeejoin.amos.maintenance.dao.entity.PlanTask;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 public interface IPlanTaskService {
 
 
-	/**
-	 * 计划执行查询
-	 */
-	Page<HashMap<String, Object>> getPlanTaskInfo(PlanTaskPageParam params);
-
-	/**
-	 * 计划执行重做
-	 */
-	void reGenPlanTask(HashMap<String, Object> param) throws ParseException;
-
-	/**
-	 * 计划执行删除
-	 */
-	void planTaskDet(String[] strArry);
-
-	/**
-	 * 执行计划导出
-	 */
-	List<PlanTaskVo> planTaskReport(String toke, String product, String appKey, PlanTaskPageParam params);
-	/**
-	 * 自动任务执行
-	 * @param runDate
-	 */
-	void taskExecution(String runDate);
-
-	/**
-	 * 根据路线id获取关联的所有计划任务
-	 *
-	 * @param routeId
-	 * @return
-	 */
-	List<PlanTask> getPlanTaskByRouteId(Long routeId);
-
-	/**
-	 * 停用计划任务
-	 *
-	 * @param routeIds
-	 */
-	void disablePlanTask(Long[] routeIds);
-
-
-
-
-	/**
-	 *	计划任务列表
-	 * @param params
-	 * @param page
-	 * @return
-	 */
-	Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable page);
-
-
-	/**
-	 * 	根据计划ID获取所有的 任务计划巡检点
-	 * @param param
-	 * @return
-	 */
-	List getPlanTaskPoints(Map<String, Object> param);
-
-	/**
-	 * 	获取用户当前所有有的计划任务
-	 * @param userId
-	 * @return
-	 */
-	int getCurrentPlanTaskCount(String userId);
     /**
-     * 今日执行情况
-     * @param params
+     * 计划执行查询
+     */
+    Page<HashMap<String, Object>> getPlanTaskInfo(PlanTaskPageParam params);
+
+    /**
+     * 计划执行重做
+     */
+    void reGenPlanTask(HashMap<String, Object> param) throws ParseException;
+
+    /**
+     * 计划执行删除
+     */
+    void planTaskDet(String[] strArry);
+
+    /**
+     * 执行计划导出
+     */
+    List<PlanTaskVo> planTaskReport(String toke, String product, String appKey, PlanTaskPageParam params);
+
+    /**
+     * 自动任务执行
+     *
+     * @param runDate
+     */
+    void taskExecution(String runDate);
+
+    /**
+     * 根据路线id获取关联的所有计划任务
+     *
+     * @param routeId
      * @return
      */
-	Page<CheckChkExListBo> getChkExList(String toke, String product, String appKey, CheckPtListPageParam params);
+    List<PlanTask> getPlanTaskByRouteId(Long routeId);
 
-	/**
-	 * 根据id获取执行计划
-	 * @param ids
-	 * @return
-	 */
-	List<PlanTaskVo> getPlanTaskListByIds(String toke,String product,String appKey,Long[] ids);
+    /**
+     * 停用计划任务
+     *
+     * @param routeIds
+     */
+    void disablePlanTask(Long[] routeIds);
 
-	/**
-	 * 根据任务id点id 获取点详情
-	 * @param planTaskId
-	 * @param pointId
-	 * @return
-	 */
-	AppPointCheckRespone queryPointPlanTaskDetail(String toke,String product,String appKey,Long planTaskId,Long pointId);
 
-	AppPointCheckRespone queryPointPlanTaskDetailInVersion2(String toke,String product,String appKey,Long planTaskId,Long pointId);
+    /**
+     * 计划任务列表
+     *
+     * @param params
+     * @param page
+     * @return
+     */
+    Page<HashMap<String, Object>> getPlanTasks(HashMap<String, Object> params, CommonPageable page);
 
-	Map<String, Object> getPlanTaskStatisticsForApp(HashMap<String, Object> params);
 
-	/**
-	 * 获取公司计划累计情况
-	 * @param loginOrgCode
-	 * @return
-	 */
-	String getCumulativePlanCountByOrgCode(String loginOrgCode);
+    /**
+     * 根据计划ID获取所有的 任务计划巡检点
+     *
+     * @param param
+     * @return
+     */
+    List getPlanTaskPoints(Map<String, Object> param);
 
-	List<LeavePlanTaskVo> queryLeavePlanTask(HashMap<String, Object> params);
+    /**
+     * 今日执行情况
+     *
+     * @param params
+     * @return
+     */
+    Page<CheckChkExListBo> getChkExList(String toke, String product, String appKey, CheckPtListPageParam params);
 
+    /**
+     * 根据id获取执行计划
+     *
+     * @param ids
+     * @return
+     */
+    List<PlanTaskVo> getPlanTaskListByIds(String toke, String product, String appKey, Long[] ids);
 
-	PlanTask selectPlanTaskStatus(Long id);
+    /**
+     * 获取公司计划累计情况
+     *
+     * @param loginOrgCode
+     * @return
+     */
+    String getCumulativePlanCountByOrgCode(String loginOrgCode);
 
-	void reformStatisticsPlanTask(String strBginDate, String strEndDate, String userId, String orgCode) throws ParseException;
 
-	void initPlanStatusOrGenDate();
+    PlanTask selectPlanTaskStatus(Long id);
 
-	List<Map<String,Object>> queryPlanTaskTimeAxis(Long userId,Integer createDate);
 
-	List<Map<String,Object>> queryTimeAxis(Long userId,Integer createDate);
+    void initPlanStatusOrGenDate();
 
-	/**
-	 * 任务点详情
-	 *
-	 * @param planTaskDetailId 子表id
-	 * @param routePointId 关系表id
-	 * @return Map<String, Object>
-	 */
-	Map<String, Object> planTaskPointDetail(String planTaskDetailId, String routePointId);
+    /**
+     * 任务点详情
+     *
+     * @param planTaskDetailId 子表id
+     * @param routePointId     关系表id
+     * @return Map<String, Object>
+     */
+    Map<String, Object> planTaskPointDetail(String planTaskDetailId, String routePointId);
 }

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

@@ -38,8 +38,6 @@ public class JobService implements IJobService {
     @Autowired
     private IPlanTaskDao iPlanTaskDao;
 
-    @Autowired
-    private IPlanDao iPlanDao;
 
     @Autowired
     private IPlanTaskDetailDao iPlanTaskDetailDao;
@@ -51,9 +49,6 @@ public class JobService implements IJobService {
     private PlanTaskMapper planTaskMapper;
 
     @Autowired
-    private MsgMapper msgMapper;
-
-    @Autowired
     private ICheckDao iCheckDao;
 
     @Autowired
@@ -69,14 +64,10 @@ public class JobService implements IJobService {
     private ITaskFeedbackDao taskFeedbackDao;
 
     @Autowired
-    private CheckMapper checkMapper;
-    @Autowired
     private RemoteSecurityService remoteSecurityService;
 
     @Value("${amosRefresh.patrol.topic}")
     private String patrolTopic;
-    @Autowired
-    private MqttGateway webMqttComponent;
 
     @Override
     @Transactional
@@ -204,12 +195,15 @@ public class JobService implements IJobService {
                 check.setUserId(planTask.getUserId());
                 check.setUserName(planTask.getUserName());
                 check.setDepName("");
+                check.setPointName(arg.getPointName());
                 check.setPointId(arg.getPointId());
                 check.setUploadTime(new Date());
                 check.setPlanId(arg.getPlanId());
+                check.setPlanName(arg.getPlanName());
                 check.setPlanTaskId(arg.getPlanTaskId());
                 check.setPlanTaskDetailId(arg.getPlanTaskDetailId());
                 check.setRouteId(arg.getRouteId());
+                check.setRouteName(arg.getRouteName());
                 check.setCheckTime(arg.getEndTime());
                 check.setIsOk(CheckStatusEnum.OMISSION.getCode());
                 check = iCheckDao.saveAndFlush(check);
@@ -301,7 +295,6 @@ public class JobService implements IJobService {
 
     @Override
     public void planTaskAddJob(PlanTask planTask) {
-        // TODO Auto-generated method stub
         try {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             Date endTime = sdf.parse(planTask.getEndTime());
@@ -316,30 +309,6 @@ public class JobService implements IJobService {
                         || PlanTaskFinishStatusEnum.UNDERWAY.getValue() == status) {
                     addJob("planTask", XJConstant.STATUS_MONITOR_END, planTask.getId(), endTime);// 添加监控任务开始结束定时任务
                 }
-
-                // 查询需要推送消息提醒
-                List<MsgConfigParam> configParam = msgMapper.getPlanTaskMsgConfigByUserIdAndStatus(planTask.getUserId().split(","),
-                        "True");
-                if (!configParam.isEmpty()) {
-                    configParam.forEach(config -> {
-                        String jobType = "";
-                        Date time = new Date();
-                        int minute = Integer.valueOf(config.getValue());
-                        long tempTime = minute * 60 * 1000;
-                        if (MsgSubscribeTypeEnum.PLANWARN.getName().equals(config.getMsgType())) {
-                            time = new Date(beginTime.getTime() - tempTime);
-                            jobType = XJConstant.PLAN_TASK_WARN_MSG_PUSH + "-" + config.getUserId();
-                        } else if (MsgSubscribeTypeEnum.PLANBEGIN.getName().equals(config.getMsgType())) {
-                            time = new Date(beginTime.getTime() + tempTime);
-                            jobType = XJConstant.PLAN_TASK_BEGIN_MSG_PUSH + "-" + config.getUserId();
-                        } else if (MsgSubscribeTypeEnum.PLANEND.getName().equals(config.getMsgType())) {
-                            time = new Date(endTime.getTime() + tempTime);
-                            jobType = XJConstant.PLAN_TASK_END_MSG_PUSH + "-" + config.getUserId();
-                        }
-                        addJob("planTask", jobType, planTask.getId(), time);
-                    });
-                }
-
             } else {
                 updatePlanTaskStatus(planTask, PlanTaskFinishStatusEnum.OVERTIME.getValue());
             }

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

@@ -378,13 +378,14 @@
 	</select>
 
 	<select id="getPlanTaskPointInputItemByPlanTaskId" resultType="com.yeejoin.amos.maintenance.business.entity.mybatis.PlanTaskPointInputItemBo">
-
 		SELECT
 			ppi.input_item_id inputItemId,
 			temp1.order_no orderNo,
 			temp1.routePointItemId,
 			temp1.classifyId,
 			temp1.classifyName,
+			temp1.routeName,
+			temp1.pointName,
 			pii.`name` inputName,
 			temp2.*
 		FROM
@@ -399,11 +400,15 @@
 					prp.route_id,
 					prpi.id routePointItemId,
 					ppc.id classifyId,
-					ppc.`name` classifyName
+					ppc.`name` classifyName,
+				    r.name as routeName,
+					p.name as pointName
 				FROM
 					p_route_point_item prpi
 					LEFT JOIN p_route_point prp ON prp.id = prpi.route_point_id
 					LEFT JOIN p_point_classify ppc ON prpi.point_classify_id = ppc.id
+					LEFT JOIN p_route r ON r.id = prp.route_id
+					LEFT JOIN p_point p ON p.id = prp.point_id
 			) temp1 ON(ppi.id = temp1.point_input_item_id)
 		RIGHT JOIN
 
@@ -417,16 +422,15 @@
 					ptd.org_code AS orgCode,
 					ptd.end_time AS endTime,
 					pptd.id as planTaskDetailId,
-					(select p_plan.dept_id from  p_plan where p_plan.id=ptd.plan_id) depId
+					(select p_plan.dept_id from  p_plan where p_plan.id=ptd.plan_id) depId,
+					(select p_plan.name from  p_plan where p_plan.id=ptd.plan_id) planName
 				FROM
 					p_plan_task_detail pptd,
 					p_plan_task ptd
 				WHERE
 					pptd.task_no = ptd.id
 				AND ptd.id = #{planTaskId} and pptd.`status` = #{planTaskDetailStatus}
-			) temp2 on(temp1.point_id = temp2.pointId
-		AND temp1.route_id = temp2.routeId)
-
+			) temp2 on temp1.point_id = temp2.pointId AND temp1.route_id = temp2.routeId
 	</select>
 	<!-- 巡检执行情况统计分页用 -->
 	<select id="countChkExListData" resultType="long">