框计算

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.AmsshipCargoTransferResult;
 import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
 import com.steerinfo.dil.model.OmsshipShipmentInstructions;
@@ -16,6 +18,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.math.BigDecimal;
 import java.util.Map;
@@ -41,6 +44,8 @@ public class AmsshipCargoTransferResultController extends BaseRESTfulController
     IAmsshipCargoTransferResultService amsshipCargoTransferResultService;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    ESFeign esFeign;
     @ApiOperation(value="展示货权转移表", notes="分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -48,15 +53,45 @@ public class AmsshipCargoTransferResultController extends BaseRESTfulController
             @ApiImplicitParam(name = "apiId", value = "66", required = false, dataType = "BigDecimal"),
     })
     @PostMapping(value = "/getAmsshipCargoTranferResultList")
-    public RESTfulResult getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String,Object> mapVal,
+    public RESTfulResult getAmsshipCargoTranferResultList(@RequestBody(required = false) Map<String,Object> mapValue,
                                                           Integer pageNum,
                                                           Integer pageSize,
-                                                          Integer apiId){
-        List<Map<String,Object>> list = amsshipCargoTransferResultService.seletCargoTransfer(mapVal);
+                                                          Integer apiId,
+                                                          String con){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_ship_cargo_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> listTotal = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue.size() == 0) {
+            //将查询结果存入索引中
+            listTotal = amsshipCargoTransferResultService.seletCargoTransfer(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_ship_cargo_list");
+            //添加id
+            map.put("indexId", "cargoTransferResultId");
+            listTotal.add(map);
+            //新建索引
+            String s = JSON.toJSONString(listTotal);
+            esFeign.insertIndex(listTotal);
+            //删除
+            listTotal.remove(listTotal.size() - 1);
+        }
+        if (listTotal == null) {
+            listTotal = amsshipCargoTransferResultService.seletCargoTransfer(mapValue);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
-        List<Map<String, Object>> columnList = amsshipCargoTransferResultService.seletCargoTransfer(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        List<Map<String, Object>> columnList = amsshipCargoTransferResultService.seletCargoTransfer(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
         return success(data);
     }
     //新增

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.AmsshipCargoTransferResult;
 import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
 import com.steerinfo.dil.model.AmsshipDeliveryNotice;
@@ -46,6 +48,8 @@ public class AmsshipDeliveryAttorneyController extends BaseRESTfulController {
     IAmsshipDeliveryAttorneyService amsshipDeliveryAttorneyService;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    ESFeign esFeign;
     @ApiOperation(value="展示提货委托表", notes="分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -56,13 +60,42 @@ public class AmsshipDeliveryAttorneyController extends BaseRESTfulController {
     public RESTfulResult getAmsshipDeliveryAttroneyList(@RequestBody(required = false) Map<String,Object> mapVal,
                                                         Integer pageNum,
                                                         Integer pageSize,
-                                                        Integer apiId
-    ){
-        List<Map<String,Object>> list = amsshipDeliveryAttorneyService.selectshipCargoTranferResult(mapVal);
+                                                        Integer apiId,
+                                                        String con){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_ship_delivery_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> listTotal = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapVal.size() == 0) {
+            //将查询结果存入索引中
+            listTotal = amsshipDeliveryAttorneyService.selectshipCargoTranferResult(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_ship_delivery_list");
+            //添加id
+            map.put("indexId", "attorneyId");
+            listTotal.add(map);
+            //新建索引
+            String s = JSON.toJSONString(listTotal);
+            esFeign.insertIndex(listTotal);
+            //删除
+            listTotal.remove(listTotal.size() - 1);
+        }
+        if (listTotal == null) {
+            listTotal = amsshipDeliveryAttorneyService.selectshipCargoTranferResult(mapVal);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
-        List<Map<String, Object>> columnList =amsshipDeliveryAttorneyService.selectshipCargoTranferResult(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        List<Map<String, Object>> columnList = amsshipDeliveryAttorneyService.selectshipCargoTranferResult(mapVal);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
         return success(data);
     }
 

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.AmsshipDeliveryAttorney;
 import com.steerinfo.dil.model.AmsshipDeliveryNotice;
 import com.steerinfo.dil.model.OmsshipShipmentInstructions;
@@ -43,6 +45,8 @@ public class AmsshipDeliveryNoticeController extends BaseRESTfulController {
     IAmsshipDeliveryNoticeService amsshipDeliveryNoticeService;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    ESFeign esFeign;
     @ApiOperation(value="展示发货通知单表", notes="分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -53,12 +57,42 @@ public class AmsshipDeliveryNoticeController extends BaseRESTfulController {
     public RESTfulResult getshipDeliveryNoticeList(@RequestBody(required = false) Map<String,Object> mapVal,
                                                    Integer pageNum,
                                                    Integer pageSize,
-                                                   Integer apiId){
-        List<Map<String,Object>> list = amsshipDeliveryNoticeService.selectShipDeliveryNotice(mapVal);
+                                                   Integer apiId,
+                                                   String con){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_ship_delivery_notice_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> listTotal = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapVal.size() == 0) {
+            //将查询结果存入索引中
+            listTotal = amsshipDeliveryNoticeService.selectShipDeliveryNotice(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_ship_delivery_notice_list");
+            //添加id
+            map.put("indexId", "noticeId");
+            listTotal.add(map);
+            //新建索引
+            String s = JSON.toJSONString(listTotal);
+            esFeign.insertIndex(listTotal);
+            //删除
+            listTotal.remove(listTotal.size() - 1);
+        }
+        if (listTotal == null) {
+            listTotal = amsshipDeliveryNoticeService.selectShipDeliveryNotice(mapVal);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = amsshipDeliveryNoticeService.selectShipDeliveryNotice(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, listTotal, columnList);
         return success(data);
     }
     //新增

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.OmsshipInstructionsCapacity;
 import com.steerinfo.dil.model.OmsshipShipmentInstructions;
 import com.steerinfo.dil.model.TmsshipBargeOperation;
@@ -43,7 +44,8 @@ public class OmsshipInstructionsCapacityController extends BaseRESTfulController
     IOmsshipInstructionsCapacityService omsshipInstructionsCapacityService;
     @Autowired
     ColumnDataUtil columnDataUtil;
-
+    @Autowired
+    ESFeign esFeign;
     /**
      * 获取运单id
      * @return

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
@@ -42,7 +44,8 @@ public class OmsshipShipmentInstructionsController extends BaseRESTfulController
     IOmsshipShipmentInstructionsService omsshipShipmentInstructionsService;
     @Autowired
     ColumnDataUtil columnDataUtil;
-
+    @Autowired
+    ESFeign esFeign;
     /**
      * 新增
      * @param omsshipShipmentInstructions
@@ -115,13 +118,44 @@ public class OmsshipShipmentInstructionsController extends BaseRESTfulController
     public RESTfulResult getShipMentInstructionsList(@RequestBody(required = false) Map<String,Object> mapVal,
                                                      Integer pageNum,
                                                      Integer pageSize,
-                                                     Integer apiId){
-        List<Map<String,Object>> list = omsshipShipmentInstructionsService.selectAll(mapVal);
+                                                     Integer apiId,
+                                                     String con){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_ship_instruction_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> detailListTotal = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapVal == null) {
+            //将查询结果存入索引中
+            detailListTotal = omsshipShipmentInstructionsService.selectAll(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_ship_instruction_list");
+            //添加id
+            map.put("indexId", "shipmentInstructionsId");
+            detailListTotal.add(map);
+            //新建索引
+            String s = JSON.toJSONString(detailListTotal);
+            esFeign.insertIndex(detailListTotal);
+            //删除
+            detailListTotal.remove(detailListTotal.size() - 1);
+        }
+        if (detailListTotal == null) {
+            detailListTotal = omsshipShipmentInstructionsService.selectAll(mapVal);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = omsshipShipmentInstructionsService.selectAll(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, detailListTotal, columnList);
         return success(data);
+
     }
 
     /**

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmsshipBargeOperation;
 import com.steerinfo.dil.model.TmsshipShipLocation;
 import com.steerinfo.dil.service.ITmsshipBargeOperationService;
@@ -42,6 +44,8 @@ public class TmsshipBargeOperationController extends BaseRESTfulController {
     ITmsshipBargeOperationService tmsshipBargeOperationService;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    ESFeign esFeign;
     /**
      * 新增驳船作业
      * @param map
@@ -134,14 +138,45 @@ public class TmsshipBargeOperationController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getBargeOperationList")
     public RESTfulResult getBargeOperationList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId){
-        List<Map<String,Object>> list = tmsshipBargeOperationService.selectBargeOperationList(mapVal);
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_barge_operation_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> detailListTotal = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapVal == null) {
+            //将查询结果存入索引中
+            detailListTotal = tmsshipBargeOperationService.selectBargeOperationList(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_barge_operation_list");
+            //添加id
+            map.put("indexId", "bargeOperationId");
+            detailListTotal.add(map);
+            //新建索引
+            String s = JSON.toJSONString(detailListTotal);
+            esFeign.insertIndex(detailListTotal);
+            //删除
+            detailListTotal.remove(detailListTotal.size() - 1);
+        }
+        if (detailListTotal == null) {
+            detailListTotal = tmsshipBargeOperationService.selectBargeOperationList(mapVal);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = tmsshipBargeOperationService.selectBargeOperationList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, detailListTotal, columnList);
         return success(data);
+
     }
 }

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmsshipEntryWharyResult;
 import com.steerinfo.dil.service.ITmsshipEntryWharyResultService;
 import com.steerinfo.dil.service.impl.TmsshipEntryWharyResultServiceImpl;
@@ -32,7 +33,8 @@ public class TmsshipEntryWharyResultController extends BaseRESTfulController {
     @Autowired
     TmsshipTotalResultServiceImpl tmsshipTotalResultService;
 
-
+    @Autowired
+    ESFeign esFeign;
     /**
      * 新增抵达实绩
      * @param mapVal

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmsshipLoadShipResult;
 import com.steerinfo.dil.model.TmsshipShipLocation;
 import com.steerinfo.dil.service.ITmsshipLoadShipResultService;
@@ -42,7 +44,8 @@ public class TmsshipLoadShipResultController extends BaseRESTfulController {
     ITmsshipLoadShipResultService tmsshipLoadShipResultService;
     @Autowired
     ColumnDataUtil columnDataUtil;
-
+    @Autowired
+    ESFeign esFeign;
     /**
      * 新增装船作业(附带新增装船卸船)
      * @param map
@@ -135,14 +138,44 @@ public class TmsshipLoadShipResultController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getLoadShipList")
     public RESTfulResult getLoadShipList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                             Integer pageNum,
-                                             Integer pageSize,
-                                             Integer apiId){
-        List<Map<String,Object>> list = tmsshipLoadShipResultService.selectLoadShipList(mapVal);
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                         Integer apiId,
+                                         String con){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_load_ship_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> detailListTotal = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapVal == null) {
+            //将查询结果存入索引中
+            detailListTotal = tmsshipLoadShipResultService.selectLoadShipList(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_load_ship_list");
+            //添加id
+            map.put("indexId", "resultId");
+            detailListTotal.add(map);
+            //新建索引
+            String s = JSON.toJSONString(detailListTotal);
+            esFeign.insertIndex(detailListTotal);
+            //删除
+            detailListTotal.remove(detailListTotal.size() - 1);
+        }
+        if (detailListTotal == null) {
+            detailListTotal = tmsshipLoadShipResultService.selectLoadShipList(mapVal);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = tmsshipLoadShipResultService.selectLoadShipList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, detailListTotal, columnList);
         return success(data);
     }
 

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

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmsshipEntryWharyResult;
 import com.steerinfo.dil.model.TmsshipOutWharyResult;
 import com.steerinfo.dil.service.ITmsshipOutWharyResultService;
@@ -29,7 +30,8 @@ public class TmsshipOutWharyResultController extends BaseRESTfulController {
 
     @Autowired
     TmsshipOutWharyResultServiceImpl tmsshipOutWharyResultService;
-
+    @Autowired
+    ESFeign esFeign;
     /**
      * 新增离港实绩
      * @param mapVal

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmsshipShipLocation;
 import com.steerinfo.dil.service.ITmsshipShipLocationService;
 import com.steerinfo.dil.service.impl.TmsshipShipLocationServiceImpl;
@@ -45,7 +47,8 @@ public class TmsshipShipLocationController extends BaseRESTfulController {
     TmsshipTotalResultServiceImpl tmsshipTotalResultService;
     @Autowired
     ColumnDataUtil columnDataUtil;
-
+    @Autowired
+    ESFeign esFeign;
 
     /**
      * 新增位置作业
@@ -139,14 +142,45 @@ public class TmsshipShipLocationController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getShipLocationList")
     public RESTfulResult getShipLocationList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer apiId){
-        List<Map<String,Object>> list = tmsshipShipLocationService.selectShipLocationList(mapVal);
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String con){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_ship_location_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> detailListTotal = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapVal == null) {
+            //将查询结果存入索引中
+            detailListTotal = tmsshipShipLocationService.selectShipLocationList(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_ship_location_list");
+            //添加id
+            map.put("indexId", "locationId");
+            detailListTotal.add(map);
+            //新建索引
+            String s = JSON.toJSONString(detailListTotal);
+            esFeign.insertIndex(detailListTotal);
+            //删除
+            detailListTotal.remove(detailListTotal.size() - 1);
+        }
+        if (detailListTotal == null) {
+            detailListTotal = tmsshipShipLocationService.selectShipLocationList(mapVal);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = tmsshipShipLocationService.selectShipLocationList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, detailListTotal, columnList);
         return success(data);
+
     }
 }

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.steerinfo.dil.feign.ColumnDataFeign;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmsshipTotalResult;
 import com.steerinfo.dil.service.ITmsshipTotalResultService;
 import com.steerinfo.dil.service.impl.TmsshipTotalResultServiceImpl;
@@ -45,7 +47,8 @@ public class TmsshipTotalResultController extends BaseRESTfulController {
     ColumnDataFeign columnDataFeign;
     @Autowired
     ColumnDataUtil columnDataUtil;
-
+    @Autowired
+    ESFeign esFeign;
     /**
      * 展示水路货物运单列表
      * @param mapVal
@@ -56,21 +59,52 @@ public class TmsshipTotalResultController extends BaseRESTfulController {
      */
     @ApiOperation(value="展示水路货物运单", notes="分页查询")
     @ApiImplicitParams({
-        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-        @ApiImplicitParam(name = "apiId", value = "56", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "56", required = false, dataType = "BigDecimal"),
     })
     @PostMapping(value = "/listAllOrders")
     public RESTfulResult listAllOrders(@RequestBody(required = false) Map<String,Object> mapVal,
                                        Integer pageNum,
                                        Integer pageSize,
-                                       Integer apiId){
-        List<Map<String,Object>> list = tmsshipTotalResultService.getOrderList(mapVal);
+                                       Integer apiId,
+                                       String con){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_all_order_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> detailListTotal = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapVal == null) {
+            //将查询结果存入索引中
+            detailListTotal = tmsshipTotalResultService.getOrderList(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_all_order_list");
+            //添加id
+            map.put("indexId", "resultId");
+            detailListTotal.add(map);
+            //新建索引
+            String s = JSON.toJSONString(detailListTotal);
+            esFeign.insertIndex(detailListTotal);
+            //删除
+            detailListTotal.remove(detailListTotal.size() - 1);
+        }
+        if (detailListTotal == null) {
+            detailListTotal = tmsshipTotalResultService.getOrderList(mapVal);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = tmsshipTotalResultService.getOrderList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, detailListTotal, columnList);
         return success(data);
+
     }
 
     /**

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmsshipLoadShipResult;
 import com.steerinfo.dil.model.TmsshipUnloadShipResult;
 import com.steerinfo.dil.service.ITmsshipUnloadShipResultService;
@@ -42,7 +44,8 @@ public class TmsshipUnloadShipResultController extends BaseRESTfulController {
     ITmsshipUnloadShipResultService tmsshipUnloadShipResultService;
     @Autowired
     ColumnDataUtil columnDataUtil;
-
+    @Autowired
+    ESFeign esFeign;
     /**
      * 新增卸船作业
      * @param map
@@ -135,15 +138,46 @@ public class TmsshipUnloadShipResultController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getUnLoadShipList")
     public RESTfulResult getUnLoadShipList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                         Integer apiId){
-        List<Map<String,Object>> list = tmsshipUnloadShipResultService.selectUnloadShipList(mapVal);
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId,
+                                           String con){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_unLoad_ship_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> detailListTotal = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapVal == null) {
+            //将查询结果存入索引中
+            detailListTotal = tmsshipUnloadShipResultService.selectUnloadShipList(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_unLoad_ship_list");
+            //添加id
+            map.put("indexId", "resultId");
+            detailListTotal.add(map);
+            //新建索引
+            String s = JSON.toJSONString(detailListTotal);
+            esFeign.insertIndex(detailListTotal);
+            //删除
+            detailListTotal.remove(detailListTotal.size() - 1);
+        }
+        if (detailListTotal == null) {
+            detailListTotal = tmsshipUnloadShipResultService.selectUnloadShipList(mapVal);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = tmsshipUnloadShipResultService.selectUnloadShipList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, detailListTotal, columnList);
         return success(data);
+
     }
 
 }

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

@@ -1,5 +1,7 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmsshipLoadShipResult;
 import com.steerinfo.dil.model.TmsshipWaterQualityResult;
 import com.steerinfo.dil.service.ITmsshipWaterQualityResultService;
@@ -42,7 +44,8 @@ public class TmsshipWaterQualityResultController extends BaseRESTfulController {
     ITmsshipWaterQualityResultService tmsshipWaterQualityResultService;
     @Autowired
     ColumnDataUtil columnDataUtil;
-
+    @Autowired
+    ESFeign esFeign;
     /**
      * 新增水分质检作业
      * @param map
@@ -135,15 +138,46 @@ public class TmsshipWaterQualityResultController extends BaseRESTfulController {
     })
     @PostMapping(value = "/getWaterQualityResultList")
     public RESTfulResult getWaterQualityResultList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                         Integer apiId){
-        List<Map<String,Object>> list = tmsshipWaterQualityResultService.selectWaterQualityList(mapVal);
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer apiId,
+                                                   String con){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_water_quality_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapVal,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> detailListTotal = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapVal == null) {
+            //将查询结果存入索引中
+            detailListTotal = tmsshipWaterQualityResultService.selectWaterQualityList(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_water_quality_list");
+            //添加id
+            map.put("indexId", "resultId");
+            detailListTotal.add(map);
+            //新建索引
+            String s = JSON.toJSONString(detailListTotal);
+            esFeign.insertIndex(detailListTotal);
+            //删除
+            detailListTotal.remove(detailListTotal.size() - 1);
+        }
+        if (detailListTotal == null) {
+            detailListTotal = tmsshipWaterQualityResultService.selectWaterQualityList(mapVal);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = tmsshipWaterQualityResultService.selectWaterQualityList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, detailListTotal, columnList);
         return success(data);
+
     }
 
 }

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);
+}