Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-QMS-API

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

@@ -41,7 +41,7 @@ public class QueueDealWithAsync {
         //查询所有单拼排队网格已经确认进厂的记录
         List<Map<String, Object>> listListMap = queuingRulesMapper.getAllSureTimeList();
         for (Map<String, Object> map : listListMap) {
-            if((nowTime - ((Date) map.get("entrySureTime")).getTime()) > 3600000){
+            if((nowTime - ((Date) map.get("entrySureTime")).getTime()) > 10800000){
                 //如果超过勾选时间30分钟 自动回滚到队列最后--修改为1个小时
                 BigDecimal listId = DataChange.dataToBigDecimal(map.get("listId"));
                 Integer maxListNodeOrder = qmsQueueListMapper.getMaxListNodeOrder(map);
@@ -67,7 +67,7 @@ public class QueueDealWithAsync {
         //查询所有多拼排队网格已经确认进厂的记录
         List<Map<String, Object>> allSureTimeSpellingList = queuingRulesMapper.getAllSureTimeSpellingList();
         for (Map<String, Object> map : allSureTimeSpellingList) {
-            if ((nowTime - ((Date) map.get("entrySureTime")).getTime()) > 3600000) {
+            if ((nowTime - ((Date) map.get("entrySureTime")).getTime()) > 10800000) {
                 BigDecimal spellingResultId = DataChange.dataToBigDecimal(map.get("spellingResultId"));
                 //如果超过勾选时间30分钟 自动回滚到队列最后
                 queuingRulesMapper.updateSpellingListToLast(spellingResultId);

src/main/resources/application-dev.yml

@@ -14,7 +14,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8008}
   Im:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
   LargeScreen: