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

src/main/java/com/steerinfo/dil/feign/LargeScreenFeign.java

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(value = "DIL-LARGESCREEN-DEV",url = "${openfeign.LargeScreen.url}")
+public interface LargeScreenFeign {
+    @PostMapping("api/v1/largeScreen/largescreenshow/showLargeScreenForSteelNew")
+    @ResponseBody
+    public RESTfulResult showLargeScreenForSteelNew(@RequestBody(required = false) List<Map<String,Object>> cars);
+
+    @PostMapping("api/v1/largeScreen/largescreenshow/showLargeScreenNew")
+    @ResponseBody
+    public RESTfulResult showLargeScreenNew(@RequestBody(required = false)List<Map<String,Object>> cars);
+
+}

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service.impl;
 
+import com.steerinfo.dil.feign.LargeScreenFeign;
 import com.steerinfo.dil.mapper.QmsQueueResultMapper;
 import com.steerinfo.dil.mapper.QmsQueueSpellingListMapper;
 import com.steerinfo.dil.mapper.QueuingRulesMapper;
@@ -49,6 +50,9 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     @Autowired
     private QmsQueueSpellingListMapper qmsQueueSpellingListMapper;
 
+    @Autowired
+    LargeScreenFeign largeScreenFeign;
+
 
     private final SimpleDateFormat gatepostTimeSdf = new SimpleDateFormat("HHmmss");
 
@@ -351,6 +355,15 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
             qmsQueueSpellingListMapper.updateOOMLoadWarehouse(mesMap);
         }
         queuingRulesService.pushMesToWebsocket(list);
+        //更新大屏(钢材科与东门)
+        try{
+            //展示钢材科大屏
+            largeScreenFeign.showLargeScreenForSteelNew(mapList);
+            //展示东门大屏
+            largeScreenFeign.showLargeScreenNew(mapList);
+        }catch (Exception e){
+            System.out.println("大屏调用异常");
+        }
         return count;
     }
 

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.IMFeign;
+import com.steerinfo.dil.feign.LargeScreenFeign;
 import com.steerinfo.dil.mapper.QmsQueueListMapper;
 import com.steerinfo.dil.mapper.QueueInterfaceMapper;
 import com.steerinfo.dil.mapper.QueuingRulesMapper;
@@ -12,7 +13,6 @@ import com.steerinfo.dil.service.IQmsQueueResultService;
 import com.steerinfo.dil.util.ElectronicFenceUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import java.util.*;
 import java.math.BigDecimal;
 
@@ -43,9 +43,13 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
     @Autowired
     QueueInterfaceServiceImpl queueInterfaceService;
 
+
     @Autowired
     private QmsQueueGridServiceImpl qmsQueueGridService;
 
+    /*@Autowired
+    LargeScreenShowController*/
+
     @Autowired
     private QueuingRulesMapper queuingRulesMapper;
 

src/main/resources/application-dev.yml

@@ -17,6 +17,8 @@ openfeign:
     url: ${TMSTRUCKFEIGN_URL:localhost:8008}
   Im:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
+  LargeScreen:
+    url: ${LARGESCREEN_URL:172.16.33.160:8064}
 
 server:
   port: 8017

src/main/resources/application-prod.yml

@@ -17,6 +17,8 @@ openfeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   Im:
     url: ${IMFEIGN_URL:172.16.33.166:8055}
+  LargeScreen:
+    url: ${LARGESCREEN_URL:172.16.33.160:8064}
 
 server:
   port: 8047