asd

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

@@ -1,13 +1,11 @@
 package com.steerinfo.dil.controller;
 
 
-import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.impl.QmsQueueListServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -40,16 +38,14 @@ public class QmsQueueListController extends BaseRESTfulController {
     @Autowired
     ColumnDataUtil columnDataUtil;
 
-    @Autowired
-    ESFeign esFeign;
 
     @ApiOperation(value="指令接收-->新增排队链表：需要运输订单号")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
     })
     @PostMapping("/addQueueList")
-    public RESTfulResult addQueueList(String orderId){
-        int i = qmsQueueListService.addQueueList(new BigDecimal(orderId));
+    public RESTfulResult addQueueList(String resultId){
+        int i = qmsQueueListService.addQueueList(new BigDecimal(resultId));
         if(i == 0){
             return failed("该车已有排队！");
         }
@@ -96,31 +92,31 @@ public class QmsQueueListController extends BaseRESTfulController {
         return success(i);
     }
 
-    @ApiOperation(value="链表监控")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(134)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/listMonitor")
-    public RESTfulResult listMonitor(@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>> allListMonitor = qmsQueueListService.listMonitor(mapValue);
-        List<Map<String, Object>> listMonitor = new ArrayList<>(allListMonitor);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allListMonitor,listMonitor);
-        return success(pageList);
-    }
+//    @ApiOperation(value="链表监控")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(134)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/listMonitor")
+//    public RESTfulResult listMonitor(@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>> allListMonitor = qmsQueueListService.listMonitor(mapValue);
+//        List<Map<String, Object>> listMonitor = new ArrayList<>(allListMonitor);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allListMonitor,listMonitor);
+//        return success(pageList);
+//    }
 
     @ApiOperation(value="仓库排队结束-->修改deleted = 1：运输订单号 或者 网格排队实绩 ID 取一个就行")
     @ApiImplicitParams({
@@ -133,63 +129,63 @@ public class QmsQueueListController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value="仓库链表监控")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(134)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "con", value = "索引", required = false, dataType = "String"),
-    })
-    @PostMapping("/warehouseListMonitor")
-    public RESTfulResult warehouseListMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                     Integer apiId,
-                                     Integer pageNum,
-                                     Integer pageSize,
-                                     String con
-    ){
-
-        if(con != null){
-            if(!"undefined".equals(con)){
-                //设置要查询的索引名称
-                String index="get_warehouse_list_monitor";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String, Object>> allListMonitor = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 0){
-            //将查询结果存入索引中
-            allListMonitor = qmsQueueListService.warehouseListMonitor(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_warehouse_list_monitor");
-            //添加id
-            map.put("indexId","warehouselistId");
-            allListMonitor.add(map);
-            //新建索引
-            esFeign.insertIndex(allListMonitor);
-            //删除
-            allListMonitor.remove(allListMonitor.size()-1);
-        }
-        if(allListMonitor == null)
-            allListMonitor = qmsQueueListService.warehouseListMonitor(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> listMonitor = qmsQueueListService.warehouseListMonitor(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allListMonitor,listMonitor);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="查询某一个门岗的排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
-    })
-    @PostMapping("/getListQueueMes")
-    public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue){
-        return success(qmsQueueListService.getListQueueMes(mapValue));
-    }
+//    @ApiOperation(value="仓库链表监控")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(134)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "con", value = "索引", required = false, dataType = "String"),
+//    })
+//    @PostMapping("/warehouseListMonitor")
+//    public RESTfulResult warehouseListMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                     Integer apiId,
+//                                     Integer pageNum,
+//                                     Integer pageSize,
+//                                     String con
+//    ){
+//
+//        if(con != null){
+//            if(!"undefined".equals(con)){
+//                //设置要查询的索引名称
+//                String index="get_warehouse_list_monitor";
+//                //获取查询结果
+//                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+//            }
+//        }
+//        List<Map<String, Object>> allListMonitor = null;
+//        //如果有条件查询则跳过初始化，和创建索引
+//        if(mapValue.size() == 0){
+//            //将查询结果存入索引中
+//            allListMonitor = qmsQueueListService.warehouseListMonitor(mapValue);
+//            Map<String, Object> map = new HashMap<>();
+//            //添加索引
+//            map.put("index","get_warehouse_list_monitor");
+//            //添加id
+//            map.put("indexId","warehouselistId");
+//            allListMonitor.add(map);
+//            //新建索引
+//            esFeign.insertIndex(allListMonitor);
+//            //删除
+//            allListMonitor.remove(allListMonitor.size()-1);
+//        }
+//        if(allListMonitor == null)
+//            allListMonitor = qmsQueueListService.warehouseListMonitor(mapValue);
+//        PageHelper.startPage(pageNum,pageSize);
+//        //分页数据
+//        List<Map<String, Object>> listMonitor = qmsQueueListService.warehouseListMonitor(mapValue);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allListMonitor,listMonitor);
+//        return success(pageList);
+//    }
+
+//    @ApiOperation(value="查询某一个门岗的排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "网格Id", required = false, dataType = "Map"),
+//    })
+//    @PostMapping("/getListQueueMes")
+//    public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue){
+//        return success(qmsQueueListService.getListQueueMes(mapValue));
+//    }
 
     @ApiOperation(value="钢材科允许进厂")
     @ApiImplicitParams({

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

@@ -1,23 +1,19 @@
 package com.steerinfo.dil.controller;
 
 
-import com.alibaba.fastjson.JSON;
-import com.steerinfo.dil.feign.ESFeign;
+import com.steerinfo.dil.mapper.QueueInterfaceMapper;
 import com.steerinfo.dil.model.QmsQueueResult;
-import com.steerinfo.dil.service.impl.QmsQueueGridServiceImpl;
 import com.steerinfo.dil.service.impl.QmsQueueResultServiceImpl;
 import com.steerinfo.dil.service.impl.QueueInterfaceServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.dil.service.IQmsQueueResultService;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.crypto.hash.Hash;
-import org.apache.xmlbeans.impl.xb.xsdschema.All;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -50,10 +46,8 @@ public class QmsQueueResultController extends BaseRESTfulController {
     @Autowired
     QueueInterfaceServiceImpl queueInterfaceService;
 
-    @Autowired
-    ESFeign esFeign;
 
-    private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+    private final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @ApiOperation(value="触发电子围栏-->新增排队实绩")
     @ApiImplicitParams({
@@ -62,32 +56,26 @@ public class QmsQueueResultController extends BaseRESTfulController {
 
     @PostMapping(value = "/addQueueResult")
     public RESTfulResult addQueueResult(String vno, String isPDA){
-        int i = qmsQueueResultService.addQueueResult(vno);
+        int i = qmsQueueResultService.addQueueResult(vno, isPDA);
         if(i==0) {
             return failed("", "新增失败");
         }else if(i==-1){
             return failed("","车号"+vno+"没有对应的订单");
         }else if(i == -2){
             return failed("请勿重复申请排队");
-        }
-        if(isPDA == null){
-            //如果是电子围栏调用,取消订阅
-            Map<String, Object> map = new HashMap<>();
-            map.put("capacityNumber", vno.split("_")[0] + "_2");
-            int j = queueInterfaceService.cancelSubsCapacity(map, 0);
-            if(j == -1){
-                System.out.println("取消订阅失败");
-            }else if(j == -2){
-                System.out.println("超过递归次数，取消订阅失败");
-            }
+        }else if(i == -3){
+            return failed("非钢材订单不能申请排队");
         }
         return success();
     }
 
     @ApiOperation(value="APP端司机查看排队信息")
-    @GetMapping("getQueueResultByOrderId")
-    public RESTfulResult getQueueResultByOrderId(String orderId){
-        return success(qmsQueueResultService.getQueueResultByOrderId(orderId));
+    @GetMapping("getQueueResultByTotalId")
+    public RESTfulResult getQueueResultByTotalId(String resultTotalId){
+        if("undefined".equals(resultTotalId)){
+            return failed();
+        }
+        return success(qmsQueueResultService.getQueueResultByTotalId(resultTotalId));
     }
 
     @ApiOperation(value="查询排队申请")
@@ -102,74 +90,76 @@ public class QmsQueueResultController extends BaseRESTfulController {
                                                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>> allQueueApply = qmsQueueResultService.getQueueApply(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId,null, allQueueApply);
-        return success(pageList);
+        return success(allQueueApply);
     }
 
-    @ApiOperation(value="查询执行中订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(156)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllExecutionOrder")
-    public RESTfulResult getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       Integer apiId,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer orderType,
-                                       Integer status,
-                                       String con
-    ){
-        mapValue.put("orderTypee", orderType);
-        mapValue.put("orderStatus", status);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> executionOrder = qmsQueueResultService.getAllExecutionOrder(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, executionOrder);
-        return success(pageList);
-
-    }
-
-
-    @ApiOperation(value="指令接收")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(130、190)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/orderReceive")
-    public RESTfulResult orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       Integer apiId,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer queueType,
-                                       String con
-    ){
-        if(con != null && !"".equals(con) && !"null".equals(con)){
-            mapValue.put("index", con);
-        }
-        mapValue.put("queueType", queueType);
-        //分页数据
-        PageHelper.startPage(pageNum,pageSize);
-        List<Map<String, Object>> AllOrderReceive = qmsQueueResultService.orderReceive(mapValue);
-        List<Map<String, Object>> executionOrder = new ArrayList<>(AllOrderReceive);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllOrderReceive,executionOrder);
-        return success(pageList);
-
-    }
-
-    @ApiOperation(value="查询单拼排队开始")
+//    @ApiOperation(value="查询执行中订单")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(156)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getAllExecutionOrder")
+//    public RESTfulResult getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                       Integer apiId,
+//                                       Integer pageNum,
+//                                       Integer pageSize,
+//                                       Integer orderType,
+//                                       Integer status,
+//                                       String con
+//    ){
+//        mapValue.put("orderTypee", orderType);
+//        mapValue.put("orderStatus", status);
+//        PageHelper.startPage(pageNum,pageSize);
+//        //分页数据
+//        List<Map<String, Object>> executionOrder = qmsQueueResultService.getAllExecutionOrder(mapValue);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null, executionOrder);
+//        return success(pageList);
+//
+//    }
+
+//
+//    @ApiOperation(value="指令接收")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(130、190)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/orderReceive")
+//    public RESTfulResult orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                       Integer apiId,
+//                                       Integer pageNum,
+//                                       Integer pageSize,
+//                                       Integer queueType,
+//                                       String con
+//    ){
+//        if(con != null && !"".equals(con) && !"null".equals(con)){
+//            mapValue.put("index", con);
+//        }
+//        mapValue.put("queueType", queueType);
+//        //分页数据
+//        PageHelper.startPage(pageNum,pageSize);
+//        List<Map<String, Object>> AllOrderReceive = qmsQueueResultService.orderReceive(mapValue);
+//        List<Map<String, Object>> executionOrder = new ArrayList<>(AllOrderReceive);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllOrderReceive,executionOrder);
+//        return success(pageList);
+//
+//    }
+
+    @ApiOperation(value="查排队开始")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(128)", value = "动态表头", required = false, dataType = "Integer"),
@@ -204,67 +194,67 @@ public class QmsQueueResultController extends BaseRESTfulController {
         }
     }
 
-    @ApiOperation(value="查询进厂排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(184)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllQueueMes")
-    public RESTfulResult getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer gatepostId,
-                                                 String con
-    ){
-        if(gatepostId != null){
-            mapValue.put("gatepostId", gatepostId);
-        }
-        if(con != null && !"".equals(con) && !"null".equals(con)){
-            mapValue.put("index", con);
-        }
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> AllQueueMes = qmsQueueResultService.getQueueMes(mapValue);
-        List<Map<String, Object>> queueMes = qmsQueueResultService.getQueueMes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllQueueMes,queueMes);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="通过运输订单号查询进厂排队详情")
-    @PostMapping("/getQueueMes")
-    public RESTfulResult getQueueMes(Map<String, Object> map){
-        List<Map<String, Object>> warehouseQueueMes = qmsQueueResultService.getQueueMes(map);
-        return success(warehouseQueueMes);
-    }
-
-    @ApiOperation(value="查询排队转移")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(124)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getChangeQueue")
-    public RESTfulResult getChangeQueue(@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>> AllChangeQueue = qmsQueueResultService.getChangeQueueMes(mapValue);
-        List<Map<String, Object>> changeQueueMes1 = new ArrayList<>(AllChangeQueue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllChangeQueue,changeQueueMes1);
-        return success(pageList);
-    }
+//    @ApiOperation(value="查询进厂排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(184)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getAllQueueMes")
+//    public RESTfulResult getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                 Integer apiId,
+//                                                 Integer pageNum,
+//                                                 Integer pageSize,
+//                                                 Integer gatepostId,
+//                                                 String con
+//    ){
+//        if(gatepostId != null){
+//            mapValue.put("gatepostId", gatepostId);
+//        }
+//        if(con != null && !"".equals(con) && !"null".equals(con)){
+//            mapValue.put("index", con);
+//        }
+//        PageHelper.startPage(pageNum,pageSize);
+//        //分页数据
+//        List<Map<String, Object>> AllQueueMes = qmsQueueResultService.getQueueMes(mapValue);
+//        List<Map<String, Object>> queueMes = qmsQueueResultService.getQueueMes(mapValue);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllQueueMes,queueMes);
+//        return success(pageList);
+//    }
+
+//    @ApiOperation(value="通过运输订单号查询进厂排队详情")
+//    @PostMapping("/getQueueMes")
+//    public RESTfulResult getQueueMes(Map<String, Object> map){
+//        List<Map<String, Object>> warehouseQueueMes = qmsQueueResultService.getQueueMes(map);
+//        return success(warehouseQueueMes);
+//    }
+
+//    @ApiOperation(value="查询排队转移")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(124)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getChangeQueue")
+//    public RESTfulResult getChangeQueue(@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>> AllChangeQueue = qmsQueueResultService.getChangeQueueMes(mapValue);
+//        List<Map<String, Object>> changeQueueMes1 = new ArrayList<>(AllChangeQueue);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllChangeQueue,changeQueueMes1);
+//        return success(pageList);
+//    }
 
     @ApiOperation(value="查询排队取消")
     @ApiImplicitParams({
@@ -278,21 +268,18 @@ public class QmsQueueResultController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer gatepostId,
+                                               String startTime,
+                                               String endTime,
                                                String con
     ){
-        if(gatepostId != null){
-            mapValue.put("gatepostId", gatepostId);
-        }
         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);
-        List<Map<String, Object>> queueCancel1 = new ArrayList<>(AllQueueCancel);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllQueueCancel,queueCancel1);
-        return success(pageList);
+        return success(AllQueueCancel);
     }
 
     @ApiOperation(value="通过Id查询排队取消实绩")
@@ -315,32 +302,32 @@ public class QmsQueueResultController extends BaseRESTfulController {
         return success(i);
     }
 
-    @ApiOperation(value="查询排队插队")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(132)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getQueueInsert")
-    public RESTfulResult getQueueInsert(@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>> AllQueueInsert = qmsQueueResultService.getQueueInsert(mapValue);
-        List<Map<String, Object>> queueInsert = new ArrayList<>(AllQueueInsert);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllQueueInsert,queueInsert);
-        return success(pageList);
-
-    }
+//    @ApiOperation(value="查询排队插队")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(132)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getQueueInsert")
+//    public RESTfulResult getQueueInsert(@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>> AllQueueInsert = qmsQueueResultService.getQueueInsert(mapValue);
+//        List<Map<String, Object>> queueInsert = new ArrayList<>(AllQueueInsert);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllQueueInsert,queueInsert);
+//        return success(pageList);
+//
+//    }
 
     @ApiOperation(value="查询排队结束")
     @ApiImplicitParams({
@@ -362,9 +349,7 @@ public class QmsQueueResultController extends BaseRESTfulController {
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> AllQueueEndInsert = qmsQueueResultService.getQueueEndResult(mapValue);
-        List<Map<String, Object>> queueEndInsert = new ArrayList<>(AllQueueEndInsert);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllQueueEndInsert,queueEndInsert);
-        return success(pageList);
+        return success(AllQueueEndInsert);
     }
 
     @ApiOperation(value="汽车监控(仓库)")
@@ -396,19 +381,19 @@ public class QmsQueueResultController extends BaseRESTfulController {
     }
 
 
-    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
-    @PostMapping("/getQueueStatusList")
-    public RESTfulResult getQueueStatusList(){
-        List<Map<String, Object>> queueStatusList = qmsQueueResultService.getQueueStatusList();
-        return success(queueStatusList);
-    }
+//    @ApiOperation(value="查询各仓库，门岗的排队状态列表")
+//    @PostMapping("/getQueueStatusList")
+//    public RESTfulResult getQueueStatusList(){
+//        List<Map<String, Object>> queueStatusList = qmsQueueResultService.getQueueStatusList();
+//        return success(queueStatusList);
+//    }
 
-    @ApiOperation(value="通过车牌号查询司机接收排队信息")
-    @PostMapping("/getOrderReceive/{capacityNumber}")
-    public RESTfulResult getOrderReceive(@PathVariable("capacityNumber") String capacityNumber){
-        List<Map<String, Object>> orderReceiveMap = qmsQueueResultService.getOrderReceive2(capacityNumber);
-        return success(orderReceiveMap);
-    }
+//    @ApiOperation(value="通过车牌号查询司机接收排队信息")
+//    @PostMapping("/getOrderReceive/{capacityNumber}")
+//    public RESTfulResult getOrderReceive(@PathVariable("capacityNumber") String capacityNumber){
+//        List<Map<String, Object>> orderReceiveMap = qmsQueueResultService.getOrderReceive2(capacityNumber);
+//        return success(orderReceiveMap);
+//    }
 
     @ApiOperation(value="通过车牌号取消排队")
     @PostMapping("/cancelQueue")
@@ -418,271 +403,271 @@ public class QmsQueueResultController extends BaseRESTfulController {
     }
 
     //========================================仓库=====================================================
-    @ApiOperation(value="新增仓库排队")
-    @PostMapping("/addQueueResultByCk")
-    public RESTfulResult addQueueResultByCk(@RequestBody Map<String,Object> mapValue){
-        int code = qmsQueueResultService.addQueueResultByCk(mapValue);
-        return success(code);
-    }
-
-    @ApiOperation(value="查询仓库排队申请")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(187)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueApply")
-    public RESTfulResult getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       Integer apiId,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       String con
-    ){
-
-
-        if(con != null){
-            if(!"undefined".equals(con)){
-                //设置要查询的索引名称
-                String index="get_warehouse_queue";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String, Object>> AllWarehouseQueue = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 0){
-            //将查询结果存入索引中
-            AllWarehouseQueue = qmsQueueResultService.getWarehouseQueueApply(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_warehouse_queue");
-            //添加id
-            map.put("indexId","warehouseQueueId");
-            AllWarehouseQueue.add(map);
-            //新建索引
-            esFeign.insertIndex(AllWarehouseQueue);
-            //删除
-            AllWarehouseQueue.remove(AllWarehouseQueue.size()-1);
-        }
-        if(AllWarehouseQueue == null)
-            AllWarehouseQueue = qmsQueueResultService.getWarehouseQueueApply(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> warehouseQueueApply1= qmsQueueResultService.getWarehouseQueueApply(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueue,warehouseQueueApply1);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="查询仓库排队开始")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(191)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueListByQueueUp")
-    public RESTfulResult getWarehouseQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize,
-                                                String con
-    ){
-
-
-        if(con != null){
-            if(!"undefined".equals(con)){
-                //设置要查询的索引名称
-                String index="get_warehouse_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String, Object>> AllWarehouseQueueList = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 0){
-            //将查询结果存入索引中
-            AllWarehouseQueueList = qmsQueueResultService.getWarehouseQueueListByQueueUp(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_warehouse_list");
-            //添加id
-            map.put("indexId","warehouseQueueListId");
-            AllWarehouseQueueList.add(map);
-            //新建索引
-            esFeign.insertIndex(AllWarehouseQueueList);
-            //删除
-            AllWarehouseQueueList.remove(AllWarehouseQueueList.size()-1);
-        }
-        if(AllWarehouseQueueList == null)
-            AllWarehouseQueueList = qmsQueueResultService.getWarehouseQueueListByQueueUp(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> warehouseQueueList= qmsQueueResultService.getWarehouseQueueListByQueueUp(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueueList,warehouseQueueList);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="查询仓库排队详情")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(192)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllWarehouseQueueMes")
-    public RESTfulResult getAllWarehouseQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                        Integer apiId,
-                                                        Integer pageNum,
-                                                        Integer pageSize,
-                                                        Integer platformId,
-                                                        String con
-    ){
-        int count=0;
-        if(platformId != null){
-            mapValue.put("platformId", platformId);
-            count++;
-        }
-
-
-        if(con != null){
-            if(!"undefined".equals(con)){
-                //设置要查询的索引名称
-                String index="get_warehousemes_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String, Object>> AllWarehouseQueueMes = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == count){
-            //将查询结果存入索引中
-            AllWarehouseQueueMes = qmsQueueResultService.getWarehouseQueueMes(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_warehousemes_list");
-            //添加id
-            map.put("indexId","warehouseMesListId");
-            AllWarehouseQueueMes.add(map);
-            //新建索引
-            esFeign.insertIndex(AllWarehouseQueueMes);
-            //删除
-            AllWarehouseQueueMes.remove(AllWarehouseQueueMes.size()-1);
-        }
-        if(AllWarehouseQueueMes == null)
-            AllWarehouseQueueMes = qmsQueueResultService.getWarehouseQueueMes(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> warehouseQueueList= qmsQueueResultService.getWarehouseQueueMes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueueMes,warehouseQueueList);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="通过运输订单号查询仓库排队详情")
-    @PostMapping("/getWarehouseQueueMes")
-    public RESTfulResult getWarehouseQueueMes(Map<String, Object> map){
-        List<Map<String, Object>> warehouseQueueMes = qmsQueueResultService.getWarehouseQueueMes(map);
-        return success(warehouseQueueMes);
-    }
-
-
-    @ApiOperation(value="查询仓库排队转移")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(193)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueChange")
-    public RESTfulResult getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 String con
-    ){
-
-
-        if(con != null){
-            if(!"undefined".equals(con)){
-                //设置要查询的索引名称
-                String index="get_warechange_list";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String, Object>> AllWarehouseQueueChange = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 0){
-            //将查询结果存入索引中
-            AllWarehouseQueueChange = qmsQueueResultService.getWarehouseQueueChange(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_warechange_list");
-            //添加id
-            map.put("indexId","warehouseChangeListId");
-            AllWarehouseQueueChange.add(map);
-            //新建索引
-            esFeign.insertIndex(AllWarehouseQueueChange);
-            //删除
-            AllWarehouseQueueChange.remove(AllWarehouseQueueChange.size()-1);
-        }
-        if(AllWarehouseQueueChange == null)
-            AllWarehouseQueueChange = qmsQueueResultService.getWarehouseQueueChange(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> warehouseQueueList= qmsQueueResultService.getWarehouseQueueChange(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueueChange,warehouseQueueList);
-        return success(pageList);
-
-    }
-
-    @ApiOperation(value="查询仓库排队结束")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(194)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getWarehouseQueueEndMes")
-    public RESTfulResult getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                 Integer apiId,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 String con
-    ){
-        if(con != null){
-            if(!"undefined".equals(con)){
-                //设置要查询的索引名称
-                String index="get_warequeue_endmes";
-                //获取查询结果
-                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
-            }
-        }
-        List<Map<String, Object>> AllWarehouseQueueEndMes = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue.size() == 0){
-            //将查询结果存入索引中
-            AllWarehouseQueueEndMes = qmsQueueResultService.getWarehouseQueueEndMes(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_warequeue_endmes");
-            //添加id
-            map.put("indexId","wareQueueEndMesId");
-            AllWarehouseQueueEndMes.add(map);
-            //新建索引
-            esFeign.insertIndex(AllWarehouseQueueEndMes);
-            //删除
-            AllWarehouseQueueEndMes.remove(AllWarehouseQueueEndMes.size()-1);
-        }
-        if(AllWarehouseQueueEndMes == null)
-            AllWarehouseQueueEndMes = qmsQueueResultService.getWarehouseQueueEndMes(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> warehouseQueueList= qmsQueueResultService.getWarehouseQueueEndMes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueueEndMes,warehouseQueueList);
-        return success(pageList);
-
-    }
+//    @ApiOperation(value="新增仓库排队")
+//    @PostMapping("/addQueueResultByCk")
+//    public RESTfulResult addQueueResultByCk(@RequestBody Map<String,Object> mapValue){
+//        int code = qmsQueueResultService.addQueueResultByCk(mapValue);
+//        return success(code);
+//    }
+
+//    @ApiOperation(value="查询仓库排队申请")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(187)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueApply")
+//    public RESTfulResult getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                       Integer apiId,
+//                                       Integer pageNum,
+//                                       Integer pageSize,
+//                                       String con
+//    ){
+//
+//
+//        if(con != null){
+//            if(!"undefined".equals(con)){
+//                //设置要查询的索引名称
+//                String index="get_warehouse_queue";
+//                //获取查询结果
+//                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+//            }
+//        }
+//        List<Map<String, Object>> AllWarehouseQueue = null;
+//        //如果有条件查询则跳过初始化，和创建索引
+//        if(mapValue.size() == 0){
+//            //将查询结果存入索引中
+//            AllWarehouseQueue = qmsQueueResultService.getWarehouseQueueApply(mapValue);
+//            Map<String, Object> map = new HashMap<>();
+//            //添加索引
+//            map.put("index","get_warehouse_queue");
+//            //添加id
+//            map.put("indexId","warehouseQueueId");
+//            AllWarehouseQueue.add(map);
+//            //新建索引
+//            esFeign.insertIndex(AllWarehouseQueue);
+//            //删除
+//            AllWarehouseQueue.remove(AllWarehouseQueue.size()-1);
+//        }
+//        if(AllWarehouseQueue == null)
+//            AllWarehouseQueue = qmsQueueResultService.getWarehouseQueueApply(mapValue);
+//        PageHelper.startPage(pageNum,pageSize);
+//        //分页数据
+//        List<Map<String, Object>> warehouseQueueApply1= qmsQueueResultService.getWarehouseQueueApply(mapValue);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueue,warehouseQueueApply1);
+//        return success(pageList);
+//    }
+
+//    @ApiOperation(value="查询仓库排队开始")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(191)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueListByQueueUp")
+//    public RESTfulResult getWarehouseQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                Integer apiId,
+//                                                Integer pageNum,
+//                                                Integer pageSize,
+//                                                String con
+//    ){
+//
+//
+//        if(con != null){
+//            if(!"undefined".equals(con)){
+//                //设置要查询的索引名称
+//                String index="get_warehouse_list";
+//                //获取查询结果
+//                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+//            }
+//        }
+//        List<Map<String, Object>> AllWarehouseQueueList = null;
+//        //如果有条件查询则跳过初始化，和创建索引
+//        if(mapValue.size() == 0){
+//            //将查询结果存入索引中
+//            AllWarehouseQueueList = qmsQueueResultService.getWarehouseQueueListByQueueUp(mapValue);
+//            Map<String, Object> map = new HashMap<>();
+//            //添加索引
+//            map.put("index","get_warehouse_list");
+//            //添加id
+//            map.put("indexId","warehouseQueueListId");
+//            AllWarehouseQueueList.add(map);
+//            //新建索引
+//            esFeign.insertIndex(AllWarehouseQueueList);
+//            //删除
+//            AllWarehouseQueueList.remove(AllWarehouseQueueList.size()-1);
+//        }
+//        if(AllWarehouseQueueList == null)
+//            AllWarehouseQueueList = qmsQueueResultService.getWarehouseQueueListByQueueUp(mapValue);
+//        PageHelper.startPage(pageNum,pageSize);
+//        //分页数据
+//        List<Map<String, Object>> warehouseQueueList= qmsQueueResultService.getWarehouseQueueListByQueueUp(mapValue);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueueList,warehouseQueueList);
+//        return success(pageList);
+//    }
+//
+//    @ApiOperation(value="查询仓库排队详情")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(192)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getAllWarehouseQueueMes")
+//    public RESTfulResult getAllWarehouseQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                        Integer apiId,
+//                                                        Integer pageNum,
+//                                                        Integer pageSize,
+//                                                        Integer platformId,
+//                                                        String con
+//    ){
+//        int count=0;
+//        if(platformId != null){
+//            mapValue.put("platformId", platformId);
+//            count++;
+//        }
+//
+//
+//        if(con != null){
+//            if(!"undefined".equals(con)){
+//                //设置要查询的索引名称
+//                String index="get_warehousemes_list";
+//                //获取查询结果
+//                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+//            }
+//        }
+//        List<Map<String, Object>> AllWarehouseQueueMes = null;
+//        //如果有条件查询则跳过初始化，和创建索引
+//        if(mapValue.size() == count){
+//            //将查询结果存入索引中
+//            AllWarehouseQueueMes = qmsQueueResultService.getWarehouseQueueMes(mapValue);
+//            Map<String, Object> map = new HashMap<>();
+//            //添加索引
+//            map.put("index","get_warehousemes_list");
+//            //添加id
+//            map.put("indexId","warehouseMesListId");
+//            AllWarehouseQueueMes.add(map);
+//            //新建索引
+//            esFeign.insertIndex(AllWarehouseQueueMes);
+//            //删除
+//            AllWarehouseQueueMes.remove(AllWarehouseQueueMes.size()-1);
+//        }
+//        if(AllWarehouseQueueMes == null)
+//            AllWarehouseQueueMes = qmsQueueResultService.getWarehouseQueueMes(mapValue);
+//        PageHelper.startPage(pageNum,pageSize);
+//        //分页数据
+//        List<Map<String, Object>> warehouseQueueList= qmsQueueResultService.getWarehouseQueueMes(mapValue);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueueMes,warehouseQueueList);
+//        return success(pageList);
+//    }
+//
+//    @ApiOperation(value="通过运输订单号查询仓库排队详情")
+//    @PostMapping("/getWarehouseQueueMes")
+//    public RESTfulResult getWarehouseQueueMes(Map<String, Object> map){
+//        List<Map<String, Object>> warehouseQueueMes = qmsQueueResultService.getWarehouseQueueMes(map);
+//        return success(warehouseQueueMes);
+//    }
+//
+//
+//    @ApiOperation(value="查询仓库排队转移")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(193)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueChange")
+//    public RESTfulResult getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                 Integer apiId,
+//                                                 Integer pageNum,
+//                                                 Integer pageSize,
+//                                                 String con
+//    ){
+//
+//
+//        if(con != null){
+//            if(!"undefined".equals(con)){
+//                //设置要查询的索引名称
+//                String index="get_warechange_list";
+//                //获取查询结果
+//                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+//            }
+//        }
+//        List<Map<String, Object>> AllWarehouseQueueChange = null;
+//        //如果有条件查询则跳过初始化，和创建索引
+//        if(mapValue.size() == 0){
+//            //将查询结果存入索引中
+//            AllWarehouseQueueChange = qmsQueueResultService.getWarehouseQueueChange(mapValue);
+//            Map<String, Object> map = new HashMap<>();
+//            //添加索引
+//            map.put("index","get_warechange_list");
+//            //添加id
+//            map.put("indexId","warehouseChangeListId");
+//            AllWarehouseQueueChange.add(map);
+//            //新建索引
+//            esFeign.insertIndex(AllWarehouseQueueChange);
+//            //删除
+//            AllWarehouseQueueChange.remove(AllWarehouseQueueChange.size()-1);
+//        }
+//        if(AllWarehouseQueueChange == null)
+//            AllWarehouseQueueChange = qmsQueueResultService.getWarehouseQueueChange(mapValue);
+//        PageHelper.startPage(pageNum,pageSize);
+//        //分页数据
+//        List<Map<String, Object>> warehouseQueueList= qmsQueueResultService.getWarehouseQueueChange(mapValue);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueueChange,warehouseQueueList);
+//        return success(pageList);
+//
+//    }
+//
+//    @ApiOperation(value="查询仓库排队结束")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+//            @ApiImplicitParam(name = "apiId(194)", value = "动态表头", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+//            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+//    })
+//    @PostMapping("/getWarehouseQueueEndMes")
+//    public RESTfulResult getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+//                                                 Integer apiId,
+//                                                 Integer pageNum,
+//                                                 Integer pageSize,
+//                                                 String con
+//    ){
+//        if(con != null){
+//            if(!"undefined".equals(con)){
+//                //设置要查询的索引名称
+//                String index="get_warequeue_endmes";
+//                //获取查询结果
+//                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+//            }
+//        }
+//        List<Map<String, Object>> AllWarehouseQueueEndMes = null;
+//        //如果有条件查询则跳过初始化，和创建索引
+//        if(mapValue.size() == 0){
+//            //将查询结果存入索引中
+//            AllWarehouseQueueEndMes = qmsQueueResultService.getWarehouseQueueEndMes(mapValue);
+//            Map<String, Object> map = new HashMap<>();
+//            //添加索引
+//            map.put("index","get_warequeue_endmes");
+//            //添加id
+//            map.put("indexId","wareQueueEndMesId");
+//            AllWarehouseQueueEndMes.add(map);
+//            //新建索引
+//            esFeign.insertIndex(AllWarehouseQueueEndMes);
+//            //删除
+//            AllWarehouseQueueEndMes.remove(AllWarehouseQueueEndMes.size()-1);
+//        }
+//        if(AllWarehouseQueueEndMes == null)
+//            AllWarehouseQueueEndMes = qmsQueueResultService.getWarehouseQueueEndMes(mapValue);
+//        PageHelper.startPage(pageNum,pageSize);
+//        //分页数据
+//        List<Map<String, Object>> warehouseQueueList= qmsQueueResultService.getWarehouseQueueEndMes(mapValue);
+//        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueueEndMes,warehouseQueueList);
+//        return success(pageList);
+//
+//    }
 
 
 }

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

@@ -1,32 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import com.steerinfo.dil.util.PageListAdd;
-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.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author zhangnan
- * @Date 2021/7/27 15:49
- * @Version 1.0
- */
-
-
-@FeignClient(value = "DIL-ES-DEV",url = "172.16.33.161:8089/api/v1/es")
-public interface ESFeign {
-    @PostMapping("getConResult")
-    PageListAdd getConResult(@RequestBody(required = false) Map<String, Object> mapValue,
-                             @RequestParam String index,
-                             @RequestParam Integer apiId,
-                             @RequestParam Integer pageNum,
-                             @RequestParam Integer pageSize,
-                             @RequestParam String con);
-
-
-    @PostMapping( value = "insertIndex",consumes = "application/json", produces = "application/json")
-    void insertIndex(@RequestBody List<Map<String, Object>> detailListTotal);
-}

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

@@ -28,20 +28,20 @@ public interface QmsQueueListMapper extends IBaseMapper<QmsQueueList, BigDecimal
     Map<String, Object> getQueueNumAndMin(BigDecimal gridId);
 
     //链表监控
-    List<Map<String, Object>> listMonitor(Map<String, Object> map);
+//    List<Map<String, Object>> listMonitor(Map<String, Object> map);
 
     //通过运输订单号查询运输订单信息
     Map<String, Object> getOrderMesByOrderNum(String orderNumber);
 
     //仓库链表监控
-    List<Map<String, Object>> warehouseListMonitor(Map<String, Object> map);
+//    List<Map<String, Object>> warehouseListMonitor(Map<String, Object> map);
 
     //查询某一个队列的车辆排队详情
     List<Map<String, Object>> getListQueueMes(Map<String, Object> map);
 
 
     //通过订单ID查询该订单下有多少个物资=======================================================
-    Map<String, Object> getMaterialNumByOrderId(BigDecimal orderId);
+    Map<String, Object> getMaterialNumByOrderId(BigDecimal resultId);
 
     Integer existsCapacity(Object capacityId);
 
@@ -50,6 +50,13 @@ public interface QmsQueueListMapper extends IBaseMapper<QmsQueueList, BigDecimal
 
     int updateListEnFactory(Map<String, Object> mesMap);
 
-
     int updateEnFactoryResult(Map<String, Object> mesMap);
+
+    Integer getListSequenceNumber(Map<String, Object> map);
+
+    Integer getSpellingSequenceNumber(Map<String, Object> map);
+
+    Integer getListGridNumber(Map<String, Object> map);
+
+    Integer getSpellingGridNumber(Map<String, Object> map);
 }

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

@@ -20,44 +20,44 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     Map<String, Object> queryCIdAndTIdByOrderNumber(@Param("orderNumber") String orderNumber);
 
     //通过运输订单Id查询推送给司机进厂的数据
-    Map<String, Object> sendEnFactoryMesToWebSocket(Integer orderId);
+//    Map<String, Object> sendEnFactoryMesToWebSocket(Integer orderId);
 
     //通过网格Id查询进厂门岗名称
-    Map<String, Object> queryGatepostNameByGridId(Integer gridId);
+//    Map<String, Object> queryGatepostNameByGridId(Integer gridId);
 
     //人工添加排队申请查询所有执行中订单 订单状态 ：1
-    List<Map<String, Object>> getAllExecutionOrder(Map<String, Object> map);
+//    List<Map<String, Object>> getAllExecutionOrder(Map<String, Object> map);
 
     //根据运输订单Id查询物资Id
     BigDecimal queryOrderMesByOrderId(BigDecimal orderId);
 
     //通过门岗名称查询门岗ID
-    BigDecimal getGatepostIdByGatepostName(String gatepostName);
+//    BigDecimal getGatepostIdByGatepostName(String gatepostName);
 
     //通过月台名称查询月台ID
-    BigDecimal getPlatformIdByPlatformName(String platformName);
+//    BigDecimal getPlatformIdByPlatformName(String platformName);
 
     //通过运输订单Id查询司机仓库排队的数据
-    Map<String, Object> sendWarehouseMesToWebSocket(Integer orderId);
+//    Map<String, Object> sendWarehouseMesToWebSocket(Integer orderId);
 
     //通过月台网格ID查询仓库名称 和 月台名称
-    Map<String, Object> queryWarehouseNameByPlatformId(Integer gridId);
+//    Map<String, Object> queryWarehouseNameByPlatformId(Integer gridId);
 
     //查询排队申请 判断条件：接收时间为空
     //查询指令下发 判断条件：接收时间为空
     List<Map<String, Object>> getQueueApply(Map<String, Object> map);
 
     //指令接收 通过接收时间判断是否已接收  查询判断条件：是否结束进厂
-    List<Map<String, Object>> getOrderReceive(Map<String, Object> map);
+//    List<Map<String, Object>> getOrderReceive(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>> getQueueMes(Map<String, Object> map);
 
     //查询排队转移详情
-    List<Map<String, Object>> getChangeQueueMes(Map<String, Object> map);
+//    List<Map<String, Object>> getChangeQueueMes(Map<String, Object> map);
 
     //通过实绩Id查询链表ID
     Map<String, Object> getListIdByResultId(BigDecimal resultId);
@@ -65,54 +65,57 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     //查询排队取消
     List<Map<String, Object>> getQueueCancel(Map<String, Object> map);
 
+    //修改排队取消
+    Integer updateCancelResult(QmsQueueResult qmsQueueResult);
+
     //通过实绩Id查询排队取消实绩
     List<Map<String, Object>> getQueueCancelByResultId(Integer resultId);
 
     //查询插队详情
-    List<Map<String, Object>> getQueueInsert(Map<String, Object> map);
+//    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>> getWarehouseQueueApply(Map<String, Object> map);
+//    List<Map<String, Object>> getWarehouseQueueApply(Map<String, Object> map);
 
     //查询仓库指令接收
-    List<Map<String, Object>> getWarehouseOrderReceive(Map<String, Object> map);
+//    List<Map<String, Object>> getWarehouseOrderReceive(Map<String, Object> map);
 
     //查询仓库排队开始
-    List<Map<String, Object>> getWarehouseQueueListByQueueUp(Map<String, Object> map);
+//    List<Map<String, Object>> getWarehouseQueueListByQueueUp(Map<String, Object> map);
 
-    //查看仓库排队详情 通过运输订单号
-    List<Map<String, Object>> getWarehouseQueueMes(Map<String, Object> map);
+//    查看仓库排队详情 通过运输订单号
+//    List<Map<String, Object>> getWarehouseQueueMes(Map<String, Object> map);
 
     //查询仓库排队转移
-    List<Map<String, Object>> getWarehouseQueueChange(Map<String, Object> map);
+//    List<Map<String, Object>> getWarehouseQueueChange(Map<String, Object> map);
 
     //查询仓库排队结束
-    List<Map<String, Object>> getWarehouseQueueEndMes(Map<String, Object> map);
+//    List<Map<String, Object>> getWarehouseQueueEndMes(Map<String, Object> map);
 
     /*
     ***************APP**********************
     */
 
     // 通过门岗查询门岗的排队数
-    List<Map<String, Object>> getQueueListByGatepost(BigDecimal gatepostId);
+//    List<Map<String, Object>> getQueueListByGatepost(BigDecimal gatepostId);
 
     // 查询排队取消列表
-    List<Map<String, Object>> getQueueCancelList();
+//    List<Map<String, Object>> getQueueCancelList();
 
     // 查看各个门岗,仓库的实时状态
-    List<Map<String, Object>> getQueueStatusList();
+//    List<Map<String, Object>> getQueueStatusList();
 
     // 查询司机接单列表
-    List<Map<String, Object>> getOrderReceiveList();
+//    List<Map<String, Object>> getOrderReceiveList();
 
     // 查询司机接单
     List<Map<String, Object>> getOrderReceive2(Map<String,Object> map);
@@ -127,10 +130,10 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     BigDecimal getResultIdByCapacityId(String capacityNumber);
 
     // 通过车牌号得到网格id
-    BigDecimal getGridId(String capacityNumber);
+//    BigDecimal getGridId(String capacityNumber);
 
     // 通过车牌号得到网格id
-    BigDecimal getGridIdNotNull(String capacityNumber);
+//    BigDecimal getGridIdNotNull(String capacityNumber);
 
    /*
    ==================================================2022年4月8日19:39:18========================================
@@ -141,8 +144,7 @@ public interface QmsQueueResultMapper extends IBaseMapper<QmsQueueResult, BigDec
     //查询物资ID
     Integer getMaterialIdByOrderId(BigDecimal orderId);
 
-    Map<String, Object> getQueueResultByOrderId(BigDecimal orderId);
-
+    Map<String, Object> getQueueResultByOrderId(BigDecimal resultTotalId);
 
     Map<String, Object> getResultMesByTotalId(BigDecimal resultTotalId);
 

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

@@ -21,4 +21,6 @@ public interface QmsQueueSpellingListMapper extends IBaseMapper<QmsQueueSpelling
     int updateListEnFactory(Map<String, Object> mesMap);
 
     Integer existsCapacity(Object capacityId);
+
+    int updateOOMLoadWarehouse(Map<String, Object> mesMap);
 }

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

@@ -26,4 +26,7 @@ public interface QueueInterfaceMapper {
 
     @Update("update DIL_VERSION set VERSION_VALUE = #{token} where VERSION_TYPE = 3")
     int updateToken(@Param("token") String token);
+
+    @Update("update QMS_SUB_CAPACITY set SUB_STATUS  = 1,UPDATE_TIME = SYSDATE where CAPACITY_NUMBER = #{capacityNumber} and SUB_STATUS = 0")
+    int cancelSubCapacity(@Param("capacityNumber")String capacityNumber);
 }

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

@@ -15,28 +15,28 @@ import java.util.Map;
 public interface QueuingRulesMapper {
 
     //根据物资Id、门岗规则 查询门岗id (可能会查询出多个)
-    List<Map<String, Object>> queryGatepostByMaterialId(Map<String, Object> map);
+//    List<Map<String, Object>> queryGatepostByMaterialId(Map<String, Object> map);
 
     //通过门岗ID查询门岗可进门开始时间和结束时间
-    Map<String, Object> getStartTimeAndEndTime(Integer gatepostId);
+//    Map<String, Object> getStartTimeAndEndTime(Integer gatepostId);
 
     //通过门岗ID 和 网格类型 匹配 网格主键
-        BigDecimal getGridIdByGatepostIdAndGridType(Map<String, Object> map);
+    BigDecimal getGridIdByGatepostIdAndGridType(Map<String, Object> map);
 
     //查询订单跟订单物资中间表 查询是否有多个物资Id
     List<Integer> getAllMaterialId(Map<String, Object> map);
 
     //通过物资Id查询仓库是否有货 或者 是否有多个仓库有货
-    List<Integer> getWarehouseIdByMaterialId(Integer materialId);
+//    List<Integer> getWarehouseIdByMaterialId(Integer materialId);
 
     //通过仓库Id 和 物资Id 查询垛位 层次 月台 仓库
-    List<Map<String, Object>> getStackGradation(Map<String, Object> map);
+//    List<Map<String, Object>> getStackGradation(Map<String, Object> map);
 
     //通过月台Id 查询月台当前排队车辆数
-    BigDecimal queueCountByPlatformId(BigDecimal platformId);
+//    BigDecimal queueCountByPlatformId(BigDecimal platformId);
 
     //通过订单ID查询门岗ID(可能会有多个门岗)
-    List<BigDecimal> queryGatepostIdByOrderId(@Param("orderId")BigDecimal orderId);
+//    List<BigDecimal> queryGatepostIdByOrderId(@Param("orderId")BigDecimal orderId);
 
     //通过车牌号查询已接收的订单
     Map<String, Object> getOrderNumberByCapacityNumber(@Param("capacityNumber") String capacityNumber);

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

@@ -23,7 +23,7 @@ import java.util.Map;
 public interface IQmsQueueListService{
 
     //添加汽车排队链表
-    int addQueueList(BigDecimal orderId);
+    int addQueueList(BigDecimal resultId);
 
     //进厂排队转移(仓库排队转移) 新增一条链表 修改实绩链表Id
     int changeQueue(Map<String, Object> map);
@@ -38,17 +38,17 @@ public interface IQmsQueueListService{
     int queueEndByPDA(BigDecimal resultTotalId);
 
     //链表监控
-    List<Map<String, Object>> listMonitor(Map<String, Object> map);
+//    List<Map<String, Object>> listMonitor(Map<String, Object> map);
 
     //发送数据给门禁系统
-    int sendMessageToGatepost(String orderNumber);
+//    int sendMessageToGatepost(String orderNumber);
 
     //仓库排队结束接口 ：扫描第一件物资吊牌时间
     int queueEndWarehouse(Map<String, Object> map);
 
     //仓库链表监控
-    List<Map<String, Object>> warehouseListMonitor(Map<String, Object> map);
+//    List<Map<String, Object>> warehouseListMonitor(Map<String, Object> map);
 
     //查询某一个队列的车辆排队详情
-    List<Map<String, Object>> getListQueueMes(Map<String, Object> map);
+//    List<Map<String, Object>> getListQueueMes(Map<String, Object> map);
 }

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

@@ -22,28 +22,28 @@ import java.util.Map;
  */
 public interface IQmsQueueResultService{
     //车辆进入电子围栏自动触发系统新增排队实绩
-    int addQueueResult(String vno);
+    int addQueueResult(String vno, String isPDA);
 
     //新增仓库排队
-    int addQueueResultByCk(Map<String, Object> map);
+//    int addQueueResultByCk(Map<String, Object> map);
 
     //查询排队转移详情
-    List<Map<String, Object>> getChangeQueueMes(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>> getAllExecutionOrder(Map<String, Object> map);
 
     //指令接收 通过接收时间判断是否已接收  查询判断条件：是否结束进厂
-    List<Map<String, Object>> orderReceive(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>> getQueueMes(Map<String, Object> map);
 
     //查询排队取消
     List<Map<String, Object>> getQueueCancel(Map<String, Object> map);
@@ -55,7 +55,7 @@ public interface IQmsQueueResultService{
     int updateQueueCancel(QmsQueueResult qmsQueueResult);
 
     //查询插队详情
-    List<Map<String, Object>> getQueueInsert(Map<String, Object> map);
+//    List<Map<String, Object>> getQueueInsert(Map<String, Object> map);
 
     //查询排队结束
     List<Map<String, Object>> getQueueEndResult(Map<String, Object> map);
@@ -65,31 +65,31 @@ public interface IQmsQueueResultService{
 
     //=============================================仓库排队=======================================================
     //查询仓库排队申请
-    List<Map<String, Object>> getWarehouseQueueApply(Map<String, Object> map);
+//    List<Map<String, Object>> getWarehouseQueueApply(Map<String, Object> map);
 
     //查询仓库排队开始
-    List<Map<String, Object>> getWarehouseQueueListByQueueUp(Map<String, Object> map);
+//    List<Map<String, Object>> getWarehouseQueueListByQueueUp(Map<String, Object> map);
 
     //查看排队详情 通过运输订单号
-    List<Map<String, Object>> getWarehouseQueueMes(Map<String, Object> map);
+//    List<Map<String, Object>> getWarehouseQueueMes(Map<String, Object> map);
 
     //查询排队转移
-    List<Map<String, Object>> getWarehouseQueueChange(Map<String, Object> map);
+//    List<Map<String, Object>> getWarehouseQueueChange(Map<String, Object> map);
 
     //查询仓库排队结束
-    List<Map<String, Object>> getWarehouseQueueEndMes(Map<String, Object> map);
+//    List<Map<String, Object>> getWarehouseQueueEndMes(Map<String, Object> map);
 
     /*
      * APP
      */
     // 查看各个门岗,仓库的实时状态
-    List<Map<String, Object>> getQueueStatusList();
+//    List<Map<String, Object>> getQueueStatusList();
 
     // 查询未接收时的接收
-    List<Map<String, Object>> getOrderReceive2(String capacityNumber);
+//    List<Map<String, Object>> getOrderReceive2(String capacityNumber);
 
     int cancelQueue(Map<String,Object> mapValue);
 
     // 通过车牌号得到网格id
-    BigDecimal getGridId(String capacityNumber);
+//    BigDecimal getGridId(String capacityNumber);
 }

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

@@ -18,16 +18,16 @@ public interface IQueuingRulesService {
     List<Integer> getAllMaterialId(Map<String, Object> map);
 
     //通过物资Id查询仓库是否有货 或者 是否有多个仓库有货
-    List<Integer> getWarehouseIdByMaterialId(Integer materialId);
+//    List<Integer> getWarehouseIdByMaterialId(Integer materialId);
 
     //通过仓库Id 和 物资Id 查询垛位 层次 月台 仓库
-    List<Map<String, Object>> getStackGradation(Map<String, Object> map);
+//    List<Map<String, Object>> getStackGradation(Map<String, Object> map);
 
     //通过月台Id 查询月台当前排队车辆数
-    BigDecimal queueCountByPlatformId(BigDecimal platformId);
+//    BigDecimal queueCountByPlatformId(BigDecimal platformId);
 
     //通过排队规则查询月台ID  materialIdList：运单关联的所有物资
-    List<Map<String, Object>> getPlatId(List<Integer> materialIdList);
+//    List<Map<String, Object>> getPlatId(List<Integer> materialIdList);
 
 
 }

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

@@ -31,7 +31,7 @@ public class QmsQueueGridServiceImpl implements IQmsQueueGridService {
     private QmsQueueGridMapper qmsQueueGridMapper;
 
     /**
-     * 新增仓储网格实绩ID
+     * 新增排队网格实绩ID
      * @param materialId
      * @return
      */

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

@@ -50,13 +50,13 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     private QmsQueueSpellingListMapper qmsQueueSpellingListMapper;
     /**
      * 开始排队  添加 链表排序 司机点击确认
-     * @param orderId 运输订单ID
+     * @param resultId 排队实绩ID
      * @return
      */
     @Transactional
-    public int addQueueList(BigDecimal orderId){
+    public int addQueueList(BigDecimal resultId){
         //通过订单查询有几种物资
-        Map<String, Object> mesMap = qmsQueueListMapper.getMaterialNumByOrderId(orderId);
+        Map<String, Object> mesMap = qmsQueueListMapper.getMaterialNumByOrderId(resultId);
         int materialNum = DataChange.dataToBigDecimal(mesMap.get("materialNum")).intValue();
         if(materialNum == 1){
             //单拼进入链表
@@ -192,9 +192,8 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         //更新排队实绩
         QmsQueueResult qmsQueueResult = new QmsQueueResult();
         qmsQueueResult.setResultId(resultId);
-        qmsQueueResult.setResultCancelTime(new Date());//设置取消时间
         qmsQueueResult.setResultCancelReason((String) map.get("resultCancelReason"));//设置取消原因
-        return qmsQueueResultMapper.updateByPrimaryKeySelective(qmsQueueResult);
+        return qmsQueueResultMapper.updateCancelResult(qmsQueueResult);
     }
 
     /**
@@ -260,7 +259,7 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
     }
 
     /**
-     * 允许车辆进厂
+     * 允许车辆进厂（需优化对数据库访问,时间不够）
      * @param map
      * @return
      */
@@ -274,21 +273,31 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
         }
         int count = 0;
         ArrayList<Object> list = new ArrayList<>();
+        ArrayList<BigDecimal> existsTotalIdList = new ArrayList<>();
         for (Map<String, Object> mesMap : mapList) {
             if(mesMap.get("sureTime") != null){
-                continue;
+                continue;   //如果已经确认过了就不继续处理
             }
             mesMap.put("jobName", jobName);
             if(mesMap.get("listId") != null){ //单拼
                 //更新排队链表
                 count += qmsQueueListMapper.updateListEnFactory(mesMap);
+                //更新进厂实绩
+                qmsQueueListMapper.updateEnFactoryResult(mesMap);
+                list.add(new WebSocketCapacity(5 , "system",String.valueOf(mesMap.get("capacityNumber")), "可以进厂" + new Date(), new Date()));
             }else{
-                //更新排序表
-                count += qmsQueueSpellingListMapper.updateListEnFactory(mesMap);
+                BigDecimal resultTotalId = DataChange.dataToBigDecimal(mesMap.get("resultTotalId"));
+                if( ! existsTotalIdList.contains(resultTotalId)) {
+                    //更新排序表
+                    count += qmsQueueSpellingListMapper.updateListEnFactory(mesMap);
+                    existsTotalIdList.add(resultTotalId);
+                    //更新进厂实绩
+                    qmsQueueListMapper.updateEnFactoryResult(mesMap);
+                    list.add(new WebSocketCapacity(5 , "system",String.valueOf(mesMap.get("capacityNumber")), "可以进厂" + new Date(), new Date()));
+                }
             }
-            //更新进厂实绩
-            qmsQueueListMapper.updateEnFactoryResult(mesMap);
-            list.add(new WebSocketCapacity(5 , "system",String.valueOf(mesMap.get("capacityNumber")), "可以进厂" + new Date(), new Date()));
+            //更新物资子表 每个物资的装货点ID
+            qmsQueueSpellingListMapper.updateOOMLoadWarehouse(mesMap);
         }
         queuingRulesService.pushMesToWebsocket(list);
         return count;
@@ -300,24 +309,24 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
      * 包含运输订单号，车牌号，门岗名称；
      * @return
      */
-    public int sendMessageToGatepost(String orderNumber){
-        //通过运输订单号查询相关信息
-        Map<String, Object> map = qmsQueueListMapper.getOrderMesByOrderNum(orderNumber);
-        map.put("orderNumber", orderNumber);
-        //访问门岗接口发送数据
-        //************************************
-        return 0;
-    }
+//    public int sendMessageToGatepost(String orderNumber){
+//        //通过运输订单号查询相关信息
+//        Map<String, Object> map = qmsQueueListMapper.getOrderMesByOrderNum(orderNumber);
+//        map.put("orderNumber", orderNumber);
+//        //访问门岗接口发送数据
+//        //************************************
+//        return 0;
+//    }
 
     /**
      * 链表监控
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> listMonitor(Map<String, Object> map) {
-        return qmsQueueListMapper.listMonitor(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> listMonitor(Map<String, Object> map) {
+//        return qmsQueueListMapper.listMonitor(map);
+//    }
 
 
     /**
@@ -356,37 +365,37 @@ public class QmsQueueListServiceImpl implements IQmsQueueListService {
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> warehouseListMonitor(Map<String, Object> map) {
-        return qmsQueueListMapper.warehouseListMonitor(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> warehouseListMonitor(Map<String, Object> map) {
+//        return qmsQueueListMapper.warehouseListMonitor(map);
+//    }
 
     /**
      * 查询排队详情 门岗ID 或者 月台ID
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getListQueueMes(Map<String, Object> map) {
-        Map<String, Object> hashMap = new HashMap<>();
-        if(map.get("gatepostId") != null){//传入的是门岗ID 自然类型就为 3：进厂门岗
-            hashMap.put("queueLocationId", map.get("gatepostId"));
-            hashMap.put("gridType", 3);
-        }else if(map.get("platformId") != null){ // 1：成品仓库
-            hashMap.put("queueLocationId", map.get("platformId"));
-            hashMap.put("gridType", 1);
-        }
-        //通过门岗ID和 类型 来查询网格ID
-        BigDecimal gridId = queuingRulesService.getGridIdByGatepostIdAndGridType(hashMap);
-        map.put("gridId", gridId);
-        List<Map<String, Object>> listQueueMes = qmsQueueListMapper.getListQueueMes(map);
-        for (Map<String, Object> queueMes : listQueueMes) {
-            //获取排队开始时间
-            Date resultStartTime = (Date) queueMes.get("resultStartTime");
-            long sTime = new Date().getTime() - resultStartTime.getTime(); //当前时间与开始时间相差毫秒数
-            sTime = sTime / (1000 * 60);
-            queueMes.put("minute", sTime + "分钟");
-        }
-        return listQueueMes;
-    }
+//    @Override
+//    public List<Map<String, Object>> getListQueueMes(Map<String, Object> map) {
+//        Map<String, Object> hashMap = new HashMap<>();
+//        if(map.get("gatepostId") != null){//传入的是门岗ID 自然类型就为 3：进厂门岗
+//            hashMap.put("queueLocationId", map.get("gatepostId"));
+//            hashMap.put("gridType", 3);
+//        }else if(map.get("platformId") != null){ // 1：成品仓库
+//            hashMap.put("queueLocationId", map.get("platformId"));
+//            hashMap.put("gridType", 1);
+//        }
+//        //通过门岗ID和 类型 来查询网格ID
+//        BigDecimal gridId = queuingRulesService.getGridIdByGatepostIdAndGridType(hashMap);
+//        map.put("gridId", gridId);
+//        List<Map<String, Object>> listQueueMes = qmsQueueListMapper.getListQueueMes(map);
+//        for (Map<String, Object> queueMes : listQueueMes) {
+//            //获取排队开始时间
+//            Date resultStartTime = (Date) queueMes.get("resultStartTime");
+//            long sTime = new Date().getTime() - resultStartTime.getTime(); //当前时间与开始时间相差毫秒数
+//            sTime = sTime / (1000 * 60);
+//            queueMes.put("minute", sTime + "分钟");
+//        }
+//        return listQueueMes;
+//    }
 }

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

@@ -1,15 +1,14 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.IMFeign;
-import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.QmsQueueListMapper;
+import com.steerinfo.dil.mapper.QueueInterfaceMapper;
 import com.steerinfo.dil.mapper.QueuingRulesMapper;
 import com.steerinfo.dil.model.QmsQueueList;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.model.QmsQueueResult;
 import com.steerinfo.dil.mapper.QmsQueueResultMapper;
 import com.steerinfo.dil.service.IQmsQueueResultService;
-import io.swagger.models.auth.In;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -37,9 +36,9 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
 
     @Autowired
     private QmsQueueListMapper qmsQueueListMapper;
-    
+
     @Autowired
-    private QueuingRulesServiceImpl queuingRulesService;
+    QueueInterfaceServiceImpl queueInterfaceService;
 
     @Autowired
     private QmsQueueGridServiceImpl qmsQueueGridService;
@@ -50,17 +49,41 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
     @Autowired
     private IMFeign imFeign;
 
+    @Autowired
+    private QueueInterfaceMapper queueInterfaceMapper;
+
     /**
      * 新增进厂排队实绩
      * @param  capacityNumber 车牌号
      * @return
      */
     @Override
-    public int addQueueResult(String capacityNumber) {
+    public int addQueueResult(String capacityNumber, String isPDA) {
         //获取传入的车牌号查找最近的运输订单号
         Map<String, Object> mesMap = queuingRulesMapper.getOrderNumberByCapacityNumber(capacityNumber.split("_")[0]);
         if(mesMap == null){
             return -1;
+        }else{
+            if(DataChange.dataToBigDecimal(mesMap.get("orderType")).intValue() != 1){
+                return -3; //非钢材订单不添加排队
+            }
+            if(isPDA == null){
+                String insertUpdateRemark = String.valueOf(mesMap.get("insertUpdateRemark"));
+                if("电子围栏订阅成功".equals(insertUpdateRemark)){
+                    //如果是电子围栏调用,取消订阅 无论是否新增成功都取消
+                    Map<String, Object> map = new HashMap<>();
+                    map.put("capacityNumber", capacityNumber.split("_")[0] + "_2");
+                    int j = queueInterfaceService.cancelSubsCapacity(map, 0);
+                    if(j == -1){
+                        System.out.println("取消订阅失败");
+                    }else if(j == -2){
+                        System.out.println("超过递归次数，取消订阅失败");
+                    }else if(j == 1){
+                        //修改订阅表 表示已取消订阅
+                        queueInterfaceMapper.cancelSubCapacity(capacityNumber.split("_")[0]);
+                    }
+                }
+            }
         }
         Integer resultId = queuingRulesMapper.checkoutQQR(mesMap.get("resultTotalId"));
         if(resultId != null){ //预防重复新增排队
@@ -99,75 +122,110 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
 
     /**
      * 司机通过订单ID查询当前订单的排队实绩
-     * @param orderId
+     * @param resultTotalId
      * @return
      */
-    public Map<String, Object> getQueueResultByOrderId(String orderId){
-        Map<String,Object> map = qmsQueueResultMapper.getQueueResultByOrderId(new BigDecimal(orderId));
+    public Map<String, Object> getQueueResultByTotalId(String resultTotalId){
+        Map<String,Object> map = qmsQueueResultMapper.getQueueResultByOrderId(new BigDecimal(resultTotalId));
+        if(map == null){
+            return new HashMap<>();
+        }
+        //是否拼装
+        int isSpelling = DataChange.dataToBigDecimal(map.get("isSpelling")).intValue();
+        if(map.get("resultEndTime") != null){      //司机已排队结束
+            //计算排队时长
+            Date startTime = (Date) map.get("resultStartTime");
+            Date endTime = (Date) map.get("resultEndTime");
+            long differentTime = (endTime.getTime() - startTime.getTime()) / 60000;
+            map.put("differentTime", differentTime + " 分钟");
+            map.put("status", 3);
+        }else if(map.get("resultStartTime") != null){
+            //排队开始
+            Integer num;
+            Date startTime = (Date) map.get("resultStartTime");
+            long differentTime = (System.currentTimeMillis() - startTime.getTime()) / 60000;
+            map.put("differentTime", differentTime + " 分钟");
+            if(isSpelling == 0){
+                num = qmsQueueListMapper.getListSequenceNumber(map); //当前队列排队人数
+            }else {
+                num = qmsQueueListMapper.getSpellingSequenceNumber(map); //当前多拼队列排队人数
+            }
+            map.put("orderSeqNum", num);
+            map.put("status", 2);
+        }else {
+            //还未排队
+            Integer num;
+            if(isSpelling == 0){
+                num = qmsQueueListMapper.getListGridNumber(map); //当前单拼网格排队人数
+            }else {
+                num = qmsQueueListMapper.getSpellingGridNumber(map); //当前多拼网格排队人数
+            }
+            map.put("gridSeqNum", num);
+            map.put("status", 1);
+        }
         return map;
     }
 
 
-
     /**
      * 新增仓库排队实绩
      * @param map orderNumber运输订单号  loadingId 装车点
      * @return
      */
-    public int addQueueResultByCk(Map<String, Object> map){
-        QmsQueueResult qmsQueueResult = new QmsQueueResult();
-        //生成主键
-        qmsQueueResult.setId(qmsQueueResultMapper.selectMaxId());
-        //获取添加网格Id
-        map.put("queueLocationId", map.get("loadingId"));
-        map.put("gridType", 1);
-        BigDecimal gridId = queuingRulesService.getGridIdByGatepostIdAndGridType(map);
-        qmsQueueResult.setGridId(gridId);
-        //通过运输订单号查询实绩ID 等数据
-        map.putAll(qmsQueueResultMapper.queryCIdAndTIdByOrderNumber((String) map.get("orderNumber")));
-        qmsQueueResult.setResultApplyforTime(new Date());
-        //系统自动下发 添加下发时间
-        qmsQueueResult.setResultDownTime(new Date());
-        //添加运力ID和总实绩ID
-        qmsQueueResult.setCapacityId(DataChange.dataToBigDecimal(map.get("capacityId")));
-        qmsQueueResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
-        qmsQueueResult.setInsertTime(new Date());
-        qmsQueueResult.setInsertUsername("admin");
-        pushCKMesToWebSocket(DataChange.dataToBigDecimal(map.get("orderId")).intValue(), gridId.intValue());
-        return qmsQueueResultMapper.insertSelective(qmsQueueResult);
-    }
+//    public int addQueueResultByCk(Map<String, Object> map){
+//        QmsQueueResult qmsQueueResult = new QmsQueueResult();
+//        //生成主键
+//        qmsQueueResult.setId(qmsQueueResultMapper.selectMaxId());
+//        //获取添加网格Id
+//        map.put("queueLocationId", map.get("loadingId"));
+//        map.put("gridType", 1);
+//        BigDecimal gridId = queuingRulesService.getGridIdByGatepostIdAndGridType(map);
+//        qmsQueueResult.setGridId(gridId);
+//        //通过运输订单号查询实绩ID 等数据
+//        map.putAll(qmsQueueResultMapper.queryCIdAndTIdByOrderNumber((String) map.get("orderNumber")));
+//        qmsQueueResult.setResultApplyforTime(new Date());
+//        //系统自动下发 添加下发时间
+//        qmsQueueResult.setResultDownTime(new Date());
+//        //添加运力ID和总实绩ID
+//        qmsQueueResult.setCapacityId(DataChange.dataToBigDecimal(map.get("capacityId")));
+//        qmsQueueResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+//        qmsQueueResult.setInsertTime(new Date());
+//        qmsQueueResult.setInsertUsername("admin");
+//        pushCKMesToWebSocket(DataChange.dataToBigDecimal(map.get("orderId")).intValue(), gridId.intValue());
+//        return qmsQueueResultMapper.insertSelective(qmsQueueResult);
+//    }
 
     /**
      * 推送仓库排队消息到websocket
      */
-    public void pushCKMesToWebSocket(Integer orderId, Integer gridId){
-        //通过运输订单ID查询推送给司机的数据
-        Map<String, Object> mesMap = qmsQueueResultMapper.sendWarehouseMesToWebSocket(orderId);
-        mesMap.putAll(qmsQueueResultMapper.queryWarehouseNameByPlatformId(gridId));
-        HashMap<String, Object> sendMap = new HashMap<>();
-        sendMap.put("messageType", 2);
-        sendMap.put("receivePerson", mesMap.get("capacityNumber"));
-        sendMap.put("sendPerson", "system");
-        sendMap.put("messageContent", mesMap);
-        sendMap.put("createTime", new Date());
-        ArrayList<Object> list = new ArrayList<>();
-        list.add(sendMap);
-        HashMap<Object, Object> map = new HashMap<>();
-        map.put("messages", list);
-        //调用websocket接口
-        String s = imFeign.sendToUser(map);
-        System.out.println(s);
-    }
+//    public void pushCKMesToWebSocket(Integer orderId, Integer gridId){
+//        //通过运输订单ID查询推送给司机的数据
+//        Map<String, Object> mesMap = qmsQueueResultMapper.sendWarehouseMesToWebSocket(orderId);
+//        mesMap.putAll(qmsQueueResultMapper.queryWarehouseNameByPlatformId(gridId));
+//        HashMap<String, Object> sendMap = new HashMap<>();
+//        sendMap.put("messageType", 2);
+//        sendMap.put("receivePerson", mesMap.get("capacityNumber"));
+//        sendMap.put("sendPerson", "system");
+//        sendMap.put("messageContent", mesMap);
+//        sendMap.put("createTime", new Date());
+//        ArrayList<Object> list = new ArrayList<>();
+//        list.add(sendMap);
+//        HashMap<Object, Object> map = new HashMap<>();
+//        map.put("messages", list);
+//        //调用websocket接口
+//        String s = imFeign.sendToUser(map);
+//        System.out.println(s);
+//    }
 
     /**
      * 查看排队转移界面
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getChangeQueueMes(Map<String, Object> map) {
-        return qmsQueueResultMapper.getChangeQueueMes(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> getChangeQueueMes(Map<String, Object> map) {
+//        return qmsQueueResultMapper.getChangeQueueMes(map);
+//    }
 
     /**
      * 查询排队申请
@@ -184,37 +242,37 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getAllExecutionOrder(Map<String, Object> map) {
-        return qmsQueueResultMapper.getAllExecutionOrder(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> getAllExecutionOrder(Map<String, Object> map) {
+//        return qmsQueueResultMapper.getAllExecutionOrder(map);
+//    }
 
     /**
      * 查询指令接收 判断条件：是否有排队结束时间
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> orderReceive(Map<String, Object> map) {
-        Integer queueType = (Integer) map.get("queueType");
-        List<Map<String, Object>> orderReceiveList = null;
-        switch (queueType){
-            case 1: //进厂
-                orderReceiveList = qmsQueueResultMapper.getOrderReceive(map);
-                break;
-            case 2: //仓库
-                orderReceiveList = qmsQueueResultMapper.getWarehouseOrderReceive(map);
-        }
-        //遍历数据 通过是否有接收时间 来判断是否接收
-        for (Map<String, Object> orderReceiveMap : orderReceiveList) {
-            if(orderReceiveMap.get("resultAcceptTime") != null){
-                orderReceiveMap.put("isReceive", "是");
-            }else {
-                orderReceiveMap.put("isReceive", "否");
-            }
-        }
-        return orderReceiveList;
-    }
+//    @Override
+//    public List<Map<String, Object>> orderReceive(Map<String, Object> map) {
+//        Integer queueType = (Integer) map.get("queueType");
+//        List<Map<String, Object>> orderReceiveList = null;
+//        switch (queueType){
+//            case 1: //进厂
+//                orderReceiveList = qmsQueueResultMapper.getOrderReceive(map);
+//                break;
+//            case 2: //仓库
+//                orderReceiveList = qmsQueueResultMapper.getWarehouseOrderReceive(map);
+//        }
+//        //遍历数据 通过是否有接收时间 来判断是否接收
+//        for (Map<String, Object> orderReceiveMap : orderReceiveList) {
+//            if(orderReceiveMap.get("resultAcceptTime") != null){
+//                orderReceiveMap.put("isReceive", "是");
+//            }else {
+//                orderReceiveMap.put("isReceive", "否");
+//            }
+//        }
+//        return orderReceiveList;
+//    }
 
     /**
      * 查询排队开始 数据
@@ -236,10 +294,10 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getQueueMes(Map<String, Object> map) {
-        return qmsQueueResultMapper.getQueueMes(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> getQueueMes(Map<String, Object> map) {
+//        return qmsQueueResultMapper.getQueueMes(map);
+//    }
 
     /**
      * 查询排队取消数据
@@ -277,10 +335,10 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
      * 查询排队插队
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getQueueInsert(Map<String, Object> map) {
-        return qmsQueueResultMapper.getQueueInsert(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> getQueueInsert(Map<String, Object> map) {
+//        return qmsQueueResultMapper.getQueueInsert(map);
+//    }
 
     /**
      * 查询排队结束
@@ -310,14 +368,14 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
                 }else {
                     date2 = new Date();
                 }
-                String differenceTime = DataChange.calculatedTimeDifference(date1, date2);
-                capacityMap.put("resultQueueAllTime",differenceTime);
+                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");
-                String differenceTime = DataChange.calculatedTimeDifference(date1, date2);
-                capacityMap.put("resultQueueAllTime",differenceTime);
+                long differenceTime = (date2.getTime() - date1.getTime()) / 60000;
+                capacityMap.put("resultQueueAllTime",differenceTime + "min");
             }
         }
         return list;
@@ -330,50 +388,50 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getWarehouseQueueApply(Map<String, Object> map) {
-        return qmsQueueResultMapper.getWarehouseQueueApply(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> getWarehouseQueueApply(Map<String, Object> map) {
+//        return qmsQueueResultMapper.getWarehouseQueueApply(map);
+//    }
 
     /**
      * 查看排队开始
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getWarehouseQueueListByQueueUp(Map<String, Object> map) {
-        return qmsQueueResultMapper.getWarehouseQueueListByQueueUp(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> getWarehouseQueueListByQueueUp(Map<String, Object> map) {
+//        return qmsQueueResultMapper.getWarehouseQueueListByQueueUp(map);
+//    }
 
     /**
      * 查看仓库排队详情 通过运输订单号查询仓库
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getWarehouseQueueMes(Map<String, Object> map) {
-        return qmsQueueResultMapper.getWarehouseQueueMes(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> getWarehouseQueueMes(Map<String, Object> map) {
+//        return qmsQueueResultMapper.getWarehouseQueueMes(map);
+//    }
 
     /**
      * 查询仓库排队转移详情
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getWarehouseQueueChange(Map<String, Object> map) {
-        return qmsQueueResultMapper.getWarehouseQueueChange(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> getWarehouseQueueChange(Map<String, Object> map) {
+//        return qmsQueueResultMapper.getWarehouseQueueChange(map);
+//    }
 
     /**
      * 查询仓库排队结束
      * @param map
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getWarehouseQueueEndMes(Map<String, Object> map) {
-        return qmsQueueResultMapper.getWarehouseQueueEndMes(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> getWarehouseQueueEndMes(Map<String, Object> map) {
+//        return qmsQueueResultMapper.getWarehouseQueueEndMes(map);
+//    }
 
     //********************************APP*********************************************
 
@@ -382,19 +440,19 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
      * @param capacityNumber
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getOrderReceive2(String capacityNumber) {
-        BigDecimal gridId = getGridId(capacityNumber);
-        if (gridId == null) {
-            List<Map<String,Object>> mapList = new ArrayList<>();
-            return mapList;
-        }
-        Map<String,Object> map = new HashMap<>();
-        map.put("capacityNumber",capacityNumber);
-        map.put("gridId",gridId);
-        List<Map<String, Object>> orderReceive = qmsQueueResultMapper.getOrderReceive2(map);
-        return orderReceive;
-    }
+//    @Override
+//    public List<Map<String, Object>> getOrderReceive2(String capacityNumber) {
+//        BigDecimal gridId = getGridId(capacityNumber);
+//        if (gridId == null) {
+//            List<Map<String,Object>> mapList = new ArrayList<>();
+//            return mapList;
+//        }
+//        Map<String,Object> map = new HashMap<>();
+//        map.put("capacityNumber",capacityNumber);
+//        map.put("gridId",gridId);
+//        List<Map<String, Object>> orderReceive = qmsQueueResultMapper.getOrderReceive2(map);
+//        return orderReceive;
+//    }
 
     /**
      * 排队取消
@@ -422,20 +480,20 @@ public class QmsQueueResultServiceImpl implements IQmsQueueResultService {
      * @param capacityNumber
      * @return
      */
-    @Override
-    public BigDecimal getGridId(String capacityNumber) {
-        return qmsQueueResultMapper.getGridIdNotNull(capacityNumber);
-    }
+//    @Override
+//    public BigDecimal getGridId(String capacityNumber) {
+//        return qmsQueueResultMapper.getGridIdNotNull(capacityNumber);
+//    }
 
 
     /**
      * 查询各门岗和仓库的排队状态
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getQueueStatusList() {
-        return qmsQueueResultMapper.getQueueStatusList();
-    }
-
+//    @Override
+//    public List<Map<String, Object>> getQueueStatusList() {
+//        return qmsQueueResultMapper.getQueueStatusList();
+//    }
+//
 
 }

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

@@ -38,10 +38,11 @@ public class QueueInterfaceServiceImpl {
 
     private String userflag = "DaZhouGangTie";  //标识
 
-    private String lonlat = "121.84431,29.89889"; //中心点坐标
+    private String lonlat = "107.4628199,31.1925279"; //中心点坐标
 
     private String radius = "3000"; //半径
 
+
     /**
      * 车辆订阅接口
      * @Author TXF
@@ -59,7 +60,7 @@ public class QueueInterfaceServiceImpl {
             return "参数【capacityNumber】车号，为空";
         }
         Map<String, String> mesMap = new HashMap<>();
-        mesMap.put("token", token);
+        mesMap.put("token", queueInterfaceMapper.getToken());
         mesMap.put("cid", cid);
         mesMap.put("srt", srt);
         mesMap.put("userflag", userflag);
@@ -69,7 +70,7 @@ public class QueueInterfaceServiceImpl {
         }
         mesMap.put("areaid", areaId);
         mesMap.put("vnos", (String) map.get("capacityNumber"));
-        String url = "https://openapi-test.sinoiov.cn/save/apis/vnoReg";
+        String url = "https://openapi.sinoiov.cn/save/apis/vnoReg";
         try {
             DataExchangeService des = new DataExchangeService(5000, 8000);
             // 通过 https 方式调用，此方法内部会使用私钥生成签名参数 sign,私钥不会发送
@@ -108,7 +109,7 @@ public class QueueInterfaceServiceImpl {
      **/
     public int registerAreaReg(){
         Map<String, String> mesMap = new HashMap<>(9);
-        mesMap.put("token", token);
+        mesMap.put("token", queueInterfaceMapper.getToken());
         mesMap.put("cid", cid);
         mesMap.put("srt", srt);
         mesMap.put("userflag", userflag);
@@ -165,7 +166,7 @@ public class QueueInterfaceServiceImpl {
             String res = des.postHttps(url, map);
             JSONObject jsonObject = JSONObject.parseObject(res);
             this.token = jsonObject.get("result").toString();
-            System.out.println("token: " + this.token);
+            queueInterfaceMapper.updateToken(this.token);
             return 1;
         } catch (Exception e) {
             System.out.println("登录中交兴路出错"+e.getMessage());
@@ -188,7 +189,7 @@ public class QueueInterfaceServiceImpl {
         Map<String, String> mesMap = new HashMap<>(4);
         mesMap.put("cid", cid);
         mesMap.put("srt", srt);
-        mesMap.put("token", token);
+        mesMap.put("token", queueInterfaceMapper.getToken());
         mesMap.put("userflag", userflag);
         mesMap.put("vnos", (String) map.get("capacityNumber"));
         mesMap.put("areaid", queueInterfaceMapper.getAreaId());

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

@@ -137,23 +137,23 @@ public class QueuingRulesServiceImpl implements IQueuingRulesService {
      * @param materialId
      * @return
      */
-    public BigDecimal calculateGridId(BigDecimal materialId){
-        Map<String, Object> map = new HashMap<>();
-        //通过物资Id 和 进厂类型 查询 门岗ID
-        map.put("materialId", materialId);
-        map.put("type", 0); //匹配物资可进厂的门岗
-        List<Map<String, Object>> gatepostMesList = queuingRulesMapper.queryGatepostByMaterialId(map); //可能会有多个门岗可入
-        for (Map<String, Object> mes : gatepostMesList) {
-            //从数据库中获取门岗开始时间结束时间 若当前时间满足该门岗进门时间 则下放 暂不考虑门岗优先级
-            boolean judgeTime = judgeTime((String)mes.get("startTime"), (String)mes.get("endTime"));
-            if(judgeTime){
-                mes.put("gridType", 3);
-                //通过匹配出来的门岗ID获取网格ID
-                return getGridIdByGatepostIdAndGridType(mes);
-            }
-        }
-        return null;
-    }
+//    public BigDecimal calculateGridId(BigDecimal materialId){
+//        Map<String, Object> map = new HashMap<>();
+//        //通过物资Id 和 进厂类型 查询 门岗ID
+//        map.put("materialId", materialId);
+//        map.put("type", 0); //匹配物资可进厂的门岗
+//        List<Map<String, Object>> gatepostMesList = queuingRulesMapper.queryGatepostByMaterialId(map); //可能会有多个门岗可入
+//        for (Map<String, Object> mes : gatepostMesList) {
+//            //从数据库中获取门岗开始时间结束时间 若当前时间满足该门岗进门时间 则下放 暂不考虑门岗优先级
+//            boolean judgeTime = judgeTime((String)mes.get("startTime"), (String)mes.get("endTime"));
+//            if(judgeTime){
+//                mes.put("gridType", 3);
+//                //通过匹配出来的门岗ID获取网格ID
+//                return getGridIdByGatepostIdAndGridType(mes);
+//            }
+//        }
+//        return null;
+//    }
 
     /**
      * 判断当前时间是否在时间区间范围内
@@ -200,30 +200,30 @@ public class QueuingRulesServiceImpl implements IQueuingRulesService {
      * @param materialId 物资ID
      * @return
      */
-    @Override
-    public List<Integer> getWarehouseIdByMaterialId(Integer materialId) {
-        return queuingRulesMapper.getWarehouseIdByMaterialId(materialId);
-    }
+//    @Override
+//    public List<Integer> getWarehouseIdByMaterialId(Integer materialId) {
+//        return queuingRulesMapper.getWarehouseIdByMaterialId(materialId);
+//    }
 
     /**
      * 通过仓库Id 和 物资Id 查询垛位 层次 月台 仓库
      * @param map MaterialId 物资ID warehouseId 仓库ID
      * @return
      */
-    @Override
-    public List<Map<String, Object>> getStackGradation(Map<String, Object> map) {
-        return queuingRulesMapper.getStackGradation(map);
-    }
+//    @Override
+//    public List<Map<String, Object>> getStackGradation(Map<String, Object> map) {
+//        return queuingRulesMapper.getStackGradation(map);
+//    }
 
     /**
      * 通过月台Id 查询月台当前排队车辆数
      * @param platformId 月台ID
      * @return
      */
-    @Override
-    public BigDecimal queueCountByPlatformId(BigDecimal platformId) {
-        return queuingRulesMapper.queueCountByPlatformId(platformId);
-    }
+//    @Override
+//    public BigDecimal queueCountByPlatformId(BigDecimal platformId) {
+//        return queuingRulesMapper.queueCountByPlatformId(platformId);
+//    }
 
 
     /**
@@ -234,50 +234,50 @@ public class QueuingRulesServiceImpl implements IQueuingRulesService {
      * @param materialIdList
      * @return
      */
-    public List<Map<String, Object>> getPlatId(List<Integer> materialIdList){
-        //遍历每一中物资查找月台
-        List<Map<String, Object>> platIdList = new ArrayList<>();
-        con:for (Integer materialId : materialIdList) {
-            Integer platId = null;
-            //一种物资可能在多个仓库中
-            Map<String, Object> map = new HashMap<>();
-            map.put("materialId", materialId);
-
-            List<Integer> warehouseList = getWarehouseIdByMaterialId(materialId);
-            int countNum = 1000; //初始化比较值
-            for (Integer warehouseId : warehouseList) {
-                HashMap<String, Object> hashMap = new HashMap<>();
-                hashMap.put("materialId", materialId);
-                hashMap.put("warehouseId", warehouseId);
-                //通过物资Id和仓库ID对仓储网格表 再次进行查询并筛选出层次号最高的几条数据
-                List<Map<String, Object>> mesList = getStackGradation(hashMap);
-                //遍历筛选出来的月台 查看当前月台排队车辆数
-                for (Map<String, Object> mesMap : mesList) {
-                    BigDecimal platformId = DataChange.dataToBigDecimal(mesMap.get("platformId"));
-                    //通过月台ID 和 网格类型 查找当前网格Id
-                    hashMap.put("queueLocationId", platformId);
-                    hashMap.put("gridType", 1);
-                    BigDecimal gridId = queuingRulesMapper.getGridIdByGatepostIdAndGridType(hashMap);
-                    //取得排队车辆数
-                    int count = queueCountByPlatformId(gridId).intValue();
-                    //如果当前月台排队车数为0 则直接选择这个月台
-                    if(count == 0){
-                        platId = platformId.intValue();
-                        map.put("loadingId", platId);
-                        platIdList.add(map);
-                        continue con;
-                    }
-                    //如果排队车辆数小于上个月台排队车辆数
-                    if(count < countNum){
-                        countNum = count; //取代比较数
-                        platId = platformId.intValue(); //替换月台ID
-                        map.put("loadingId", platId);
-                    }
-                }
-            }
-            platIdList.add(map);
-        }
-        return platIdList;
-    }
+//    public List<Map<String, Object>> getPlatId(List<Integer> materialIdList){
+//        //遍历每一中物资查找月台
+//        List<Map<String, Object>> platIdList = new ArrayList<>();
+//        con:for (Integer materialId : materialIdList) {
+//            Integer platId = null;
+//            //一种物资可能在多个仓库中
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("materialId", materialId);
+//
+//            List<Integer> warehouseList = getWarehouseIdByMaterialId(materialId);
+//            int countNum = 1000; //初始化比较值
+//            for (Integer warehouseId : warehouseList) {
+//                HashMap<String, Object> hashMap = new HashMap<>();
+//                hashMap.put("materialId", materialId);
+//                hashMap.put("warehouseId", warehouseId);
+//                //通过物资Id和仓库ID对仓储网格表 再次进行查询并筛选出层次号最高的几条数据
+//                List<Map<String, Object>> mesList = getStackGradation(hashMap);
+//                //遍历筛选出来的月台 查看当前月台排队车辆数
+//                for (Map<String, Object> mesMap : mesList) {
+//                    BigDecimal platformId = DataChange.dataToBigDecimal(mesMap.get("platformId"));
+//                    //通过月台ID 和 网格类型 查找当前网格Id
+//                    hashMap.put("queueLocationId", platformId);
+//                    hashMap.put("gridType", 1);
+//                    BigDecimal gridId = queuingRulesMapper.getGridIdByGatepostIdAndGridType(hashMap);
+//                    //取得排队车辆数
+//                    int count = queueCountByPlatformId(gridId).intValue();
+//                    //如果当前月台排队车数为0 则直接选择这个月台
+//                    if(count == 0){
+//                        platId = platformId.intValue();
+//                        map.put("loadingId", platId);
+//                        platIdList.add(map);
+//                        continue con;
+//                    }
+//                    //如果排队车辆数小于上个月台排队车辆数
+//                    if(count < countNum){
+//                        countNum = count; //取代比较数
+//                        platId = platformId.intValue(); //替换月台ID
+//                        map.put("loadingId", platId);
+//                    }
+//                }
+//            }
+//            platIdList.add(map);
+//        }
+//        return platIdList;
+//    }
 
 }

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

@@ -453,46 +453,46 @@
       and DELETED = 0
   </select>
 
-<!--  链表监控 查询全部门岗排队车数 -->
-  <select id="listMonitor" resultType="java.util.LinkedHashMap">
-    select *
-    from (
-        select
-          RG.GATEPOST_ID "gatepostId",
-        (
-        select RG2.GATEPOST_NAME from RMS_GATEPOST RG2
-        where RG2.GATEPOST_ID = RG.GATEPOST_ID
-            ) "gatepostName",
-          count(QQL.LIST_NODE_ORDER) "count"
-        from RMS_GATEPOST RG
-          left join QMS_QUEUE_GRID QQG
-          on QQG.QUEUE_LOCATION_ID = RG.GATEPOST_ID and QQG.GRID_TYPE = 3
-        LEFT JOIN QMS_QUEUE_LIST QQL
-            on QQL.GRID_ID = QQG.GRID_ID and QQL.DELETED = 0
-        group by RG.GATEPOST_ID
-        ) t
-    <where>
-      <if test="index != null">
-        instr(t."gatepostName", #{index}) > 0
-      </if>
-      <if test="gatepostName != null">
-        and
-        <foreach collection="gatepostName" item="item" open="(" separator="or" close=")">
-          "gatepostName" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="count != null">
-        and
-        <foreach collection="count" item="item" open="(" separator="or" close=")">
-          "count" like '%${item}%'
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderBy"></include>
-    <if test="orderField == null  ">
-      order by "count" desc, "gatepostId" asc
-    </if>
-  </select>
+<!--&lt;!&ndash;  链表监控 查询全部门岗排队车数 &ndash;&gt;-->
+<!--  <select id="listMonitor" resultType="java.util.LinkedHashMap">-->
+<!--    select *-->
+<!--    from (-->
+<!--        select-->
+<!--          RG.GATEPOST_ID "gatepostId",-->
+<!--        (-->
+<!--        select RG2.GATEPOST_NAME from RMS_GATEPOST RG2-->
+<!--        where RG2.GATEPOST_ID = RG.GATEPOST_ID-->
+<!--            ) "gatepostName",-->
+<!--          count(QQL.LIST_NODE_ORDER) "count"-->
+<!--        from RMS_GATEPOST RG-->
+<!--          left join QMS_QUEUE_GRID QQG-->
+<!--          on QQG.QUEUE_LOCATION_ID = RG.GATEPOST_ID and QQG.GRID_TYPE = 3-->
+<!--        LEFT JOIN QMS_QUEUE_LIST QQL-->
+<!--            on QQL.GRID_ID = QQG.GRID_ID and QQL.DELETED = 0-->
+<!--        group by RG.GATEPOST_ID-->
+<!--        ) t-->
+<!--    <where>-->
+<!--      <if test="index != null">-->
+<!--        instr(t."gatepostName", #{index}) > 0-->
+<!--      </if>-->
+<!--      <if test="gatepostName != null">-->
+<!--        and-->
+<!--        <foreach collection="gatepostName" item="item" open="(" separator="or" close=")">-->
+<!--          "gatepostName" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="count != null">-->
+<!--        and-->
+<!--        <foreach collection="count" item="item" open="(" separator="or" close=")">-->
+<!--          "count" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--    </where>-->
+<!--    <include refid="orderBy"></include>-->
+<!--    <if test="orderField == null  ">-->
+<!--      order by "count" desc, "gatepostId" asc-->
+<!--    </if>-->
+<!--  </select>-->
 
 <!-- 通过运输订单号查询运输订单信息 -->
   <select id="getOrderMesByOrderNum" parameterType="string" resultType="java.util.Map">
@@ -510,49 +510,49 @@
   </select>
 
 <!-- 仓库链表监控 -->
-  <select id="warehouseListMonitor" resultType="java.util.Map" parameterType="java.util.Map">
-    select *
-    from (
-    select
-    RPP.PLATFORM_ID          "platformId",
-    (SELECT PLATFORM_NAME from RMS_PWAREHOUSE_PLATFORM where PLATFORM_ID = RPP.PLATFORM_ID
-        ) "platformName",
-    (select RW.WAREHOUSE_NAME from RMS_WAREHOUSE RW where RW.WAREHOUSE_ID = (select distinct WAREHOUSE_ID
-                                                                from RMS_PWAREHOUSE_GRID RPG
-                                                                where RPG.PLATFORM_ID = RPP.PLATFORM_ID )
-        ) "warehouseName",
-    count(QQL.LIST_NODE_ORDER) "count"
-    from RMS_PWAREHOUSE_PLATFORM RPP
-    left join QMS_QUEUE_GRID QQG
-        on QQG.QUEUE_LOCATION_ID = RPP.PLATFORM_ID and QQG.GRID_TYPE = 1
-    LEFT JOIN QMS_QUEUE_LIST QQL
-    on QQL.GRID_ID = QQG.GRID_ID and QQL.DELETED = 0
-    group by RPP.PLATFORM_ID
-    )
-    <where>
-      <if test="platformName != null">
-        <foreach collection="platformName" item="item" open="(" separator="or" close=")">
-          "platformName" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="count != null">
-        and
-        <foreach collection="count" item="item" open="(" separator="or" close=")">
-          "count" like '%${item}%'
-        </foreach>
-      </if>
-      <if test="warehouseName != null">
-        and
-        <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
-          "warehouseName" like '%${item}%'
-        </foreach>
-      </if>
-    </where>
-    <include refid="orderBy"></include>
-    <if test="orderField == null  ">
-      order by "count" desc
-    </if>
-  </select>
+<!--  <select id="warehouseListMonitor" resultType="java.util.Map" parameterType="java.util.Map">-->
+<!--    select *-->
+<!--    from (-->
+<!--    select-->
+<!--    RPP.PLATFORM_ID          "platformId",-->
+<!--    (SELECT PLATFORM_NAME from RMS_PWAREHOUSE_PLATFORM where PLATFORM_ID = RPP.PLATFORM_ID-->
+<!--        ) "platformName",-->
+<!--    (select RW.WAREHOUSE_NAME from RMS_WAREHOUSE RW where RW.WAREHOUSE_ID = (select distinct WAREHOUSE_ID-->
+<!--                                                                from RMS_PWAREHOUSE_GRID RPG-->
+<!--                                                                where RPG.PLATFORM_ID = RPP.PLATFORM_ID )-->
+<!--        ) "warehouseName",-->
+<!--    count(QQL.LIST_NODE_ORDER) "count"-->
+<!--    from RMS_PWAREHOUSE_PLATFORM RPP-->
+<!--    left join QMS_QUEUE_GRID QQG-->
+<!--        on QQG.QUEUE_LOCATION_ID = RPP.PLATFORM_ID and QQG.GRID_TYPE = 1-->
+<!--    LEFT JOIN QMS_QUEUE_LIST QQL-->
+<!--    on QQL.GRID_ID = QQG.GRID_ID and QQL.DELETED = 0-->
+<!--    group by RPP.PLATFORM_ID-->
+<!--    )-->
+<!--    <where>-->
+<!--      <if test="platformName != null">-->
+<!--        <foreach collection="platformName" item="item" open="(" separator="or" close=")">-->
+<!--          "platformName" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="count != null">-->
+<!--        and-->
+<!--        <foreach collection="count" item="item" open="(" separator="or" close=")">-->
+<!--          "count" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--      <if test="warehouseName != null">-->
+<!--        and-->
+<!--        <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">-->
+<!--          "warehouseName" like '%${item}%'-->
+<!--        </foreach>-->
+<!--      </if>-->
+<!--    </where>-->
+<!--    <include refid="orderBy"></include>-->
+<!--    <if test="orderField == null  ">-->
+<!--      order by "count" desc-->
+<!--    </if>-->
+<!--  </select>-->
 
 <!-- 查询某一个队列的车辆排队详情 -->
  <select id="getListQueueMes" parameterType="java.util.Map" resultType="java.util.Map">
@@ -591,10 +591,10 @@
              (select COUNT(MATERIAL_ID)
               from OMSTRUCK_ORDER_MATERIAL OOM
               where OOM.ORDER_ID = OO.ORDER_ID) "materialNum"
-      from OMSTRUCK_ORDER OO
-        left join TMSTRUCK_TOTAL_RESULT TTR on OO.ORDER_ID = TTR.ORDER_ID
-        left join QMS_QUEUE_RESULT  QQR on TTR.RESULT_TOTAL_ID = QQR.RESULT_TOTAL_ID
-      where OO.ORDER_ID = #{orderId}
+      from QMS_QUEUE_RESULT QQR
+        left join TMSTRUCK_TOTAL_RESULT TTR on QQR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER  OO on TTR.ORDER_ID = OO.ORDER_ID
+      where QQR.RESULT_ID = #{resultId}
     </select>
 
   <select id="existsCapacity" resultType="java.lang.Integer">
@@ -623,5 +623,39 @@
     WHERE TER.RESULT_TOTAL_ID = #{resultTotalId}
   </update>
 
+  <select id="getListSequenceNumber" parameterType="map" resultType="int">
+    select COUNT(QQL.LIST_ID)
+    from QMS_QUEUE_LIST QQL
+    where QQL.GRID_ID = #{gridId}
+      and QQL.LIST_NODE_ORDER &lt;= (
+        select
+        QQL2.LIST_NODE_ORDER
+        from QMS_QUEUE_LIST QQL2
+        where QQL2.LIST_ID = #{listId}
+    )
+  </select>
 
+  <select id="getSpellingSequenceNumber" parameterType="map" resultType="int">
+    select COUNT(QQSL.SPELLING_RESULT_ID)
+    from QMS_QUEUE_SPELLING_LIST QQSL
+    where SPELILING_NUM = #{gridId}
+    and QQSL.SPELLING_SURE_TIME &lt;= (
+        select QQSL2.SPELLING_SURE_TIME
+        from QMS_QUEUE_SPELLING_LIST QQSL2
+        where QQSL2.SPELLING_RESULT_ID = #{listId}
+      )
+  </select>
+
+
+  <select id="getListGridNumber" parameterType="map" resultType="int">
+    select count(LIST_ID)
+        from QMS_QUEUE_LIST
+    where GRID_ID = #{gridId}
+  </select>
+
+  <select id="getSpellingGridNumber" parameterType="map" resultType="int">
+    select count(SPELLING_RESULT_ID)
+    from QMS_QUEUE_SPELLING_LIST
+    where SPELILING_NUM = #{gridId}
+  </select>
 </mapper>

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

@@ -362,4 +362,10 @@
     where QQR.CAPACITY_ID = #{capacityId}
   </select>
 
+  <update id="updateOOMLoadWarehouse" parameterType="map">
+     update OMSTRUCK_ORDER_MATERIAL
+     set MATERIAL_PRIORITY = #{id}
+     where ORDER_ID = #{orderId} and MATERIAL_ID = #{materialId}
+  </update>
+
 </mapper>

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

@@ -3,37 +3,37 @@
 <mapper namespace="com.steerinfo.dil.mapper.QueuingRulesMapper">
 
     <!--  根据物资Id、门岗规则(进或出) 查询门岗id -->
-    <select id="queryGatepostByMaterialId" parameterType="java.util.Map" resultType="java.util.Map">
-        select
-        RG.GATEPOST_ID "queueLocationId",
-        RGR.RULES_GATEPOST_START_TIME "startTime",
-        RGR.RULES_GATEPOST_END_TIME "endTime"
-        from RMS_GATEPOST RG
-        left join RMS_GATEPOST_RULES RGR
-        on RGR.GATEPOST_ID = RG.GATEPOST_ID
-        left join RMS_MATERIAL_TYPE RMT
-        on RMT.MATERIAL_TYPE_ID = RGR.MATERIAL_TYPE_ID
-        left join RMS_MATERIAL RM
-        on RM.MATERIAL_TYPE_ID = RMT.MATERIAL_TYPE_ID
-        <where>
-            <if test="materialId != null">
-                RM.MATERIAL_ID = #{materialId}
-            </if>
-            <if test="type != null">
-                and RGR.RULES_GATEPOST_ENTRY_OUT_TYPE = #{type}
-            </if>
-        </where>
-        order by
-        RG.GATEPOST_ID
-    </select>
+<!--    <select id="queryGatepostByMaterialId" parameterType="java.util.Map" resultType="java.util.Map">-->
+<!--        select-->
+<!--        RG.GATEPOST_ID "queueLocationId",-->
+<!--        RGR.RULES_GATEPOST_START_TIME "startTime",-->
+<!--        RGR.RULES_GATEPOST_END_TIME "endTime"-->
+<!--        from RMS_GATEPOST RG-->
+<!--        left join RMS_GATEPOST_RULES RGR-->
+<!--        on RGR.GATEPOST_ID = RG.GATEPOST_ID-->
+<!--        left join RMS_MATERIAL_TYPE RMT-->
+<!--        on RMT.MATERIAL_TYPE_ID = RGR.MATERIAL_TYPE_ID-->
+<!--        left join RMS_MATERIAL RM-->
+<!--        on RM.MATERIAL_TYPE_ID = RMT.MATERIAL_TYPE_ID-->
+<!--        <where>-->
+<!--            <if test="materialId != null">-->
+<!--                RM.MATERIAL_ID = #{materialId}-->
+<!--            </if>-->
+<!--            <if test="type != null">-->
+<!--                and RGR.RULES_GATEPOST_ENTRY_OUT_TYPE = #{type}-->
+<!--            </if>-->
+<!--        </where>-->
+<!--        order by-->
+<!--        RG.GATEPOST_ID-->
+<!--    </select>-->
 
 
     <!--   通过门岗ID查询门岗可进门开始时间和结束时间 -->
-    <select id="getStartTimeAndEndTime" resultType="java.util.Map" parameterType="int">
---         select
---         from RMS_GATEPOST RG
---         where RG.GATEPOST_ID = #{gatepostId}
-    </select>
+<!--    <select id="getStartTimeAndEndTime" resultType="java.util.Map" parameterType="int">-->
+<!--        select-->
+<!--        from RMS_GATEPOST RG-->
+<!--        where RG.GATEPOST_ID = #{gatepostId}-->
+<!--    </select>-->
 
 
     <!-- 查询门岗或仓库 -->
@@ -55,72 +55,74 @@
 
 
 <!--  查询仓库是否有货  -->
-    <select id="getWarehouseIdByMaterialId" parameterType="java.util.Map" resultType="int">
-        select distinct RPG.WAREHOUSE_ID "warehouseId"
-        from RMS_MATERIAL_STEEL RMS
-                 left join WMSP_GRID_MATERIAL WGM
-                           on RMS.MATERIAL_STEEL_ID = WGM.MATERIAL_ID
-                 left join RMS_PWAREHOUSE_GRID RPG
-                           on RPG.GRID_ID = WGM.GRID_ID
-        where WGM.DELETED = 0
-          and RMS.MATERIAL_ID = #{materialId}
-    </select>
+<!--    <select id="getWarehouseIdByMaterialId" parameterType="java.util.Map" resultType="int">-->
+<!--        select distinct RPG.WAREHOUSE_ID "warehouseId"-->
+<!--        from RMS_MATERIAL_STEEL RMS-->
+<!--                 left join WMSP_GRID_MATERIAL WGM-->
+<!--                           on RMS.MATERIAL_STEEL_ID = WGM.MATERIAL_ID-->
+<!--                 left join RMS_PWAREHOUSE_GRID RPG-->
+<!--                           on RPG.GRID_ID = WGM.GRID_ID-->
+<!--        where WGM.DELETED = 0-->
+<!--          and RMS.MATERIAL_ID = #{materialId}-->
+<!--    </select>-->
 
 <!--  通过仓库Id 和 物资Id 查询垛位 层次 月台  仓库 -->
-    <select id="getStackGradation" parameterType="java.util.Map" resultType="java.util.Map">
-        select RPG.WAREHOUSE_ID          "warehouseId",
-               rpg.GRID_GRADATION_NUMBER "gridGradationNumber",
-               RPG.PLATFORM_ID           "platformId",
-               RPG.STACKING_ID           "stackingId"
-
-        from RMS_MATERIAL_STEEL RMS
-                 left join WMSP_GRID_MATERIAL WGM
-                           on RMS.MATERIAL_STEEL_ID = WGM.MATERIAL_ID
-                 left join RMS_PWAREHOUSE_GRID RPG
-                           on RPG.GRID_ID = WGM.GRID_ID
-        where WGM.DELETED = 0
-          and RMS.MATERIAL_ID = #{materialId}
-          and RPG.WAREHOUSE_ID = #{warehouseId}
-          and RPG.GRID_GRADATION_NUMBER = (
-            select MAX(rpg.GRID_GRADATION_NUMBER)
-            from RMS_MATERIAL_STEEL RMS
-                     left join WMSP_GRID_MATERIAL WGM
-                               on RMS.MATERIAL_STEEL_ID = WGM.MATERIAL_ID
-                     left join RMS_PWAREHOUSE_GRID RPG
-                               on RPG.GRID_ID = WGM.GRID_ID
-            where WGM.DELETED = 0
-              and RMS.MATERIAL_ID = #{materialId}
-              and RPG.WAREHOUSE_ID = #{warehouseId})
-    </select>
+<!--    <select id="getStackGradation" parameterType="java.util.Map" resultType="java.util.Map">-->
+<!--        select RPG.WAREHOUSE_ID          "warehouseId",-->
+<!--               rpg.GRID_GRADATION_NUMBER "gridGradationNumber",-->
+<!--               RPG.PLATFORM_ID           "platformId",-->
+<!--               RPG.STACKING_ID           "stackingId"-->
+
+<!--        from RMS_MATERIAL_STEEL RMS-->
+<!--                 left join WMSP_GRID_MATERIAL WGM-->
+<!--                           on RMS.MATERIAL_STEEL_ID = WGM.MATERIAL_ID-->
+<!--                 left join RMS_PWAREHOUSE_GRID RPG-->
+<!--                           on RPG.GRID_ID = WGM.GRID_ID-->
+<!--        where WGM.DELETED = 0-->
+<!--          and RMS.MATERIAL_ID = #{materialId}-->
+<!--          and RPG.WAREHOUSE_ID = #{warehouseId}-->
+<!--          and RPG.GRID_GRADATION_NUMBER = (-->
+<!--            select MAX(rpg.GRID_GRADATION_NUMBER)-->
+<!--            from RMS_MATERIAL_STEEL RMS-->
+<!--                     left join WMSP_GRID_MATERIAL WGM-->
+<!--                               on RMS.MATERIAL_STEEL_ID = WGM.MATERIAL_ID-->
+<!--                     left join RMS_PWAREHOUSE_GRID RPG-->
+<!--                               on RPG.GRID_ID = WGM.GRID_ID-->
+<!--            where WGM.DELETED = 0-->
+<!--              and RMS.MATERIAL_ID = #{materialId}-->
+<!--              and RPG.WAREHOUSE_ID = #{warehouseId})-->
+<!--    </select>-->
 
 <!--  通过月台ID 查询当前月台排队车辆数  -->
-    <select id="queueCountByPlatformId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
-        select
-            count(*) "count"
-        from QMS_QUEUE_LIST
-        where GRID_ID = #{gridId}
-          and DELETED = 0
-    </select>
+<!--    <select id="queueCountByPlatformId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">-->
+<!--        select-->
+<!--            count(*) "count"-->
+<!--        from QMS_QUEUE_LIST-->
+<!--        where GRID_ID = #{gridId}-->
+<!--          and DELETED = 0-->
+<!--    </select>-->
 
 <!--  通过订单ID查询门岗ID(可能会有多个门岗)  -->
-    <select id="queryGatepostIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
-        select RLGC.GATE_CAL_ID
-        from RMS_LINE_GATEPOST_CALCULATE RLGC
-        where RLGC.SEGMENT_ID = (select RLS.SEGMENT_ID
-                                 from OMSTRUCK_ORDER OO
-                                          left join RMS_LINE_SEGEMNT RLS
-                                                    on OO.LINE_ID = RLS.LINE_ID
-                                 where RLS.SEGMENT_SQE = 1
-                                   and OO.ORDER_ID = #{orderId})
-    </select>
+<!--    <select id="queryGatepostIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">-->
+<!--        select RLGC.GATE_CAL_ID-->
+<!--        from RMS_LINE_GATEPOST_CALCULATE RLGC-->
+<!--        where RLGC.SEGMENT_ID = (select RLS.SEGMENT_ID-->
+<!--                                 from OMSTRUCK_ORDER OO-->
+<!--                                          left join RMS_LINE_SEGEMNT RLS-->
+<!--                                                    on OO.LINE_ID = RLS.LINE_ID-->
+<!--                                 where RLS.SEGMENT_SQE = 1-->
+<!--                                   and OO.ORDER_ID = #{orderId})-->
+<!--    </select>-->
 
 <!--   通过车牌号查询已接收的订单 -->
     <select id="getOrderNumberByCapacityNumber" parameterType="string" resultType="java.util.Map">
         select OO.ORDER_NUMBER        "orderNumber",
                OO.ORDER_ID            "orderId",
+               OO.ORDER_TYPE          "orderType",
                COUNT(OOM.MATERIAL_ID) "materialNum",
                RC.CAPACITY_ID         "capacityId",
-               TTR.RESULT_TOTAL_ID    "resultTotalId"
+               TTR.RESULT_TOTAL_ID    "resultTotalId",
+               OO.INSERT_UPDATE_REMARK  "insertUpdateRemark"
         from OMSTRUCK_ORDER OO
                  left join RMS_CAPACITY RC
                            on RC.CAPACITY_ID = OO.CAPACITY_ID
@@ -130,7 +132,7 @@
                            on OO.ORDER_ID = TTR.ORDER_ID
         where RC.CAPACITY_NUMBER = #{capacityNumber}
           and OO.ORDER_STATUS = 5
-        group by OO.ORDER_NUMBER, OO.ORDER_ID, RC.CAPACITY_ID, TTR.RESULT_TOTAL_ID
+        group by OO.ORDER_NUMBER, OO.ORDER_ID, RC.CAPACITY_ID, TTR.RESULT_TOTAL_ID, OO.ORDER_TYPE, OO.INSERT_UPDATE_REMARK
     </select>
 
     <select id="getPersonnelNameBySSoId" parameterType="string" resultType="java.lang.String">