修改

src/main/java/com/steerinfo/dil/service/impl/QueueDealWithAsync.java

@@ -48,11 +48,6 @@ public class QueueDealWithAsync {
                 queuingRulesMapper.updateListToLast(listId, maxListNodeOrder + 1);
                 //移除可进厂资格
                 queuingRulesMapper.updateEnFactory(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-                //if((nowTime - ((Date) map.get("insertTime")).getTime()) > 86400000){
-                //    //如果大于一天则直接删除队列信息
-                //    qmsQueueListMapper.deleteByPrimaryKey(listId);
-                //    queuingRulesMapper.updateQQRRemoveList(DataChange.dataToBigDecimal(map.get("resultId")));
-                //}
             }
         }
     }
@@ -73,11 +68,6 @@ public class QueueDealWithAsync {
                 queuingRulesMapper.updateSpellingListToLast(spellingResultId);
                 //移除可进厂资格
                 queuingRulesMapper.updateEnFactory(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-                //if((nowTime - ((Date) map.get("spellingSureTime")).getTime()) > 86400000){
-                //    //如果大于一天则直接删除队列信息
-                //    qmsQueueSpellingListMapper.deleteByPrimaryKey(spellingResultId);
-                //    queuingRulesMapper.updateQQRRemoveList(DataChange.dataToBigDecimal(map.get("resultId")));
-                //}
             }
         }
     }

src/main/java/com/steerinfo/dil/service/impl/QueuingRulesServiceImpl.java

@@ -42,12 +42,12 @@ public class QueuingRulesServiceImpl implements IQueuingRulesService {
     /**
      * 遍历排队所有未勾选确认进厂的排队数据，如果已经超过一天则踢出队列
      */
-    @Scheduled(fixedRate = 1000 * 60 * 30)
-    public void checkoutQueue(){
-        long nowTime = System.currentTimeMillis();
-        queueDealWithAsync.dealWithThree(nowTime);
-        queueDealWithAsync.dealWithFour(nowTime);
-    }
+    //@Scheduled(fixedRate = 1000 * 60 * 30)
+    //public void checkoutQueue(){
+    //    long nowTime = System.currentTimeMillis();
+    //    queueDealWithAsync.dealWithThree(nowTime);
+    //    queueDealWithAsync.dealWithFour(nowTime);
+    //}
 
     /**
      * 推送消息给websocket

src/main/resources/com/steerinfo/dil/mapper/QueuingRulesMapper.xml

@@ -200,7 +200,8 @@
         set
             LIST_ID           = null,
             RESULT_START_TIME = null,
-            RESULT_ACCEPT_TIME = null
+            RESULT_ACCEPT_TIME = null,
+            INSERT_UPDATE_REMARK = '钢材科撤销排队放行'
         where RESULT_ID = #{resultId}
     </update>
     <update id="updateQRESULTEnsureTime">