qms添加框计算

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
@@ -39,6 +40,9 @@ public class QmsQueueListController extends BaseRESTfulController {
     @Autowired
     ColumnDataUtil columnDataUtil;
 
+    @Autowired
+    ESFeign esFeign;
+
     @ApiOperation(value="指令接收-->新增排队链表：需要运输订单号")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
@@ -95,15 +99,41 @@ public class QmsQueueListController extends BaseRESTfulController {
             @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
+                                           Integer pageSize,
+                                           String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allListMonitor = qmsQueueListService.listMonitor(mapValue);
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_list_monitor";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> allListMonitor = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 0){
+            //将查询结果存入索引中
+            allListMonitor = qmsQueueListService.listMonitor(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_list_monitor");
+            //添加id
+            map.put("indexId","listId");
+            allListMonitor.add(map);
+            //新建索引
+            esFeign.insertIndex(allListMonitor);
+            //删除
+            allListMonitor.remove(allListMonitor.size()-1);
+        }
+        if(allListMonitor == null)
+            allListMonitor = qmsQueueListService.listMonitor(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> listMonitor = qmsQueueListService.listMonitor(mapValue);
@@ -128,15 +158,42 @@ public class QmsQueueListController extends BaseRESTfulController {
             @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
+                                     Integer pageSize,
+                                     String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allListMonitor = qmsQueueListService.warehouseListMonitor(mapValue);
+
+        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);

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.controller;
 
 
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.QmsQueueResult;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -38,6 +40,9 @@ public class QmsQueueResultController extends BaseRESTfulController {
     @Autowired
     ColumnDataUtil columnDataUtil;
 
+    @Autowired
+    ESFeign esFeign;
+
     @ApiOperation(value="触发电子围栏-->新增排队实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
@@ -59,14 +64,40 @@ public class QmsQueueResultController extends BaseRESTfulController {
     public RESTfulResult getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
-                                               Integer pageSize
+                                               Integer pageSize,
+                                               String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allQueueApply = qmsQueueResultService.getQueueApply(mapValue);
+
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_queue_apply";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> allQueueApply = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 0){
+            //将查询结果存入索引中
+            allQueueApply = qmsQueueResultService.getQueueApply(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_queue_apply");
+            //添加id
+            map.put("indexId","queueId");
+            allQueueApply.add(map);
+            //新建索引
+            esFeign.insertIndex(allQueueApply);
+            //删除
+            allQueueApply.remove(allQueueApply.size()-1);
+        }
+        if(allQueueApply == null)
+            allQueueApply = qmsQueueResultService.getQueueApply(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> queueApply = qmsQueueResultService.getQueueApply(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQueueApply,queueApply);
+        List<Map<String, Object>> listMonitor = qmsQueueResultService.getQueueApply(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQueueApply,listMonitor);
         return success(pageList);
     }
 
@@ -84,21 +115,46 @@ public class QmsQueueResultController extends BaseRESTfulController {
                                        Integer pageNum,
                                        Integer pageSize,
                                        Integer orderType,
-                                       Integer status
+                                       Integer status,
+                                       String con
     ){
         if(mapValue == null){
             mapValue = new HashMap<>();
         }
         mapValue.put("orderTypee", orderType);
         mapValue.put("orderStatus", status);
-
-        //不分页筛选数据
-        List<Map<String, Object>> AllExecutionOrder = qmsQueueResultService.getAllExecutionOrder(mapValue);
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_all_execution";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> AllExecutionOrder = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 2){
+            //将查询结果存入索引中
+            AllExecutionOrder = qmsQueueResultService.getAllExecutionOrder(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_all_execution");
+            //添加id
+            map.put("indexId","executionId");
+            AllExecutionOrder.add(map);
+            //新建索引
+            esFeign.insertIndex(AllExecutionOrder);
+            //删除
+            AllExecutionOrder.remove(AllExecutionOrder.size()-1);
+        }
+        if(AllExecutionOrder == null)
+            AllExecutionOrder = qmsQueueResultService.getAllExecutionOrder(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> executionOrder = qmsQueueResultService.getAllExecutionOrder(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllExecutionOrder,executionOrder);
         return success(pageList);
+
     }
 
 
@@ -114,16 +170,42 @@ public class QmsQueueResultController extends BaseRESTfulController {
                                        Integer apiId,
                                        Integer pageNum,
                                        Integer pageSize,
-                                       Integer queueType
+                                       Integer queueType,
+                                       String con
     ){
         mapValue.put("queueType", queueType);
-        //不分页筛选数据
-        List<Map<String, Object>> allOrderReceive = qmsQueueResultService.orderReceive(mapValue);
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_order_receive";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> AllOrderReceive = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            AllOrderReceive = qmsQueueResultService.orderReceive(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_order_receive");
+            //添加id
+            map.put("indexId","receiveId");
+            AllOrderReceive.add(map);
+            //新建索引
+            esFeign.insertIndex(AllOrderReceive);
+            //删除
+            AllOrderReceive.remove(AllOrderReceive.size()-1);
+        }
+        if(AllOrderReceive == null)
+            AllOrderReceive = qmsQueueResultService.orderReceive(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> orderReceive = qmsQueueResultService.orderReceive(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allOrderReceive,orderReceive);
+        List<Map<String, Object>> executionOrder = qmsQueueResultService.orderReceive(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllOrderReceive,executionOrder);
         return success(pageList);
+
     }
 
     @ApiOperation(value="查询排队开始 网格Id视情况而给 可不给")
@@ -140,17 +222,46 @@ public class QmsQueueResultController extends BaseRESTfulController {
                                        Integer apiId,
                                        Integer pageNum,
                                        Integer pageSize,
-                                       Integer gridId
+                                       Integer gridId,
+                                       String con
     ){
+        int count = 0;
         if(gridId != null){
             mapValue.put("gridId", gridId);
+            count++;
+        }
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_queue_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
         }
-        //不分页筛选数据
-        List<Map<String, Object>> allQueueApply = qmsQueueResultService.getQueueListByQueueUp(mapValue);
+        List<Map<String, Object>> AllQueueList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == count){
+            //将查询结果存入索引中
+            AllQueueList = qmsQueueResultService.getQueueListByQueueUp(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_queue_list");
+            //添加id
+            map.put("indexId","queueListId");
+            AllQueueList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(AllQueueList);;
+            //新建索引
+            esFeign.insertIndex(AllQueueList);
+            //删除
+            AllQueueList.remove(AllQueueList.size()-1);
+        }
+        if(AllQueueList == null)
+            AllQueueList = qmsQueueResultService.getQueueListByQueueUp(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> queueApply = qmsQueueResultService.getQueueListByQueueUp(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQueueApply,queueApply);
+        List<Map<String, Object>> queueListByQueueUp = qmsQueueResultService.getQueueListByQueueUp(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllQueueList,queueListByQueueUp);
         return success(pageList);
     }
 
@@ -166,17 +277,44 @@ public class QmsQueueResultController extends BaseRESTfulController {
                                                  Integer apiId,
                                                  Integer pageNum,
                                                  Integer pageSize,
-                                                 Integer gatepostId
-    ){
+                                                 Integer gatepostId,
+                                                 String con
+    ){   int count = 0;
         if(gatepostId != null){
             mapValue.put("gatepostId", gatepostId);
+            count++;
         }
-        //不分页筛选数据
-        List<Map<String, Object>> allQueueApply = qmsQueueResultService.getQueueMes(mapValue);
+
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_queue_mes";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> AllQueueMes = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == count){
+            //将查询结果存入索引中
+            AllQueueMes = qmsQueueResultService.getQueueMes(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_queue_mes");
+            //添加id
+            map.put("indexId","queueMesId");
+            AllQueueMes.add(map);
+            //新建索引
+            esFeign.insertIndex(AllQueueMes);
+            //删除
+            AllQueueMes.remove(AllQueueMes.size()-1);
+        }
+        if(AllQueueMes == null)
+            AllQueueMes = qmsQueueResultService.getQueueMes(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> queueApply = qmsQueueResultService.getQueueMes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQueueApply,queueApply);
+        List<Map<String, Object>> queueMes = qmsQueueResultService.getQueueMes(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllQueueMes,queueMes);
         return success(pageList);
     }
 
@@ -198,14 +336,40 @@ public class QmsQueueResultController extends BaseRESTfulController {
     public RESTfulResult getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
                                                Integer apiId,
                                                Integer pageNum,
-                                               Integer pageSize
+                                               Integer pageSize,
+                                               String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allChangeQueueMes = qmsQueueResultService.getChangeQueueMes(mapValue);
+
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_change_queue";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> AllChangeQueue = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 0){
+            //将查询结果存入索引中
+            AllChangeQueue = qmsQueueResultService.getChangeQueueMes(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_change_queue");
+            //添加id
+            map.put("indexId","changeQueueId");
+            AllChangeQueue.add(map);
+            //新建索引
+            esFeign.insertIndex(AllChangeQueue);
+            //删除
+            AllChangeQueue.remove(AllChangeQueue.size()-1);
+        }
+        if(AllChangeQueue == null)
+            AllChangeQueue = qmsQueueResultService.getChangeQueueMes(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> changeQueueMes = qmsQueueResultService.getChangeQueueMes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allChangeQueueMes,changeQueueMes);
+        List<Map<String, Object>> changeQueueMes1 = qmsQueueResultService.getChangeQueueMes(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllChangeQueue,changeQueueMes1);
         return success(pageList);
     }
 
@@ -221,17 +385,44 @@ public class QmsQueueResultController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer gatepostId
-    ){
-        if(gatepostId != null){
+                                               Integer gatepostId,
+                                               String con
+    ){   int count=0;
+         if(gatepostId != null){
             mapValue.put("gatepostId", gatepostId);
+            count++;
+        }
+
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_queue_cancel";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> AllQueueCancel = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == count){
+            //将查询结果存入索引中
+            AllQueueCancel = qmsQueueResultService.getQueueCancel(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_queue_cancel");
+            //添加id
+            map.put("indexId","queueCancelId");
+            AllQueueCancel.add(map);
+            //新建索引
+            esFeign.insertIndex(AllQueueCancel);
+            //删除
+            AllQueueCancel.remove(AllQueueCancel.size()-1);
         }
-        //不分页筛选数据
-        List<Map<String, Object>> allQueueCancel = qmsQueueResultService.getQueueCancel(mapValue);
+        if(AllQueueCancel == null)
+            AllQueueCancel = qmsQueueResultService.getQueueCancel(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> queueCancel = qmsQueueResultService.getQueueCancel(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQueueCancel,queueCancel);
+        List<Map<String, Object>> queueCancel1 = qmsQueueResultService.getQueueCancel(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllQueueCancel,queueCancel1);
         return success(pageList);
     }
 
@@ -266,15 +457,42 @@ public class QmsQueueResultController extends BaseRESTfulController {
     public RESTfulResult getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
                                         Integer apiId,
                                         Integer pageNum,
-                                        Integer pageSize
+                                        Integer pageSize,
+                                        String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allInsetResult = qmsQueueResultService.getQueueInsert(mapValue);
+
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_queue_insert";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> AllQueueInsert = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 0){
+            //将查询结果存入索引中
+            AllQueueInsert = qmsQueueResultService.getQueueInsert(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_queue_insert");
+            //添加id
+            map.put("indexId","queueInsertId");
+            AllQueueInsert.add(map);
+            //新建索引
+            esFeign.insertIndex(AllQueueInsert);
+            //删除
+            AllQueueInsert.remove(AllQueueInsert.size()-1);
+        }
+        if(AllQueueInsert == null)
+            AllQueueInsert = qmsQueueResultService.getQueueInsert(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> insertResult = qmsQueueResultService.getQueueInsert(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allInsetResult,insertResult);
+        List<Map<String, Object>> queueInsert = qmsQueueResultService.getQueueInsert(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllQueueInsert,queueInsert);
         return success(pageList);
+
     }
 
     @ApiOperation(value="查询排队结束")
@@ -288,21 +506,47 @@ public class QmsQueueResultController extends BaseRESTfulController {
     public RESTfulResult getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
-                                              Integer pageSize
+                                              Integer pageSize,
+                                              String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allQueueEndResult = qmsQueueResultService.getQueueEndResult(mapValue);
+
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_queue_endresult";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> AllQueueEndInsert = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 0){
+            //将查询结果存入索引中
+            AllQueueEndInsert = qmsQueueResultService.getQueueEndResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_queue_endresult");
+            //添加id
+            map.put("indexId","queueEndResultId");
+            AllQueueEndInsert.add(map);
+            //新建索引
+            esFeign.insertIndex(AllQueueEndInsert);
+            //删除
+            AllQueueEndInsert.remove(AllQueueEndInsert.size()-1);
+        }
+        if(AllQueueEndInsert == null)
+            AllQueueEndInsert = qmsQueueResultService.getQueueEndResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> queueEndResult = qmsQueueResultService.getQueueEndResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allQueueEndResult,queueEndResult);
+        List<Map<String, Object>> queueEndInsert = qmsQueueResultService.getQueueEndResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllQueueEndInsert,queueEndInsert);
         return success(pageList);
     }
 
     @ApiOperation(value="汽车监控(仓库)")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(135、)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId(135)", value = "动态表头", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
@@ -311,16 +555,44 @@ public class QmsQueueResultController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer gridType
+                                           Integer gridType,
+                                           String con
     ){
         mapValue.put("gridType", gridType);
-        //不分页筛选数据
-        List<Map<String, Object>> allCapacityMonitor = qmsQueueResultService.capacityMonitor(mapValue);
+
+
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_capacity_monitor";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> AllCapacityMonitor = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            AllCapacityMonitor = qmsQueueResultService.capacityMonitor(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_capacity_monitor");
+            //添加id
+            map.put("indexId","capacityMonitorId");
+            AllCapacityMonitor.add(map);
+            //新建索引
+            esFeign.insertIndex(AllCapacityMonitor);
+            //删除
+            AllCapacityMonitor.remove(AllCapacityMonitor.size()-1);
+        }
+        if(AllCapacityMonitor == null)
+            AllCapacityMonitor = qmsQueueResultService.capacityMonitor(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> capacityMonitor = qmsQueueResultService.capacityMonitor(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacityMonitor,capacityMonitor);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllCapacityMonitor,capacityMonitor);
         return success(pageList);
+
     }
 
 
@@ -364,14 +636,41 @@ public class QmsQueueResultController extends BaseRESTfulController {
     public RESTfulResult getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
                                        Integer apiId,
                                        Integer pageNum,
-                                       Integer pageSize
+                                       Integer pageSize,
+                                       String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allWarehouseQueueApply = qmsQueueResultService.getWarehouseQueueApply(mapValue);
+
+
+        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>> warehouseQueueApply = qmsQueueResultService.getWarehouseQueueApply(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allWarehouseQueueApply,warehouseQueueApply);
+        List<Map<String, Object>> warehouseQueueApply1= qmsQueueResultService.getWarehouseQueueApply(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueue,warehouseQueueApply1);
         return success(pageList);
     }
 
@@ -386,14 +685,41 @@ public class QmsQueueResultController extends BaseRESTfulController {
     public RESTfulResult getWarehouseQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
                                                 Integer apiId,
                                                 Integer pageNum,
-                                                Integer pageSize
+                                                Integer pageSize,
+                                                String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allWarehouseQueueApply = qmsQueueResultService.getWarehouseQueueListByQueueUp(mapValue);
+
+
+        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>> warehouseQueueApply = qmsQueueResultService.getWarehouseQueueListByQueueUp(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allWarehouseQueueApply,warehouseQueueApply);
+        List<Map<String, Object>> warehouseQueueList= qmsQueueResultService.getWarehouseQueueListByQueueUp(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueueList,warehouseQueueList);
         return success(pageList);
     }
 
@@ -409,17 +735,46 @@ public class QmsQueueResultController extends BaseRESTfulController {
                                                         Integer apiId,
                                                         Integer pageNum,
                                                         Integer pageSize,
-                                                        Integer platformId
+                                                        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>> allWarehouseQueueApply = qmsQueueResultService.getWarehouseQueueMes(mapValue);
+        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>> warehouseQueueApply = qmsQueueResultService.getWarehouseQueueMes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allWarehouseQueueApply,warehouseQueueApply);
+        List<Map<String, Object>> warehouseQueueList= qmsQueueResultService.getWarehouseQueueMes(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueueMes,warehouseQueueList);
         return success(pageList);
     }
 
@@ -442,15 +797,43 @@ public class QmsQueueResultController extends BaseRESTfulController {
     public RESTfulResult getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
                                                  Integer apiId,
                                                  Integer pageNum,
-                                                 Integer pageSize
+                                                 Integer pageSize,
+                                                 String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allWarehouseQueueChange = qmsQueueResultService.getWarehouseQueueChange(mapValue);
+
+
+        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>> warehouseQueueChange = qmsQueueResultService.getWarehouseQueueChange(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allWarehouseQueueChange,warehouseQueueChange);
+        List<Map<String, Object>> warehouseQueueList= qmsQueueResultService.getWarehouseQueueChange(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, AllWarehouseQueueChange,warehouseQueueList);
         return success(pageList);
+
     }
 
     @ApiOperation(value="查询仓库排队结束")
@@ -464,15 +847,41 @@ public class QmsQueueResultController extends BaseRESTfulController {
     public RESTfulResult getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
                                                  Integer apiId,
                                                  Integer pageNum,
-                                                 Integer pageSize
+                                                 Integer pageSize,
+                                                 String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allWarehouseQueueEndMes = qmsQueueResultService.getWarehouseQueueEndMes(mapValue);
+        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>> warehouseQueueEndMes = qmsQueueResultService.getWarehouseQueueEndMes(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, warehouseQueueEndMes,allWarehouseQueueEndMes);
+        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

@@ -0,0 +1,32 @@
+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/resources/bootstrap.yml

@@ -50,9 +50,9 @@ eureka:
 #feign设置
 openfeign:
   ESFeign:
-    url: ${ESFEIGN_URL:localhost:8089}
+    url: ${ESFEIGN_URL:172.16.33.161:8089}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
+    url: ${COLUMNDATAFEIGN_URL:172.16.33.161:8083}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:localhost:8088}