提交代码

src/main/java/com/steerinfo/dil/mapper/QueuingRulesMapper.java

@@ -57,6 +57,9 @@ public interface QueuingRulesMapper {
     //更新多拼排序表
     int updateSpellingListToLast(@Param("spellingResultId") BigDecimal spellingResultId);
 
+    //更新多拼排队时间
+    int updateSpellingDate(Integer queueResultId);
+
     //过时移除排队实绩信息
     int updateQQRRemoveList(BigDecimal resultId);
 

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

@@ -443,8 +443,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
      * @Date:
      * @Description:做一个定时任务向两块大屏赋予值
      */
-    @Scheduled(cron = "*/60 * * * * ?")
-    //@Scheduled(cron = "0 0/5 * * * ?")
+    @Scheduled(cron = "0 */10 * * * ?")
     public void sendDataToLargeCreen(){
         Map<String,Object> mapValue=new HashMap<>();
         List<Map<String, Object>> datalist =new ArrayList<>();
@@ -481,6 +480,8 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         //移除可进厂确认时间
         i =+ queuingRulesMapper.updateQRESULTEnsureTime(listId);
         //去除掉排队信息
+        Integer resultTotalId = queuingRulesMapper.checkoutQQR(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        i =+ queuingRulesMapper.updateSpellingDate(resultTotalId);
 
         return i;
     }

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

@@ -53,9 +53,13 @@ public class QueuingRulesServiceImpl implements IQueuingRulesService {
      * 推送消息给websocket
      */
     public void pushMesToWebsocket(ArrayList<Object> list) {
-        HashMap<Object, Object> sendMap = new HashMap<>();
-        sendMap.put("messages", list);
-        imFeign.sendToUser(sendMap);
+        try {
+            HashMap<Object, Object> sendMap = new HashMap<>();
+            sendMap.put("messages", list);
+            imFeign.sendToUser(sendMap);
+        }catch (Exception e){
+            System.out.println("e"+e.getMessage());
+        }
     }
 
     /*

src/main/resources/application-dev.yml

@@ -14,11 +14,11 @@ 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:
     url: ${LARGESCREEN_URL:172.16.33.160:8064}
 
 server:
-  port: 8017
+  port: 8047

src/main/resources/application-prod.yml

@@ -20,5 +20,9 @@ openfeign:
   LargeScreen:
     url: ${LARGESCREEN_URL:172.16.33.160:8064}
 
+mvc:
+  async:
+    request-timeout: 8000
+
 server:
   port: 8047

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

@@ -188,6 +188,13 @@
         where QQSL.SPELLING_RESULT_ID = #{spellingResultId}
     </update>
 
+    <update id="updateSpellingDate">
+        update QMS_QUEUE_SPELLING_LIST QQSL
+        set QQSL.DELETED            = null,
+            QQSL.SPELLING_SURE_TIME = SYSDATE,
+            QQSL.ENTRY_SURE_TIME    = null
+        where QQSL.QUEUE_RESULT_ID = #{queueResultId}
+    </update>
     <update id="updateQQRRemoveList">
         update QMS_QUEUE_RESULT
         set

src/main/resources/log4j.properties

@@ -1,24 +1,24 @@
-## LOG4J配置
-log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
-## 控制台输出
+## LOG4J\u914D\u7F6E
+log4j.rootCategory=INFO, file, RUNNING,errorfile
+## \u63A7\u5236\u53F0\u8F93\u51FA
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
-## root日志输出到文件
+## root\u65E5\u5FD7\u8F93\u51FA\u5230\u6587\u4EF6
 log4j.appender.file=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.file.file=/logsdata/logs/springboot-log4j-root.log
 log4j.appender.file.DatePattern='.'yyyy-MM-dd
 log4j.appender.file.layout=org.apache.log4j.PatternLayout
 log4j.appender.file.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
-## 按不同package进行输出
-## com.steer包下的日志配置
+## \u6309\u4E0D\u540Cpackage\u8FDB\u884C\u8F93\u51FA
+## com.steer\u5305\u4E0B\u7684\u65E5\u5FD7\u914D\u7F6E
 log4j.category.market=DEBUG, steerfile
 log4j.category.com.hnshituo=DEBUG, steerfile
 #log4j.category.com.steer=${logging.level.com.steer}, steerfile
 log4j.category.com.steer=DEBUG, steerfile
-# com.steer下的日志输出
+# com.steer\u4E0B\u7684\u65E5\u5FD7\u8F93\u51FA
 log4j.appender.steerfile=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.steerfile.file=/logsdata/logs/springboot-log4j-steer.log
 log4j.appender.steerfile.DatePattern='.'yyyy-MM-dd
@@ -27,9 +27,9 @@ log4j.appender.steerfile.layout=org.apache.log4j.PatternLayout
 log4j.appender.steerfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
 
-## ERROR级别输出到特定的日志文件中
+## ERROR\u7EA7\u522B\u8F93\u51FA\u5230\u7279\u5B9A\u7684\u65E5\u5FD7\u6587\u4EF6\u4E2D
 log4j.logger.error=errorfile
-## 异常日志####
+## \u5F02\u5E38\u65E5\u5FD7####
 log4j.appender.errorfile=org.apache.log4j.DailyRollingFileAppender
 log4j.appender.errorfile.file=/logs/exception/exc.log
 log4j.appender.errorfile.DatePattern='.'yyyy-MM-dd
@@ -38,7 +38,7 @@ log4j.appender.errorfile.layout=org.apache.log4j.PatternLayout
 #log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} %5p %c{1}:%L - %m%n
 log4j.appender.errorfile.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
-### 运行日志 ###
+### \u8FD0\u884C\u65E5\u5FD7 ###
 log4j.appender.RUNNING = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.RUNNING.File =/logs/log/running.log
 log4j.appender.RUNNING.Append = true
@@ -47,9 +47,9 @@ log4j.appender.RUNNING.DatePattern='.'yyyy-MM-dd.
 log4j.appender.RUNNING.layout = org.apache.log4j.PatternLayout
 log4j.appender.RUNNING.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 
-### 指定类###
+### \u6307\u5B9A\u7C7B###
 log4j.logger.com.steer.rbac.sysdebuglog.service.DebugLogRecord = DEBUG,DEB
-## 调试日志 ###
+## \u8C03\u8BD5\u65E5\u5FD7 ###
 log4j.appender.DEB = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.DEB.File = /logs/debug/debug.log
 log4j.appender.DEB.Append = true
@@ -59,7 +59,7 @@ log4j.appender.DEB.layout = org.apache.log4j.PatternLayout
 log4j.appender.DEB.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 ####[%p] [%-d{yyyy-MM-dd HH:mm:ss}] %C.%M(%L) | %m%n
 
-#### 业务日志###
+#### \u4E1A\u52A1\u65E5\u5FD7###
 log4j.logger.com.steer.rbac.sysoperlog.service.BizLogRecord = INFO,BIZ
 log4j.appender.BIZ = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.BIZ.File = /logs/business/biz.log
@@ -70,7 +70,7 @@ log4j.appender.BIZ.layout = org.apache.log4j.PatternLayout
 log4j.appender.BIZ.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n
 #
 #
-#### 资源日志###
+#### \u8D44\u6E90\u65E5\u5FD7###
 #log4j.appender.ENV = org.apache.log4j.DailyRollingFileAppender
 #log4j.appender.ENV.File = ../logs/env/env.log
 #log4j.appender.ENV.Append = true