代码简化,链表监控

src/main/java/com/steerinfo/dil/config/AsyncConfiguration.java

@@ -0,0 +1,32 @@
+package com.steerinfo.dil.config;
+
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+
+//@Configuration
+//@EnableAsync  // 启用异步任务
+public class AsyncConfiguration {
+
+    // 声明一个线程池(并指定线程池的名字)
+//    @Bean("taskExecutor")
+    public Executor asyncExecutor() {
+        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+        //核心线程数5：线程池创建时候初始化的线程数
+        executor.setCorePoolSize(5);
+        //最大线程数5：线程池最大的线程数，只有在缓冲队列满了之后才会申请超过核心线程数的线程
+        executor.setMaxPoolSize(5);
+        //缓冲队列500：用来缓冲执行任务的队列
+        executor.setQueueCapacity(500);
+        //允许线程的空闲时间60秒：当超过了核心线程出之外的线程在空闲时间到达之后会被销毁
+        executor.setKeepAliveSeconds(60);
+        //线程池名的前缀：设置好了之后可以方便我们定位处理任务所在的线程池
+        executor.setThreadNamePrefix("DailyAsync-");
+        executor.initialize();
+        return executor;
+    }
+}

src/main/java/com/steerinfo/dil/config/ScheduledConfig.java

@@ -0,0 +1,17 @@
+package com.steerinfo.dil.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.TaskScheduler;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+@Configuration
+public class ScheduledConfig {
+    //定时器多线程开启
+    @Bean
+    public TaskScheduler taskScheduler() {
+        ThreadPoolTaskScheduler taskScheduler = new ThreadPoolTaskScheduler();
+        taskScheduler.setPoolSize(2); //当前服务中存在几个定时器就设置几个 避免造成资源浪费
+        return taskScheduler;
+    }
+}

src/main/java/com/steerinfo/dil/controller/QmsQueueListController.java

@@ -52,15 +52,6 @@ public class QmsQueueListController extends BaseRESTfulController {
         return success(i);
     }
 
-    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗或月台、转移原因")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "实绩Id、门岗或月台、转移原因", required = false, dataType = "Map"),
-    })
-    @PostMapping("/changeQueue")
-    public RESTfulResult changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
-        int i = qmsQueueListService.changeQueue(mapValue);
-        return success(i);
-    }
 
     @ApiOperation(value="排队取消-->修改排队链表deleted为1")
     @ApiImplicitParams({
@@ -118,6 +109,45 @@ public class QmsQueueListController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value="单拼链表查看详情")
+    @PostMapping("/getListMonitorMes")
+    public RESTfulResult getListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
+        return success(qmsQueueListService.getListMonitorMes(mapValue));
+    }
+
+    @ApiOperation(value="多拼链表查看详情")
+    @PostMapping("/getSpellingListMonitorMes")
+    public RESTfulResult getSpellingListMonitorMes(@RequestBody(required=false) Map<String,Object> mapValue){
+        return success(qmsQueueListService.getSpellingListMonitorMes(mapValue));
+    }
+
+    @ApiOperation(value="钢材科允许进厂")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
+    })
+    @PostMapping("/allowEnFactory")
+    public RESTfulResult allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue){
+        return success(qmsQueueListService.allowEnFactory(mapValue));
+    }
+
+    @ApiOperation(value="测试门岗计算接口")
+    @PostMapping("/calculateGatepost")
+    public int calculateGatepost(){
+        return qmsQueueListService.calculateGatepost().intValue();
+    }
+
+
+//    @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗或月台、转移原因")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "实绩Id、门岗或月台、转移原因", required = false, dataType = "Map"),
+//    })
+//    @PostMapping("/changeQueue")
+//    public RESTfulResult changeQueue(@RequestBody(required=false) Map<String, Object> mapValue){
+//        int i = qmsQueueListService.changeQueue(mapValue);
+//        return success(i);
+//    }
+
+
 //    @ApiOperation(value="仓库排队结束-->修改deleted = 1：运输订单号 或者 网格排队实绩 ID 取一个就行")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(name = "mapValue", value = "运输订单号或者网格排队实绩ID取一个就行", required = false, dataType = "Map"),
@@ -187,17 +217,5 @@ public class QmsQueueListController extends BaseRESTfulController {
 //        return success(qmsQueueListService.getListQueueMes(mapValue));
 //    }
 
-    @ApiOperation(value="钢材科允许进厂")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
-    })
-    @PostMapping("/allowEnFactory")
-    public RESTfulResult allowEnFactory(@RequestBody(required=false) Map<String, Object> mapValue){
-        return success(qmsQueueListService.allowEnFactory(mapValue));
-    }
 
-    @PostMapping("/calculateGatepost")
-    public int calculateGatepost(){
-        return qmsQueueListService.calculateGatepost().intValue();
-    }
 }

src/main/java/com/steerinfo/dil/controller/QmsQueueResultController.java

@@ -103,6 +103,96 @@ public class QmsQueueResultController extends BaseRESTfulController {
         return success(allQueueApply);
     }
 
+    @ApiOperation(value="查排队开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(128)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "gridId", value = "仓储网格(筛选)", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "type", value = "类型3：采购、1|2：销售", required = false, dataType = "Integer"),
+
+    })
+    @PostMapping("/getQueueListByQueueUp")
+    public RESTfulResult getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer locationId,
+                                               String capacityNumber,
+                                               Integer isSpelling
+    ){
+        if(locationId != null)
+            mapValue.put("locationId", locationId);
+        if(capacityNumber != null && !"".equals(capacityNumber))
+            mapValue.put("capacityNumber", capacityNumber);
+        PageHelper.startPage(pageNum,pageSize);
+        if(isSpelling == 1){
+            //多拼
+            return success(qmsQueueResultService.getQueueListByQueueUpSpelling(mapValue));
+        }else {
+            //单拼
+            return success(qmsQueueResultService.getQueueListByQueueUp(mapValue));
+        }
+    }
+
+    @ApiOperation(value="查询排队结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(133)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getQueueEndResult")
+    public RESTfulResult getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ){
+        if(con != null && !"".equals(con) && !"null".equals(con)){
+            mapValue.put("index", con);
+        }
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> AllQueueEndInsert = qmsQueueResultService.getQueueEndResult(mapValue);
+        return success(AllQueueEndInsert);
+    }
+
+    @ApiOperation(value="查询排队取消")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(131)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getQueueCancel")
+    public RESTfulResult getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        String startTime,
+                                        String endTime,
+                                        String con
+    ){
+        if(con != null && !"".equals(con) && !"null".equals(con)){
+            mapValue.put("index", con);
+        }
+        DataChange.queryDataByDateTime(startTime,endTime,mapValue,sdf); //时间查询插件
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> AllQueueCancel = qmsQueueResultService.getQueueCancel(mapValue);
+        return success(AllQueueCancel);
+    }
+
+
+
+
+
+
+
+
+
+
 //    @ApiOperation(value="查询执行中订单")
 //    @ApiImplicitParams({
 //            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -159,37 +249,7 @@ public class QmsQueueResultController extends BaseRESTfulController {
 //
 //    }
 
-    @ApiOperation(value="查排队开始")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(128)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "gridId", value = "仓储网格(筛选)", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "type", value = "类型3：采购、1|2：销售", required = false, dataType = "Integer"),
 
-    })
-    @PostMapping("/getQueueListByQueueUp")
-    public RESTfulResult getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       Integer apiId,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer locationId,
-                                       String capacityNumber,
-                                       Integer isSpelling
-    ){
-        if(locationId != null)
-            mapValue.put("locationId", locationId);
-        if(capacityNumber != null && !"".equals(capacityNumber))
-            mapValue.put("capacityNumber", capacityNumber);
-        PageHelper.startPage(pageNum,pageSize);
-        if(isSpelling == 1){
-            //多拼
-            return success(qmsQueueResultService.getQueueListByQueueUpSpelling(mapValue));
-        }else {
-            //单拼
-            return success(qmsQueueResultService.getQueueListByQueueUp(mapValue));
-        }
-    }
 
 //    @ApiOperation(value="查询进厂排队详情")
 //    @ApiImplicitParams({
@@ -253,51 +313,26 @@ public class QmsQueueResultController extends BaseRESTfulController {
 //        return success(pageList);
 //    }
 
-    @ApiOperation(value="查询排队取消")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(131)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getQueueCancel")
-    public RESTfulResult getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               String startTime,
-                                               String endTime,
-                                               String con
-    ){
-        if(con != null && !"".equals(con) && !"null".equals(con)){
-            mapValue.put("index", con);
-        }
-        DataChange.queryDataByDateTime(startTime,endTime,mapValue,sdf); //时间查询插件
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> AllQueueCancel = qmsQueueResultService.getQueueCancel(mapValue);
-        return success(AllQueueCancel);
-    }
 
-    @ApiOperation(value="通过Id查询排队取消实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "resultId", value = "排队取消实绩", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getQueueCancelByResultId/{resultId}")
-    public RESTfulResult getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
-        List<Map<String, Object>> mes = qmsQueueResultService.getQueueCancelByResultId(resultId);
-        return success(mes);
-    }
+//    @ApiOperation(value="通过Id查询排队取消实绩")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "resultId", value = "排队取消实绩", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getQueueCancelByResultId/{resultId}")
+//    public RESTfulResult getQueueCancelByResultId(@PathVariable("resultId") Integer resultId){
+//        List<Map<String, Object>> mes = qmsQueueResultService.getQueueCancelByResultId(resultId);
+//        return success(mes);
+//    }
 
-    @ApiOperation(value="修改排队取消实绩：时间、原因")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "qmsQueueResult", value = "排队取消实体类", required = false, dataType = "QmsQueueResult"),
-    })
-    @PostMapping("/updateQueueCancel")
-    public RESTfulResult updateQueueCancel(@RequestBody QmsQueueResult qmsQueueResult){
-        int i = qmsQueueResultService.updateQueueCancel(qmsQueueResult);
-        return success(i);
-    }
+//    @ApiOperation(value="修改排队取消实绩：时间、原因")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "qmsQueueResult", value = "排队取消实体类", required = false, dataType = "QmsQueueResult"),
+//    })
+//    @PostMapping("/updateQueueCancel")
+//    public RESTfulResult updateQueueCancel(@RequestBody QmsQueueResult qmsQueueResult){
+//        int i = qmsQueueResultService.updateQueueCancel(qmsQueueResult);
+//        return success(i);
+//    }
 
 //    @ApiOperation(value="查询排队插队")
 //    @ApiImplicitParams({
@@ -326,56 +361,34 @@ public class QmsQueueResultController extends BaseRESTfulController {
 //
 //    }
 
-    @ApiOperation(value="查询排队结束")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(133)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getQueueEndResult")
-    public RESTfulResult getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              String con
-    ){
-        if(con != null && !"".equals(con) && !"null".equals(con)){
-            mapValue.put("index", con);
-        }
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> AllQueueEndInsert = qmsQueueResultService.getQueueEndResult(mapValue);
-        return success(AllQueueEndInsert);
-    }
-
-    @ApiOperation(value="汽车监控(仓库)")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(135)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/capacityMonitor")
-    public RESTfulResult capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           Integer gridType,
-                                           String con
-    ){
-        mapValue.put("gridType", gridType);
-        if(con != null && !"".equals(con) && !"null".equals(con)){
-            mapValue.put("index", con);
-        }
-        //分页数据
-        PageHelper.startPage(pageNum,pageSize);
-        List<Map<String, Object>> AllCapacityMonitor = qmsQueueResultService.capacityMonitor(mapValue);
-        List<Map<String, Object>> capacityMonitor = new ArrayList<>(AllCapacityMonitor);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllCapacityMonitor,capacityMonitor);
-        return success(pageList);
 
-    }
+//    @ApiOperation(value="汽车监控(仓库)")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(135)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/capacityMonitor")
+//    public RESTfulResult capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                           Integer apiId,
+//                                           Integer pageNum,
+//                                           Integer pageSize,
+//                                           Integer gridType,
+//                                           String con
+//    ){
+//        mapValue.put("gridType", gridType);
+//        if(con != null && !"".equals(con) && !"null".equals(con)){
+//            mapValue.put("index", con);
+//        }
+//        //分页数据
+//        PageHelper.startPage(pageNum,pageSize);
+//        List<Map<String, Object>> AllCapacityMonitor = qmsQueueResultService.capacityMonitor(mapValue);
+//        List<Map<String, Object>> capacityMonitor = new ArrayList<>(AllCapacityMonitor);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllCapacityMonitor,capacityMonitor);
+//        return success(pageList);
+//
+//    }
 
 
 //    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
@@ -392,12 +405,12 @@ public class QmsQueueResultController extends BaseRESTfulController {
 //        return success(orderReceiveMap);
 //    }
 
-    @ApiOperation(value="通过车牌号取消排队")
-    @PostMapping("/cancelQueue")
-    public RESTfulResult cancelQueue(@RequestBody Map<String,Object> mapValue){
-        int code = qmsQueueResultService.cancelQueue(mapValue);
-        return success(code);
-    }
+//    @ApiOperation(value="通过车牌号取消排队")
+//    @PostMapping("/cancelQueue")
+//    public RESTfulResult cancelQueue(@RequestBody Map<String,Object> mapValue){
+//        int code = qmsQueueResultService.cancelQueue(mapValue);
+//        return success(code);
+//    }
 
     //========================================仓库=====================================================
 //    @ApiOperation(value="新增仓库排队")

src/main/java/com/steerinfo/dil/service/IQmsQueueListService.java

@@ -25,9 +25,6 @@ public interface IQmsQueueListService{
     //添加汽车排队链表
     int addQueueList(BigDecimal resultId);
 
-    //进厂排队转移(仓库排队转移) 新增一条链表 修改实绩链表Id
-    int changeQueue(Map<String, Object> map);
-
     //排队取消 通过运输订单号进行查询取消 或 实绩Id  修改
     int queueCancel(Map<String, Object> map);
 
@@ -40,6 +37,15 @@ public interface IQmsQueueListService{
     //链表监控
     List<Map<String, Object>> listMonitor(Map<String, Object> map);
 
+
+
+
+
+
+
+    //进厂排队转移(仓库排队转移) 新增一条链表 修改实绩链表Id
+//    int changeQueue(Map<String, Object> map);
+
     //发送数据给门禁系统
 //    int sendMessageToGatepost(String orderNumber);
 

src/main/java/com/steerinfo/dil/service/IQmsQueueResultService.java

@@ -24,44 +24,48 @@ public interface IQmsQueueResultService{
     //车辆进入电子围栏自动触发系统新增排队实绩
     int addQueueResult(String vno, String isPDA);
 
+    //查询排队申请
+    List<Map<String, Object>> getQueueApply(Map<String, Object> map);
+
+    //查询排队开始、详情数据  正在排队的数据
+    List<Map<String, Object>> getQueueListByQueueUp(Map<String, Object> map);
+
+    //查询排队取消
+    List<Map<String, Object>> getQueueCancel(Map<String, Object> map);
+
+    //查询排队结束
+    List<Map<String, Object>> getQueueEndResult(Map<String, Object> map);
+
+
+
+
+
+    //通过实绩Id查询排队取消实绩
+//    List<Map<String, Object>> getQueueCancelByResultId(Integer resultId);
+
+    //修改排队取消原因 和时间
+//    int updateQueueCancel(QmsQueueResult qmsQueueResult);
+
     //新增仓库排队
 //    int addQueueResultByCk(Map<String, Object> map);
 
     //查询排队转移详情
 //    List<Map<String, Object>> getChangeQueueMes(Map<String, Object> map);
 
-    //查询排队申请
-    List<Map<String, Object>> getQueueApply(Map<String, Object> map);
-
     //人工添加排队申请查询所有执行中订单 订单状态 ：1
 //    List<Map<String, Object>> getAllExecutionOrder(Map<String, Object> map);
 
     //指令接收 通过接收时间判断是否已接收  查询判断条件：是否结束进厂
 //    List<Map<String, Object>> orderReceive(Map<String, Object> map);
 
-    //查询排队开始、详情数据  正在排队的数据
-    List<Map<String, Object>> getQueueListByQueueUp(Map<String, Object> map);
-
     //查询排队详情
 //    List<Map<String, Object>> getQueueMes(Map<String, Object> map);
 
-    //查询排队取消
-    List<Map<String, Object>> getQueueCancel(Map<String, Object> map);
-
-    //通过实绩Id查询排队取消实绩
-    List<Map<String, Object>> getQueueCancelByResultId(Integer resultId);
-
-    //修改排队取消原因 和时间
-    int updateQueueCancel(QmsQueueResult qmsQueueResult);
-
     //查询插队详情
 //    List<Map<String, Object>> getQueueInsert(Map<String, Object> map);
 
-    //查询排队结束
-    List<Map<String, Object>> getQueueEndResult(Map<String, Object> map);
-
     //汽车监控
-    List<Map<String, Object>> capacityMonitor(Map<String, Object> map);
+//    List<Map<String, Object>> capacityMonitor(Map<String, Object> map);
 
     //=============================================仓库排队=======================================================
     //查询仓库排队申请
@@ -88,7 +92,7 @@ public interface IQmsQueueResultService{
     // 查询未接收时的接收
 //    List<Map<String, Object>> getOrderReceive2(String capacityNumber);
 
-    int cancelQueue(Map<String,Object> mapValue);
+//    int cancelQueue(Map<String,Object> mapValue);
 
     // 通过车牌号得到网格id
 //    BigDecimal getGridId(String capacityNumber);

src/main/java/com/steerinfo/dil/service/IQueuingRulesService.java

@@ -12,10 +12,10 @@ import java.util.Map;
 public interface IQueuingRulesService {
 
     //通过门岗ID 和 网格类型 匹配 网格主键
-    BigDecimal getGridIdByGatepostIdAndGridType(Map<String, Object> map);
+//    BigDecimal getGridIdByGatepostIdAndGridType(Map<String, Object> map);
 
     //查询订单跟订单物资中间表 查询是否有多个物资Id
-    List<Integer> getAllMaterialId(Map<String, Object> map);
+//    List<Integer> getAllMaterialId(Map<String, Object> map);
 
     //通过物资Id查询仓库是否有货 或者 是否有多个仓库有货
 //    List<Integer> getWarehouseIdByMaterialId(Integer materialId);

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

@@ -51,6 +51,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
 
 
     private final SimpleDateFormat gatepostTimeSdf = new SimpleDateFormat("HHmmss");
+
     /**
      * 根据时间计算钢材进厂门岗（钢材只有东门、桥西门能进厂）
      * @return
@@ -59,27 +60,13 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         //查询东门，桥西门的进厂时间规则
         try{
             List<Map<String, Object>> gatepostRules = qmsQueueListMapper.getGatepostRules();
-            BigDecimal nowTime = DataChange.dataToBigDecimal(gatepostTimeSdf.format(new Date()));//获取当前时间
+            String nowTime = gatepostTimeSdf.format(new Date());
             for (Map<String, Object> gatepostRule : gatepostRules) {
                 if(gatepostRule.get("startTime") != null && gatepostRule.get("endTime") != null){
-                    BigDecimal startTime = DataChange.dataToBigDecimal(gatepostRule.get("startTime"));
-                    BigDecimal endTime = DataChange.dataToBigDecimal(gatepostRule.get("endTime"));
-                    int i = startTime.compareTo(endTime);
-                    if(i == 0){
-                        return DataChange.dataToBigDecimal(gatepostRule.get("gatepostId"));
-                    }else{
-                        int j = nowTime.compareTo(startTime); // 1  当前时间大于开始时间
-                        int k = nowTime.compareTo(endTime); // -1   当前时间小于结束时间
-                        if(i > 0 ){ //开始时间比结束时间大 则是跨天
-                            if(j == 1 && k == -1){
-                                return  DataChange.dataToBigDecimal(gatepostRule.get("gatepostId"));
-                            }
-                        }else{ //没有跨天
-                            if(j == 1 && k == -1){
-                                return  DataChange.dataToBigDecimal(gatepostRule.get("gatepostId"));
-                            }
-                        }
-                    }
+                    boolean judge = judgeTime(String.valueOf(gatepostRule.get("startTime")),
+                                    String.valueOf(gatepostRule.get("endTime")), nowTime);
+                    if(judge)
+                        return  DataChange.dataToBigDecimal(gatepostRule.get("gatepostId"));
                 }
             }
         }catch (Exception e){
@@ -88,6 +75,22 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         return new BigDecimal(2);//默认桥西门
     }
 
+    /**
+     * 判断当前时间是否在时间区间范围内
+     * @param startTime
+     * @param endTime
+     * @return
+     */
+    public boolean judgeTime(String startTime, String endTime, String nowTime){
+        int begin = Integer.parseInt(startTime);
+        int end = Integer.parseInt(endTime);
+        int now = Integer.parseInt(nowTime);
+        if(begin < end){
+            return now < end && now >= begin;
+        }else { //跨天
+            return now < end || now >= begin;
+        }
+    }
 
     /**
      * 开始排队  添加 链表排序 司机点击确认
@@ -187,17 +190,6 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         qmsQueueResultMapper.updateByPrimaryKeySelective(qmsQueueResult);
     }
 
-    /**
-     * 排队转移
-     * 参数：实绩Id、门岗名称||门岗ID 或者 月台名称||月台ID、转移原因
-     * @param map
-     * @return
-     */
-    @Override
-    @Transactional
-    public int changeQueue(Map<String, Object> map) {
-        return 1;
-    }
 
     /**
      * 取消排队
@@ -314,7 +306,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         List<Map<String, Object>> mapList = (List<Map<String, Object>>) map.get("mapList"); //获取勾选列表
         String ssoId = String.valueOf(map.get("ssoId"));
         String jobName = null;
-        if("null".equals(ssoId)){
+        if(!"null".equals(ssoId)){
             //通过SSOID在人员表里查询相关人员账号 （唯一）
             jobName = queuingRulesMapper.getPersonnelNameBySSoId(ssoId);
         }
@@ -351,20 +343,6 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     }
 
 
-    /**
-     * 发送运输订单信息给门岗系统
-     * 包含运输订单号，车牌号，门岗名称；
-     * @return
-     */
-//    public int sendMessageToGatepost(String orderNumber){
-//        //通过运输订单号查询相关信息
-//        Map<String, Object> map = qmsQueueListMapper.getOrderMesByOrderNum(orderNumber);
-//        map.put("orderNumber", orderNumber);
-//        //访问门岗接口发送数据
-//        //************************************
-//        return 0;
-//    }
-
     /**
      * 链表监控
      * @param map
@@ -380,14 +358,28 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     }
 
     /**
-     * 修改状态为 1 移出链表队列
-     * @param listId
+     * 链表查看详情
+     * @param map
+     * @return
+     */
+    public List<Map<String, Object>> getListMonitorMes(Map<String, Object> map){
+        return qmsQueueResultMapper.getQueueListByQueueUp(map);
+    }
+
+    public List<Map<String, Object>> getSpellingListMonitorMes(Map<String, Object> map){
+        return qmsQueueResultMapper.getQueueListByQueueUpSpelling(map);
+    }
+
+    /**
+     * 排队转移
+     * 参数：实绩Id、门岗名称||门岗ID 或者 月台名称||月台ID、转移原因
+     * @param map
      * @return
      */
-//    public int updateQueueListToDie(BigDecimal listId){
-//        QmsQueueList qmsQueueList = new QmsQueueList();
-//        qmsQueueList.setId(listId);
-//        return qmsQueueListMapper.updateByPrimaryKeySelective(qmsQueueList);
+//    @Override
+//    @Transactional
+//    public int changeQueue(Map<String, Object> map) {
+//        return 1;
 //    }
 
     /**

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

@@ -184,6 +184,51 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
         return map;
     }
 
+    /**
+     * 查询排队申请
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getQueueApply(Map<String, Object> map) {
+        return qmsQueueResultMapper.getQueueApply(map);
+    }
+
+
+    /**
+     * 查询排队开始 数据
+     * 可用 gridId 网格ID
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getQueueListByQueueUp(Map<String, Object> map) {
+        return qmsQueueResultMapper.getQueueListByQueueUp(map);
+    }
+
+    public List<Map<String, Object>> getQueueListByQueueUpSpelling(Map<String, Object> map) {
+        return  qmsQueueResultMapper.getQueueListByQueueUpSpelling(map);
+    }
+
+    /**
+     * 查询排队取消数据
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getQueueCancel(Map<String, Object> map) {
+        return qmsQueueResultMapper.getQueueCancel(map);
+    }
+
+    /**
+     * 查询排队结束
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getQueueEndResult(Map<String, Object> map) {
+        return qmsQueueResultMapper.getQueueEndResult(map);
+    }
 
     /**
      * 新增仓库排队实绩
@@ -245,15 +290,6 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
 //        return qmsQueueResultMapper.getChangeQueueMes(map);
 //    }
 
-    /**
-     * 查询排队申请
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getQueueApply(Map<String, Object> map) {
-        return qmsQueueResultMapper.getQueueApply(map);
-    }
 
     /**
      * 查询执行中运单
@@ -292,20 +328,6 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
 //        return orderReceiveList;
 //    }
 
-    /**
-     * 查询排队开始 数据
-     * 可用 gridId 网格ID
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getQueueListByQueueUp(Map<String, Object> map) {
-        return qmsQueueResultMapper.getQueueListByQueueUp(map);
-    }
-
-    public List<Map<String, Object>> getQueueListByQueueUpSpelling(Map<String, Object> map) {
-        return  qmsQueueResultMapper.getQueueListByQueueUpSpelling(map);
-    }
 
     /**
      * 查询排队详情
@@ -317,37 +339,28 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
 //        return qmsQueueResultMapper.getQueueMes(map);
 //    }
 
-    /**
-     * 查询排队取消数据
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getQueueCancel(Map<String, Object> map) {
-        return qmsQueueResultMapper.getQueueCancel(map);
-    }
 
     /**
      * 通过实绩ID查询排队取消信息
      * @param resultId
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getQueueCancelByResultId(Integer resultId) {
-        return qmsQueueResultMapper.getQueueCancelByResultId(resultId);
-    }
+//    @Override
+//    public List<Map<String, Object>> getQueueCancelByResultId(Integer resultId) {
+//        return qmsQueueResultMapper.getQueueCancelByResultId(resultId);
+//    }
 
     /**
      * 修改排队取消实绩
      * @param qmsQueueResult
      * @return
      */
-    @Override
-    public int updateQueueCancel(QmsQueueResult qmsQueueResult) {
-        qmsQueueResult.setUpdateTime(new Date());
-        qmsQueueResult.setUpdateUsername("admin");
-        return qmsQueueResultMapper.updateByPrimaryKeySelective(qmsQueueResult);
-    }
+//    @Override
+//    public int updateQueueCancel(QmsQueueResult qmsQueueResult) {
+//        qmsQueueResult.setUpdateTime(new Date());
+//        qmsQueueResult.setUpdateUsername("admin");
+//        return qmsQueueResultMapper.updateByPrimaryKeySelective(qmsQueueResult);
+//    }
 
     /**
      * 查询排队插队
@@ -358,46 +371,38 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
 //        return qmsQueueResultMapper.getQueueInsert(map);
 //    }
 
-    /**
-     * 查询排队结束
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getQueueEndResult(Map<String, Object> map) {
-        return qmsQueueResultMapper.getQueueEndResult(map);
-    }
+
 
     /**
      * 汽车监控
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> capacityMonitor(Map<String, Object> map) {
-        List<Map<String, Object>> list = qmsQueueResultMapper.capacityMonitor(map);
-        for (Map<String, Object> capacityMap : list) {
-            //如果结束时间为空 排队总时长为
-            if(capacityMap.get("resultEndTime") == null){
-                Date date1 = (Date) capacityMap.get("resultStartTime");
-                Date date2;
-                if(capacityMap.get("resultCancelTime") != null){ //如果取消排队了则以取消排队时间为结束时间
-                    date2 = (Date) capacityMap.get("resultCancelTime");
-                }else {
-                    date2 = new Date();
-                }
-                long differenceTime = (date2.getTime() - date1.getTime()) / 60000;
-                capacityMap.put("resultQueueAllTime", differenceTime + "min");
-            }else {
-                //否则排队时长为结束时长 - 申请时长
-                Date date1 = (Date)capacityMap.get("resultStartTime");
-                Date date2 = (Date)capacityMap.get("resultEndTime");
-                long differenceTime = (date2.getTime() - date1.getTime()) / 60000;
-                capacityMap.put("resultQueueAllTime",differenceTime + "min");
-            }
-        }
-        return list;
-    }
+//    @Override
+//    public List<Map<String, Object>> capacityMonitor(Map<String, Object> map) {
+//        List<Map<String, Object>> list = qmsQueueResultMapper.capacityMonitor(map);
+//        for (Map<String, Object> capacityMap : list) {
+//            //如果结束时间为空 排队总时长为
+//            if(capacityMap.get("resultEndTime") == null){
+//                Date date1 = (Date) capacityMap.get("resultStartTime");
+//                Date date2;
+//                if(capacityMap.get("resultCancelTime") != null){ //如果取消排队了则以取消排队时间为结束时间
+//                    date2 = (Date) capacityMap.get("resultCancelTime");
+//                }else {
+//                    date2 = new Date();
+//                }
+//                long differenceTime = (date2.getTime() - date1.getTime()) / 60000;
+//                capacityMap.put("resultQueueAllTime", differenceTime + "min");
+//            }else {
+//                //否则排队时长为结束时长 - 申请时长
+//                Date date1 = (Date)capacityMap.get("resultStartTime");
+//                Date date2 = (Date)capacityMap.get("resultEndTime");
+//                long differenceTime = (date2.getTime() - date1.getTime()) / 60000;
+//                capacityMap.put("resultQueueAllTime",differenceTime + "min");
+//            }
+//        }
+//        return list;
+//    }
 
     //=========================================仓库排队===========================================
 
@@ -477,20 +482,20 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
      * @param mapValue
      * @return
      */
-    @Override
-    public int cancelQueue(Map<String,Object> mapValue) {
-        String capacityNumber = (String) mapValue.get("capacityNumber");
-        String resultCancelReason = (String) mapValue.get("resultCancelReason");
-        BigDecimal resultId = qmsQueueResultMapper.getResultIdByCapacityId(capacityNumber);
-        QmsQueueResult qmsQueueResult = qmsQueueResultMapper.selectByPrimaryKey(resultId);
-        Map<String, Object> listIdMap = qmsQueueResultMapper.getListIdByResultId(resultId);
-        BigDecimal listId = (BigDecimal) listIdMap.get("listId");
-        QmsQueueList qmsQueueList = qmsQueueListMapper.selectByPrimaryKey(listId);
-        qmsQueueResult.setResultCancelTime(new Date());
-        qmsQueueResult.setResultCancelReason(resultCancelReason);
-        qmsQueueListMapper.updateByPrimaryKeySelective(qmsQueueList);
-        return qmsQueueResultMapper.updateByPrimaryKeySelective(qmsQueueResult);
-    }
+//    @Override
+//    public int cancelQueue(Map<String,Object> mapValue) {
+//        String capacityNumber = (String) mapValue.get("capacityNumber");
+//        String resultCancelReason = (String) mapValue.get("resultCancelReason");
+//        BigDecimal resultId = qmsQueueResultMapper.getResultIdByCapacityId(capacityNumber);
+//        QmsQueueResult qmsQueueResult = qmsQueueResultMapper.selectByPrimaryKey(resultId);
+//        Map<String, Object> listIdMap = qmsQueueResultMapper.getListIdByResultId(resultId);
+//        BigDecimal listId = (BigDecimal) listIdMap.get("listId");
+//        QmsQueueList qmsQueueList = qmsQueueListMapper.selectByPrimaryKey(listId);
+//        qmsQueueResult.setResultCancelTime(new Date());
+//        qmsQueueResult.setResultCancelReason(resultCancelReason);
+//        qmsQueueListMapper.updateByPrimaryKeySelective(qmsQueueList);
+//        return qmsQueueResultMapper.updateByPrimaryKeySelective(qmsQueueResult);
+//    }
 
 
     /**

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

@@ -38,6 +38,8 @@ public class QueuingRulesServiceImpl implements IQueuingRulesService {
 
     @Autowired
     private IMFeign imFeign;
+
+
     /**
      * 定时检查  钢材科已确认进厂之后  30分钟没有结束 自动回滚到队列末尾，移除可进厂时间
      */
@@ -155,34 +157,15 @@ public class QueuingRulesServiceImpl implements IQueuingRulesService {
 //        return null;
 //    }
 
-    /**
-     * 判断当前时间是否在时间区间范围内
-     * @param startTime
-     * @param endTime
-     * @return
-     */
-    public boolean judgeTime(String startTime, String endTime){
-        SimpleDateFormat sdf = new SimpleDateFormat("HHmmss");
-        String format = sdf.format(new Date());
-        int begin = Integer.parseInt(startTime);
-        int end = Integer.parseInt(endTime);
-        int now = Integer.parseInt(format);
-        if(begin < end){
-            return now < end && now >= begin;
-        }else {
-            return now < end || now >= begin;
-        }
-    }
-
     /**
      * 通过门岗ID 和 网格类型 匹配 网格主键
      * @param map
      * @return
      */
-    @Override
-    public BigDecimal getGridIdByGatepostIdAndGridType(Map<String, Object> map) {
-        return queuingRulesMapper.getGridIdByGatepostIdAndGridType(map);
-    }
+//    @Override
+//    public BigDecimal getGridIdByGatepostIdAndGridType(Map<String, Object> map) {
+//        return queuingRulesMapper.getGridIdByGatepostIdAndGridType(map);
+//    }
 
     /*=========================仓库排队规则=========================*/
     /**
@@ -190,10 +173,10 @@ public class QueuingRulesServiceImpl implements IQueuingRulesService {
      * @param map 运输订单号 orderNumber
      * @return
      */
-    @Override
-    public List<Integer> getAllMaterialId(Map<String, Object> map) {
-        return queuingRulesMapper.getAllMaterialId(map);
-    }
+//    @Override
+//    public List<Integer> getAllMaterialId(Map<String, Object> map) {
+//        return queuingRulesMapper.getAllMaterialId(map);
+//    }
 
     /**
      *通过物资Id查询仓库是否有货 或者 是否有多个仓库有货

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

@@ -957,7 +957,7 @@
             </if>
             <if test="locationId != null">
                 and QQSL.SPELILING_NUM  = #{locationId}
-                ORDER BY "listNodeOrder"
+                ORDER BY QQSL.ENTRY_SURE_TIME DESC,  "listNodeOrder"
             </if>
         </where>
         <if test="locationId == null">