调整定时任务&mapper路径

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

@@ -1161,22 +1161,6 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
 
         return ResponseBeanBuilder.ok(list, Function.identity());
     }
-//    <select id="getCalenderFirstForType" resultMap="calendarFirst">
-//    SELECT b.*
-//    FROM benteler_plan a,
-//    first_article_calendar b,
-//    onsite_approval_plan oap
-//    WHERE a.id = b.benteler_plan_id
-//    and a.pause_flag = 0
-//    and a.deleted = 0
-//    and a.effective_date &lt;= now()
-//    and b.type_flag = ${type_flag}
-//    and a.id = oap.benteler_plan_id
-//    and a.plan_type = 1
-//    and oap.approval_level = 2
-//    and oap.status = 1
-//    </select>
-
 
     /**
      * 检查记录列表

application-task/src/main/java/com/factory/ApplicationTaskApplication.java

@@ -5,7 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-@MapperScan(value = "com.jihengbel.intelligent.applicationtask.model.**")
+@MapperScan(value = "com.factory.mapper.**")
 public class ApplicationTaskApplication {
 
     public static void main(String[] args) {

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

@@ -61,9 +61,7 @@ public class FirstTaskJob implements Job {
      * @return
      */
     private FutureTask<Integer> getFirstFutureTask(ConcurrentMap<String, Object> paramMap) {
-        HashMap param = new HashMap(16);
-        param.put("type_flag", 0);
-        FutureTask<Integer> task = new FutureTask<>(new addTask(paramMap, param));
+        FutureTask<Integer> task = new FutureTask<>(new addTask(paramMap, 0));
         Thread thread = new Thread(task);
         thread.start();  //开启线程
         return task;
@@ -76,9 +74,7 @@ public class FirstTaskJob implements Job {
      * @return
      */
     private FutureTask<Integer> get200FutureTask(ConcurrentMap<String, Object> paramMap) {
-        HashMap param = new HashMap(16);
-        param.put("type_flag", 1);
-        FutureTask<Integer> task = new FutureTask<>(new addTask(paramMap, param));
+        FutureTask<Integer> task = new FutureTask<>(new addTask(paramMap, 1));
         Thread thread = new Thread(task);
         thread.start();  //开启线程
         return task;
@@ -91,24 +87,24 @@ public class FirstTaskJob implements Job {
     public class addTask implements Callable<Integer> {
 
         private ConcurrentMap<String, Object> paramMap;
-        private HashMap paramQuery;
+        private Integer typeFlag;
 
 
-        public addTask(ConcurrentMap<String, Object> paramMap, HashMap paramQuery) {
+        public addTask(ConcurrentMap<String, Object> paramMap, Integer typeFlag) {
             this.paramMap = paramMap;
-            this.paramQuery = paramQuery;
+            this.typeFlag = typeFlag;
         }
 
         @Override
         public Integer call() {
             FirstTaskService firstTaskService = (FirstTaskService) paramMap.get("firstTaskService");
             String td = CommonUtil.getDateStr(new Date(), "yyyy-MM-dd");
-            List<FirstCalendar> cals = firstTaskService.getCalenderFirstForType(paramQuery);
-            for (FirstCalendar cal : cals) {
+            List<Long> cals = firstTaskService.getCalenderFirstForType(typeFlag);
+            for (Long calId : cals) {
                 try {
                     FirstTask task = new FirstTask();
                     task.setTask_time(td);
-                    task.setFirst_article_calendar_id(cal.getId());
+                    task.setFirst_article_calendar_id(calId);
                     firstTaskService.insertFirstTask(task);
                 } catch (Throwable e) {
                     e.getStackTrace();

application-task/src/main/java/com/factory/model/FirstTaskMapper.java → application-task/src/main/java/com/factory/mapper/FirstTaskMapper.java

@@ -1,4 +1,4 @@
-package com.factory.model;
+package com.factory.mapper;
 
 
 import com.factory.base.entity.task.ApprovalUserRes;
@@ -17,10 +17,10 @@ public interface FirstTaskMapper {
     /**
      * 获取对应的规则
      *
-     * @param param
+     * @param typeFlag
      * @return
      */
-    public List<FirstCalendar> getCalenderFirstForType(Map<String, Object> param);
+    List<Long> getCalenderFirstForType(Integer typeFlag);
 
 
     /**
@@ -29,7 +29,7 @@ public interface FirstTaskMapper {
      * @param task
      * @return
      */
-    public int insertFirstTask(FirstTask task);
+    int insertFirstTask(FirstTask task);
 
     /**
      * 需要提醒的工作

application-task/src/main/java/com/factory/model/OnsiteTaskMapper.java → application-task/src/main/java/com/factory/mapper/OnsiteTaskMapper.java

@@ -1,4 +1,4 @@
-package com.factory.model;
+package com.factory.mapper;
 
 
 import com.factory.base.entity.task.ApprovalUserRes;

application-task/src/main/java/com/factory/model/UserMapper.java → application-task/src/main/java/com/factory/mapper/UserMapper.java

@@ -1,4 +1,4 @@
-package com.factory.model;
+package com.factory.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 

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

@@ -12,10 +12,10 @@ public interface FirstTaskService {
     /**
      * 获取对应的规则
      *
-     * @param paarm
+     * @param typeFlag
      * @return
      */
-    public List<FirstCalendar> getCalenderFirstForType(Map<String, Object> param);
+    List<Long> getCalenderFirstForType(Integer typeFlag);
 
     /**
      * 添加当天任务
@@ -23,7 +23,7 @@ public interface FirstTaskService {
      * @param task
      * @return
      */
-    public int insertFirstTask(FirstTask task);
+    int insertFirstTask(FirstTask task);
 
     /**
      * 需要提醒的工作
@@ -31,7 +31,7 @@ public interface FirstTaskService {
      * @param param
      * @return
      */
-    public List<FirstCalendar> getRemindWork(Map<String, Object> param);
+    List<FirstCalendar> getRemindWork(Map<String, Object> param);
 
 
     /**
@@ -40,7 +40,7 @@ public interface FirstTaskService {
      * @param param
      * @return
      */
-    public int updateFirstRemindFlag(Map<String, Object> param);
+    int updateFirstRemindFlag(Map<String, Object> param);
 
 
     /**
@@ -49,7 +49,7 @@ public interface FirstTaskService {
      * @param map
      * @return
      */
-    public int addRemindNowork(Map map);
+    int addRemindNowork(Map map);
 
     /**
      * 获取需要提醒人
@@ -57,7 +57,7 @@ public interface FirstTaskService {
      * @param map
      * @return
      */
-    public Long getRemindNoworkToManager(Map map);
+    Long getRemindNoworkToManager(Map map);
 
     /**
      * 获取最大审批级别
@@ -65,7 +65,7 @@ public interface FirstTaskService {
      * @param map
      * @return
      */
-    public int getMaxApproveLevel(Map map);
+    int getMaxApproveLevel(Map map);
 
     /**
      * 或许超时没处理记录
@@ -73,7 +73,7 @@ public interface FirstTaskService {
      * @param map
      * @return
      */
-    public List<ApproveEntry> getApproveTaskNoDeal(Map map);
+    List<ApproveEntry> getApproveTaskNoDeal(Map map);
 
     /**
      * 添加新任务处理
@@ -81,5 +81,5 @@ public interface FirstTaskService {
      * @param vo
      * @return
      */
-    public int addTaskForNext(ApproveEntry vo);
+    int addTaskForNext(ApproveEntry vo);
 }

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

@@ -1,7 +1,7 @@
 package com.factory.service.impl;
 
 import com.factory.base.entity.task.*;
-import com.factory.model.FirstTaskMapper;
+import com.factory.mapper.FirstTaskMapper;
 import com.factory.service.FirstTaskService;
 import com.factory.service.MsgService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,12 +25,12 @@ public class FirstTaskServiceImp implements FirstTaskService {
     /**
      * 获取对应的规则
      *
-     * @param param
+     * @param typeFlag
      * @return
      */
     @Override
-    public List<FirstCalendar> getCalenderFirstForType(Map<String, Object> param) {
-        return mapper.getCalenderFirstForType(param);
+    public List<Long> getCalenderFirstForType(Integer typeFlag) {
+        return mapper.getCalenderFirstForType(typeFlag);
     }
 
     /**
@@ -39,6 +39,7 @@ public class FirstTaskServiceImp implements FirstTaskService {
      * @param task
      * @return
      */
+    @Override
     public int insertFirstTask(FirstTask task) {
         return mapper.insertFirstTask(task);
     }
@@ -114,6 +115,7 @@ public class FirstTaskServiceImp implements FirstTaskService {
         return mapper.getApproveTaskNoDeal(map);
     }
 
+    @Override
     @Transactional(rollbackFor = Throwable.class)
     public int addTaskForNext(ApproveEntry vo) {
         HashMap map = new HashMap();

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

@@ -6,7 +6,7 @@ import com.factory.base.entity.task.SendMsgReq;
 import com.factory.base.entity.task.TemplateEntry;
 import com.factory.base.entity.task.ValEntry;
 import com.factory.common.HttpCilentUntil;
-import com.factory.model.UserMapper;
+import com.factory.mapper.UserMapper;
 import com.factory.service.MsgService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

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

@@ -1,7 +1,7 @@
 package com.factory.service.impl;
 
 import com.factory.base.entity.task.*;
-import com.factory.model.OnsiteTaskMapper;
+import com.factory.mapper.OnsiteTaskMapper;
 import com.factory.service.MsgService;
 import com.factory.service.OnsiteTaskService;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.jihengbel.intelligent.applicationtask.model.FirstTaskMapper">
+<mapper namespace="com.factory.mapper.FirstTaskMapper">
 
 
     <resultMap id="calendarFirst" type="com.factory.base.entity.task.FirstCalendar">
@@ -65,20 +65,17 @@
     </select>
 
 
-    <select id="getCalenderFirstForType" resultMap="calendarFirst">
-        SELECT b.*
+    <select id="getCalenderFirstForType" parameterType="java.lang.Integer" resultType="java.lang.Long">
+        SELECT b.benteler_plan_id
         FROM benteler_plan a,
-             first_article_calendar b,
-             onsite_approval_plan oap
+             first_article_calendar b
         WHERE a.id = b.benteler_plan_id
           and a.pause_flag = 0
           and a.deleted = 0
+          and a.status = 4
           and a.effective_date &lt;= now()
-          and b.type_flag = ${type_flag}
-          and a.id = oap.benteler_plan_id
+          and b.type_flag = #{type_flag}
           and a.plan_type = 1
-          and oap.approval_level = 2
-          and oap.status = 1
     </select>
 
     <insert id="insertFirstTask" parameterType="com.factory.base.entity.task.FirstTask">

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.jihengbel.intelligent.applicationtask.model.OnsiteTaskMapper">
+<mapper namespace="com.factory.mapper.OnsiteTaskMapper">
 
 
     <resultMap id="calendarOnsite" type="com.factory.base.entity.task.OnsiteCalendar">

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.jihengbel.intelligent.applicationtask.model.UserMapper">
+<mapper namespace="com.factory.mapper.UserMapper">
 
     <select id="getOpenIdByUserId" resultType="String">
         SELECT openid