定时任务修改注释

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/mapper/LiftCaseMapper.java

@@ -178,7 +178,7 @@ public interface LiftCaseMapper extends BaseMapper<LiftCaseEntity> {
     @Select("SELECT * FROM lift_case WHERE ((data_table=1 AND statuz=3) OR (data_table=2 AND statuz=4)) AND DATE_SUB(create_time, INTERVAL -1 DAY)<NOW()")
     List<LiftCaseEntity> getAllToSueLiftCase();
 
-    @Select("SELECT * FROM lift_case WHERE (((data_table=1 AND statuz=1) OR (data_table=2 AND statuz=0)) AND (charger_id!=-2) AND accept_status=0) OR(((data_table=1 AND statuz=1) OR (data_table=2 AND statuz=0)) AND is_platform_specified=1 AND accept_status=0 ) AND create_time < DATE_FORMAT(ADDDATE(NOW(),INTERVAL -30 MINUTE),'%Y-%m-%d %H:%i:%s') ")
+//    @Select("SELECT * FROM lift_case WHERE (((data_table=1 AND statuz=1) OR (data_table=2 AND statuz=0)) AND (charger_id!=-2) AND accept_status=0) OR(((data_table=1 AND statuz=1) OR (data_table=2 AND statuz=0)) AND is_platform_specified=1 AND accept_status=0 ) AND create_time < DATE_FORMAT(ADDDATE(NOW(),INTERVAL -20 MINUTE),'%Y-%m-%d %H:%i:%s') ")
     List<LiftCaseEntity> getAllTimeOutCase();
     
     @Update("UPDATE lift_case SET charger_id=#{chargeId} WHERE id=#{id} ")

lift-ud-service/src/main/java/cn/com/ty/lift/ud/chat/mapper/LiftCaseMapper.xml

@@ -862,9 +862,29 @@
 
   <select id="selectDealingCount" resultType="java.lang.Integer">
   select count(0) from (
-  select * from lift_case where charger_id=#{userId} and data_table = 1 and FIND_IN_SET(statuz,'2,3,4')
+  select * from lift_case where charger_id=#{userId} and data_table = 1 and FIND_IN_SET(statuz,'1,2,3,4,5,7,8')
   union
-  select * from lift_case where charger_id=#{userId} and data_table = 2 and FIND_IN_SET(statuz,'1,3')
+  select * from lift_case where charger_id=#{userId} and data_table = 2 and FIND_IN_SET(statuz,'0,1,2,3,4,5,7,8')
   )temp
   </select>
+
+
+    <!--获取20分钟未接单的数据-->
+    <select id="getAllTimeOutCase" resultType="cn.com.ty.lift.ud.chat.mapper.entity.LiftCaseEntity">
+        select * from lift_case
+        where data_table = 1 AND statuz = 1 AND charger_id !=- 2 AND accept_status = 0
+        AND create_time &lt; DATE_FORMAT(ADDDATE(NOW( ), INTERVAL - 20 MINUTE), '%Y-%m-%d %H:%i:%s')
+        union
+        select * from lift_case
+        where data_table = 2 AND statuz = 0 AND charger_id !=- 2 AND accept_status = 0
+        AND create_time &lt; DATE_FORMAT(ADDDATE(NOW( ), INTERVAL - 20 MINUTE), '%Y-%m-%d %H:%i:%s')
+        union
+        select * from lift_case
+        where data_table = 1 AND statuz = 1 AND is_platform_specified = 1 AND accept_status = 0
+        AND create_time &lt; DATE_FORMAT(ADDDATE(NOW( ), INTERVAL - 20 MINUTE), '%Y-%m-%d %H:%i:%s')
+        union
+        select * from lift_case
+        where data_table = 2 AND statuz = 0 AND is_platform_specified = 1 AND accept_status = 0
+        AND create_time &lt; DATE_FORMAT(ADDDATE(NOW( ), INTERVAL - 20 MINUTE), '%Y-%m-%d %H:%i:%s')
+    </select>
 </mapper>

lift-ud-service/src/main/java/cn/com/ty/lift/ud/shopping/mapper/ShoppingOperateMapper.java

@@ -15,6 +15,6 @@ import cn.com.ty.lift.ud.shopping.mapper.entity.ShoppingOperateEntity;
  */
 public interface ShoppingOperateMapper extends BaseMapper<ShoppingOperateEntity> {
 
-	@Select("SELECT * FROM shopping_operate WHERE user_id=#{userId} AND `type`=#{type} AND data_id=#{dataId}")
+	@Select("SELECT * FROM shopping_operate WHERE user_id=#{userId} AND TYPE=#{type} AND data_id=#{dataId}")
 	ShoppingOperateEntity findByUserAndId(@Param("userId")Long userId,@Param("dataId") Long dataId,@Param("type")Integer type);
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/task/RefusedLiftCaseTask.java

@@ -30,9 +30,9 @@ public class RefusedLiftCaseTask {
      */
     @Scheduled(cron = "0 */5 * * * ?")
     public void refusedLiftCaseTask() {
-       logger.info("开始调用确认诊单方法");
+       logger.info("20分钟之内不接单，自动拒绝！----------------开始");
        liftCaseService.refusedLiftCaseTask();
-       logger.info("调用确认诊单方法完成");
+       logger.info("20分钟之内不接单，自动拒绝！----------------结束");
     }
     
     /**
@@ -41,8 +41,8 @@ public class RefusedLiftCaseTask {
      */
     @Scheduled(cron = "0 */3 * * * ?")
     public void updateColorGrade() {
-       logger.info("开始调用确认诊单方法");
+       logger.info("诊单提示，3分钟加一个级别----------------开始");
        liftCaseService.updateColorGrade();
-       logger.info("调用确认诊单方法完成");
+       logger.info("诊单提示，3分钟加一个级别----------------开始");
     }
 }

lift-ud-service/src/main/java/cn/com/ty/lift/ud/task/SureLiftCaseTask.java

@@ -28,7 +28,7 @@ public class SureLiftCaseTask {
      * 每一个小时执行一次，定时确认
      * 线上必须用public ，本地用private也可以
      */
-    @Scheduled(cron = "0 0 * * * ?")
+    @Scheduled(cron = "0 0 */1 * * ?")
     public void sureLiftCaseTask() {
        logger.info("开始调用确认诊单方法");
        liftCaseService.sureLiftCaseTask();