定时服务

application-facade/src/main/java/com/factory/controller/web/FirstArticleController.java

@@ -131,14 +131,14 @@ public class FirstArticleController {
 	@ApiOperation(value = "添加巡检项目检查结果")
 	@PostMapping("/addFaItemResult")
 	@ApiOperationSupport(order = 9)
-	public ResponseBean addFaItemResult(@RequestBody AddFaItemResultListReq req) {
+	public ResponseBean<Void> addFaItemResult(@RequestBody AddFaItemResultListReq req) {
 		return firstArticleService.addFaItemResult(req);
 	}
 
 	@ApiOperation(value = "任务检查完后提交")
 	@PostMapping("/submitFaTask")
 	@ApiOperationSupport(order = 10)
-	public ResponseBean submitFaTask(@RequestBody SubmitFaTaskReq req) {
+	public ResponseBean<Void> submitFaTask(@RequestBody SubmitFaTaskReq req) {
 		return firstArticleService.submitFaTask(req);
 	}
 

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -930,7 +930,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 	        String planName = plan.getName().length()>15?(plan.getName().substring(0,12)+"..."):plan.getName();
 			//向下一级别发送提醒
 			wxService.sendWechatMessageByRole(SendMsgReq.builder()
-				.title("计划放行("+type+")提醒")
+				.title("计划放行("+type+")")
 		        .content(planName+"待审批")
 		        .pageIndex("/pagesPlan/approval")
 	            .fromUserId(userId)

application-facade/src/main/java/com/factory/web/service/impl/pm/PreventMistakeServiceImpl.java

@@ -939,7 +939,7 @@ public class PreventMistakeServiceImpl extends ServiceImpl<PreventMistakeMapper,
 	         String planName = plan.getName().length()>15?(plan.getName().substring(0,12)+"..."):plan.getName();
 	            //向下一级别发送提醒
 	            wxService.sendWechatMessageByRole(SendMsgReq.builder()
-	            		.title("计划放行("+type+"-防错)提醒")
+	            		.title("计划放行("+type+"-防错)")
 	            		.content(planName+"待审批")
 	    		        .pageIndex("/pagesPlan/approval")
 	                    .fromUserId(userId)

application-task/src/main/java/com/factory/init/FirstRemindJob.java

@@ -124,7 +124,6 @@ public class FirstRemindJob implements Job {
         private ConcurrentMap<String, Object> paramMap;
         private HashMap<String,Object> paramQuery;
 
-
         public RemindFirstWorker(ConcurrentMap<String, Object> paramMap, HashMap<String,Object> paramQuery) {
             this.paramMap = paramMap;
             this.paramQuery = paramQuery;
@@ -139,10 +138,10 @@ public class FirstRemindJob implements Job {
 			LocalDateTime now = LocalDateTime.now();
 			for (FirstCalendar cal : cals) {
 				if (StringUtils.isNotBlank(cal.getFirstRemind()) && now
-						.isAfter(TimeUtils.paserDayTimeString(cal.getTaskTime() + " " + cal.getFirstRemind() + ":00"))) {//首件
+						.isBefore(TimeUtils.paserDayTimeString(cal.getTaskTime() + " " + cal.getFirstRemind() + ":00"))) {//首件
 					// 还未到时间
 					continue;
-				} else if (now.isAfter(TimeUtils.paserDayTimeString(cal.getTaskTime() + " "+cal.getTwoRemind()+":00"))) {//200件
+				} else if (now.isBefore(TimeUtils.paserDayTimeString(cal.getTaskTime() + " "+cal.getTwoRemind()+":00"))) {//200件
 					continue;
 				}
 
@@ -150,17 +149,15 @@ public class FirstRemindJob implements Job {
 				String tokenB = String.valueOf(cal.getPrincipalTwoId());
 				Arrays.asList(tokenA, tokenB).forEach(token -> {
 					if (WsSessionManager.SESSION_POOL.containsKey(token)) {
-						try {
-							WsSessionManager.sendMessage(token, "有一个首件巡检需要处理，请及时操作！");
-							Map<String, Object> qm = new HashMap<>();
-							qm.put("flag", "remind_task_flag");
-							qm.put("flagVal", remind_handle_flag);
-							qm.put("first_task_id", cal.getFirstTaskId());
-							firstTaskService.updateFirstRemindFlag(qm);
-						} catch (Throwable e) {
-							log.error("remindFirstWork生产任务出错", e);
-						}
-					}
+						WsSessionManager.sendMessage(token, "有一个首件巡检需要处理，请及时操作！");
+						Map<String, Object> qm = new HashMap<>();
+						qm.put("flag", "remind_task_flag");
+						qm.put("flagVal", remind_handle_flag);
+						qm.put("first_task_id", cal.getFirstTaskId());
+						firstTaskService.updateFirstRemindFlag(qm);
+					}else {
+	                	log.warn("FA巡检负责人不在线{}/{}",token,cal.getFirstTaskId());
+	                }
 				});
 			}
 			return 0;
@@ -191,12 +188,11 @@ public class FirstRemindJob implements Job {
             LocalDateTime now = LocalDateTime.now();
             
             for (FirstCalendar cal : cals) {
-               
                 if (StringUtils.isNotBlank(cal.getFirstRemind()) && now
-						.isAfter(TimeUtils.paserDayTimeString(cal.getTaskTime() + " " + cal.getFirstRemind() + ":00").plusMinutes(cal.getUpleverTimeNum()))) {
+						.isBefore(TimeUtils.paserDayTimeString(cal.getTaskTime() + " " + cal.getFirstRemind() + ":00").plusMinutes(cal.getUpleverTimeNum()))) {
 					// 还未到时间
 					continue;
-				} else if (now.isAfter(TimeUtils.paserDayTimeString(cal.getTaskTime() + " "+cal.getTwoRemind()+":00").plusMinutes(cal.getUpleverTimeNum()))) {
+				} else if (now.isBefore(TimeUtils.paserDayTimeString(cal.getTaskTime() + " "+cal.getTwoRemind()+":00").plusMinutes(cal.getUpleverTimeNum()))) {
 					continue;
 				}
 
@@ -213,13 +209,18 @@ public class FirstRemindJob implements Job {
                     map.put("flagVal", remind_handle_flag);
                     map.put("first_task_id", cal.getFirstTaskId());
                     firstTaskService.addRemindNowork(map);
-
+                    
+                    Map<String,Object> plan = firstTaskService.getApprovalPlanInfo(cal.getFirstTaskId());
+                    String planName = plan.get("planName").toString();
+            		planName = planName.length()>15?(planName.substring(0,12)+"..."):planName;
+                  
                     //需要推动调用这个 todo
                     //发送微信消息
                     SendMsgReq sendMsgReq = new SendMsgReq();
                     sendMsgReq.setToUserId(roleId);
-                    sendMsgReq.setTitle("计划提醒");
-                    sendMsgReq.setContent("您有待提醒的计划，请登录小程序查看");
+                    sendMsgReq.setTitle("计划提醒("+plan.get("typeFlagStr")+")");
+                    sendMsgReq.setContent(planName+"待提醒");
+                    sendMsgReq.setPageIndex("/pagesPlan/reminder");
                     msgService.sendWechatMessageByRole(sendMsgReq,roleId);
                 }
 

application-task/src/main/java/com/factory/init/OnsiteRemindJob.java

@@ -41,7 +41,8 @@ public class OnsiteRemindJob implements Job {
         ConcurrentMap<String, Object> paramMap = (ConcurrentMap<String, Object>) jobExecutionContext.getJobDetail().getJobDataMap().get(QuartzManager.JOB_PARAM_NAME);
         try {
             OnsiteTaskService onsiteTaskService = (OnsiteTaskService) paramMap.get("onsiteTaskService");
-            onsiteTaskService.delTaskOld(null);
+            //去掉，已经判断今天有任务不生成了
+//            onsiteTaskService.delTaskOld(null);
             //  week_day month_day
             createTask(paramMap);// 执行任务
         } catch (Throwable e) {
@@ -162,7 +163,7 @@ public class OnsiteRemindJob implements Job {
             LocalDateTime now = LocalDateTime.now();
             try {
 	            for (OnsiteCalendar cal : cals) {
-	                if (cal.getType_flag()==0&&now.isAfter(TimeUtils.paserDayTimeString(cal.getTask_time()+ " " + cal.getStart_day()+":00"))) {
+	                if (cal.getType_flag()==0&&now.isBefore(TimeUtils.paserDayTimeString(cal.getTask_time()+ " " + cal.getStart_day()+":00"))) {
 	                   //还未到时间
 	                   continue;
 	                } 
@@ -176,6 +177,8 @@ public class OnsiteRemindJob implements Job {
 	                    qm.put("flagVal", remind_handle_flag);
 	                    qm.put("onsite_task_id", cal.getOnsite_task_id());
 	                    onsiteTaskService.updateOnsiteRemindFlag(qm);
+	                }else {
+	                	log.warn("OT巡检负责人不在线{}/{}",token,cal.getOnsite_task_id());
 	                }
 	            }
             } catch (Throwable e) {
@@ -210,7 +213,7 @@ public class OnsiteRemindJob implements Job {
             
             for (OnsiteCalendar cal : cals) {
 				if (cal.getType_flag() == 0 && now
-						.isAfter(TimeUtils.paserDayTimeString(cal.getTask_time() + " " + cal.getStart_day() + ":00").plusMinutes(cal.getDay_validate()))) {
+						.isBefore(TimeUtils.paserDayTimeString(cal.getTask_time() + " " + cal.getStart_day() + ":00").plusMinutes(cal.getDay_validate()))) {
 					// 还未到时间
 					continue;
 				} else if (cal.getType_flag() == 1 && now.getDayOfWeek().getValue() < cal.getWeek_day()) {// 周
@@ -233,13 +236,17 @@ public class OnsiteRemindJob implements Job {
                     map.put("flagVal", remind_handle_flag);
                     map.put("onsite_task_id", cal.getOnsite_task_id());
                     onsiteTaskService.addRemindNowork(map);
-
+                    Map<String,Object> plan = onsiteTaskService.getApprovalPlanInfo(cal.getOnsite_task_id());
+                    String planName = plan.get("planName").toString();
+            		planName = planName.length()>15?(planName.substring(0,12)+"..."):planName;
+                
                     //需要推动调用这个 todo
                     //发送微信消息
                     SendMsgReq sendMsgReq = new SendMsgReq();
                     sendMsgReq.setToUserId(roleId);//3
-                    sendMsgReq.setTitle("计划提醒");
-                    sendMsgReq.setContent("您有待提醒的计划，请登录小程序查看");
+                    sendMsgReq.setTitle("计划提醒("+plan.get("typeFlagStr")+"-防错)");
+                    sendMsgReq.setContent(planName+"待提醒");
+                    sendMsgReq.setPageIndex("/pagesPlan/reminder");
                     msgService.sendWechatMessageByRole(sendMsgReq,roleId);
                 }
                 

application-task/src/main/java/com/factory/init/OnsiteTaskJob.java

@@ -2,14 +2,12 @@ package com.factory.init;
 
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
 
 import org.quartz.DisallowConcurrentExecution;
 import org.quartz.Job;
@@ -19,7 +17,6 @@ import org.quartz.JobExecutionException;
 import com.factory.base.entity.task.OnsiteCalendar;
 import com.factory.base.entity.task.OnsiteTask;
 import com.factory.base.util.time.TimeUtils;
-import com.factory.common.CommonUtil;
 import com.factory.service.OnsiteTaskService;
 
 import lombok.extern.slf4j.Slf4j;

application-task/src/main/java/com/factory/init/TimerTaskInit.java

@@ -61,10 +61,10 @@ public class TimerTaskInit {
         param.put("msgService", msgService);
         param.put("executorService", executorService);
         Scheduler sche = schedulerFactoryBean.getScheduler();
-        addAutoApproveErrorTask(param, sche);
-        addOnsiteTask(param, sche);
-        addOnsiteRemindWork(param, sche);
-        addFirstTask(param, sche);
+//        addAutoApproveErrorTask(param, sche);
+//        addOnsiteTask(param, sche);
+//        addOnsiteRemindWork(param, sche);
+//        addFirstTask(param, sche);
         addFirstRemindWork(param, sche);
     }
 

application-task/src/main/java/com/factory/service/FirstTaskService.java

@@ -81,4 +81,7 @@ public interface FirstTaskService {
      * @return
      */
     int addTaskForNext(ApproveEntry vo);
+    
+    
+    Map<String,Object> getApprovalPlanInfo(Long taskId);
 }

application-task/src/main/java/com/factory/service/OnsiteTaskService.java

@@ -11,6 +11,7 @@ public interface OnsiteTaskService {
 
     public int getTaskExistCount(Map<String,Object> map);
 
+    @Deprecated
     public int delTaskOld(Map<String,Object> map);
 
     /**
@@ -86,5 +87,7 @@ public interface OnsiteTaskService {
      * @return
      */
     public int addTaskForNext(ApproveEntry vo);
+    
+    public Map<String,Object> getApprovalPlanInfo(Long taskId);
 
 }

application-task/src/main/java/com/factory/service/impl/FirstTaskServiceImp.java

@@ -146,7 +146,7 @@ public class FirstTaskServiceImp implements FirstTaskService {
             		planName = planName.length()>15?(planName.substring(0,12)+"..."):planName;
                     SendMsgReq sendMsgReq = new SendMsgReq();
                     sendMsgReq.setToUserId(nextRole.getUser_id());
-                    sendMsgReq.setTitle("计划放行("+plan.get("typeFlagStr")+")提醒");
+                    sendMsgReq.setTitle("计划放行("+plan.get("typeFlagStr")+")");
                     sendMsgReq.setContent(planName+"待审批");
                     sendMsgReq.setEndTime(TimeUtils.getDayString(LocalDateTime.now()));
                     sendMsgReq.setPageIndex("/pagesPlan/approval");
@@ -158,5 +158,10 @@ public class FirstTaskServiceImp implements FirstTaskService {
         return 0;
     }
 
+	@Override
+	public Map<String, Object> getApprovalPlanInfo(Long taskId) {
+		return firstTaskMapper.getApprovalPlanInfo(taskId);
+	}
+
 
 }

application-task/src/main/java/com/factory/service/impl/OnsiteTaskServiceImp.java

@@ -136,14 +136,14 @@ public class OnsiteTaskServiceImp implements OnsiteTaskService {
                 approve.setApproval_role(nextRole.getRole_id());
                 int status = onsiteTaskMapper.addApproveTask(approve);
                 if (status > 0) {
-                    Map<String,Object> plan = onsiteTaskMapper.getApprovalPlanInfo(vo.getTask_id());
+                    Map<String,Object> plan = this.getApprovalPlanInfo(vo.getTask_id());
                     //发送微信消息
                     String planName = plan.get("planName").toString();
             		planName = planName.length()>15?(planName.substring(0,12)+"..."):planName;
                     SendMsgReq sendMsgReq = new SendMsgReq();
                     sendMsgReq.setToUserId(nextRole.getUser_id());
-                    sendMsgReq.setTitle("计划放行("+plan.get("typeFlagStr")+"-防错)提醒");
-                    sendMsgReq.setContent(""+planName+"待审批");
+                    sendMsgReq.setTitle("计划放行("+plan.get("typeFlagStr")+"-防错)");
+                    sendMsgReq.setContent(planName+"待审批");
                     sendMsgReq.setEndTime(TimeUtils.getDayString(LocalDateTime.now()));
                     sendMsgReq.setPageIndex("/pagesPlan/approval");
                     msgService.sendWechatMessageByRole(sendMsgReq,nextRole.getRole_id());
@@ -154,4 +154,7 @@ public class OnsiteTaskServiceImp implements OnsiteTaskService {
         return 0;
     }
 
+    public Map<String,Object> getApprovalPlanInfo(Long taskId){
+    	return onsiteTaskMapper.getApprovalPlanInfo(taskId);
+    }
 }

application-task/src/main/resources/mappers/FirstTaskMapper.xml

@@ -105,13 +105,13 @@
     <select id="getRemindWork" resultType="com.factory.base.entity.task.FirstCalendar">
         select b.*,a.task_time ,a.id first_task_id
         from first_article_task a,first_article_calendar b
-        where a.first_article_calendar_id=b.id and a.status=0 and b.type_flag like concat('%', ${type_flag}, '%')
-            and a.type_flag = ${type_flag}
+        where a.first_article_calendar_id=b.id and a.status=0 and FIND_IN_SET(#{type_flag},b.type_flag)
+            and a.type_flag = #{type_flag}
         <if test="remind_task_flag != null">
-            and a.remind_task_flag = ${remind_task_flag}
+            and a.remind_task_flag = #{remind_task_flag}
         </if>
         <if test="remind_nowork_flag != null">
-           and a.remind_nowork_flag = ${remind_nowork_flag} <!--  and a.remind_task_flag = 1  -->
+           and a.remind_nowork_flag = #{remind_nowork_flag} <!--  and a.remind_task_flag = 1  -->
         </if>
     </select>
 

application-task/src/main/resources/mappers/OnsiteTaskMapper.xml

@@ -179,10 +179,10 @@
         from onsite_task a,onsite_calendar b
         where a.onsite_calendar_id=b.id and a.status=0 and b.type_flag=#{type_flag}
         <choose>
-        	<when test="type_flag=='0' and remind_task_flag != null">
-        		and a.remind_task_flag = 0 and b.start_day  &gt; #{time}
+        	<when test="type_flag==0 and remind_task_flag != null">
+        		and a.remind_task_flag = 0 and b.start_day  &lt; #{time}
         	</when>
-        	<when test="type_flag=='0' and remind_nowork_flag != null">
+        	<when test="type_flag==0 and remind_nowork_flag != null">
         	 	and a.remind_nowork_flag = 0<!-- and a.remind_task_flag=1  and b.end_day &gt; #{time} -->
         	</when>
         	<when test="remind_task_flag != nul">