Selaa lähdekoodia

大屏样式改好,提交代码

zyf 2 vuotta sitten
vanhempi
commit
feaa006ee4

+ 11 - 0
src/main/java/com/steerinfo/dil/controller/QmsQueueListController.java

@@ -136,6 +136,17 @@ public class QmsQueueListController extends BaseRESTfulController {
         return success();
     }
 
+
+    @PostMapping("/modifyLoadWarehouse")
+    public RESTfulResult modifyLoadWarehouse(@RequestBody(required=false) Map<String, Object> mapValue){
+        int i = qmsQueueListService.modifyLoadWarehouse(mapValue);
+        if (i==0){
+            return failed("更新失败");
+        }else {
+            return success("更新成功");
+        }
+    }
+
     @ApiOperation(value="测试门岗计算接口")
     @PostMapping("/calculateGatepost")
     public int calculateGatepost(){

+ 15 - 2
src/main/java/com/steerinfo/dil/service/impl/QmsQueueListServiceImpl.java

@@ -366,6 +366,17 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         queuingRulesService.pushMesToWebsocket(list);
         return count;
     }
+    /**
+     * @author:zyf
+     * @version:1.0
+     * @Date:2022-09-06
+     * @Description:在装货前修改装货点
+    */
+    public int modifyLoadWarehouse(Map<String, Object> mesMap){
+        int result=0;
+        result+=qmsQueueSpellingListMapper.updateOOMLoadWarehouse(mesMap);
+        return result;
+    }
 
     /**
      * 判断是否隔行打钩
@@ -434,8 +445,8 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
      * @Date:
      * @Description:做一个定时任务向两块大屏赋予值
      */
-    @Scheduled(cron = "*/60 * * * * ?")
-    @Scheduled(cron = "0 0/5 * * * ?")
+    //@Scheduled(cron = "*/60 * * * * ?")
+    //@Scheduled(cron = "0 0/5 * * * ?")
     public void sendDataToLargeCreen(){
         Map<String,Object> mapValue=new HashMap<>();
         List<Map<String, Object>> datalist =new ArrayList<>();
@@ -468,6 +479,8 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         i =+ queuingRulesMapper.updateEnFactory(DataChange.dataToBigDecimal(map.get("resultTotalId")));
         //移除可进厂确认时间
         i =+ queuingRulesMapper.updateQRESULTEnsureTime(listId);
+        //去除掉排队信息
+
         return i;
     }