'火运后端应用框计算'

src/main/java/com/steerinfo/dil/controller/TmstrainLoadingResultController.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.TmstrainLoadingResult;
 import com.steerinfo.dil.service.ITmstrainLoadingResultService;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -22,6 +24,7 @@ import java.util.Map;
 
 /**
  * TmstrainLoadingResult RESTful接口：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2021-08-30 02:23
  * 类描述
@@ -30,8 +33,8 @@ import java.util.Map;
  * 作者：generator
  * 参考：
  * 描述：TmstrainLoadingResult RESTful接口
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @RestController
 @RequestMapping("/${api.version}/tmstrainloadingresults")
@@ -43,38 +46,81 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
     @Autowired
     ColumnDataFeign columnDataFeign;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
-    @ApiOperation(value="查询装车作业信息")
+    @ApiOperation(value = "查询装车作业信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(58)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping("/getTmstrainWagonLoad")
-    public RESTfulResult getTmstrainWagonLoad(@RequestBody(required=false) Map<String,Object> mapValue,
+    public RESTfulResult getTmstrainWagonLoad(@RequestBody(required = false) Map<String, Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              Integer resultType){
-        mapValue.put("resultType", resultType);
-        List<Map<String, Object>> tmstrainWagonLoad = tmstrainLoadingResultService.getTmstrainWagonLoad(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
+                                              Integer resultType) {
+        //初始化过滤
+        List<Map<String, Object>> wagonLoadList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue == null) {
+            mapValue.put("resultType", resultType);
+            //将查询结果存入索引中
+            wagonLoadList = tmstrainLoadingResultService.getTmstrainWagonLoad(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_tmstrain_wagon_load");
+            //添加id
+            map.put("indexId", "resultId1");
+            wagonLoadList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(wagonLoadList);
+            esFeign.insertIndex(wagonLoadList);
+            //删除
+            wagonLoadList.remove(wagonLoadList.size() - 1);
+        }
+        if (wagonLoadList == null) {
+            mapValue.put("resultType", resultType);
+            wagonLoadList = tmstrainLoadingResultService.getTmstrainWagonLoad(mapValue);
+        }
+        PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> tmstrainWagonLoad1 = tmstrainLoadingResultService.getTmstrainWagonLoad(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, tmstrainWagonLoad,tmstrainWagonLoad1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, wagonLoadList, tmstrainWagonLoad1);
         return success(pageList);
     }
 
+    @PostMapping("/getTmstrainWagonLoad/{apiId}")
+    public RESTfulResult getTmstrainWagonLoadByCon(@PathVariable("apiId") Integer apiId,
+                                                   @RequestBody(required = false) Map<String, Object> mapValue,
+                                                   Integer pageNum,
+                                                   Integer pageSize,
+                                                   Integer resultType,
+                                                   String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("resultType", resultType);
+        //设置要查询的索引名称
+        String index = "get_tmstrain_wagon_load";
+        //获取查询结果
+        PageListAdd list = esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con);
+        return success(list);
+    }
+
     /**
      * 新增车皮装车作业实绩
+     *
      * @param tmstrainLoadingResult
      * @return
      */
-    @ApiOperation(value="新增车皮装车作业实绩")
+    @ApiOperation(value = "新增车皮装车作业实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstrainLoadingResult", value = "车皮装车对象", required = false, dataType = "TmstrainLoadingResult")
     })
     @PostMapping(value = "/insertTmstrainLoadingResult")
-    public RESTfulResult insertTmstrainLoadingResult(@RequestBody(required = false) TmstrainLoadingResult tmstrainLoadingResult){
+    public RESTfulResult insertTmstrainLoadingResult(@RequestBody(required = false) TmstrainLoadingResult tmstrainLoadingResult) {
 
         int i = tmstrainLoadingResultService.addTmstrainLoadingResult(tmstrainLoadingResult);
         return success(i);
@@ -82,15 +128,16 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
 
     /**
      * 通过主键查询车皮装车作业信息
+     *
      * @param resultId
      * @return
      */
-    @ApiOperation(value="通过主键查询车皮装车作业信息")
+    @ApiOperation(value = "通过主键查询车皮装车作业信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "车皮装车主键", required = false, dataType = "BigDecimal")
     })
     @PostMapping(value = "/getTmstrainLoadingResultByResultId/{resultId}")
-    public RESTfulResult getTmstrainLoadingResultByResultId(@PathVariable("resultId") BigDecimal resultId){
+    public RESTfulResult getTmstrainLoadingResultByResultId(@PathVariable("resultId") BigDecimal resultId) {
         List<Map<String, Object>> loadingResultByResultId = tmstrainLoadingResultService.getTmstrainLoadingResultByResultId(resultId);
         System.out.println(loadingResultByResultId);
         return success(loadingResultByResultId);
@@ -98,121 +145,165 @@ public class TmstrainLoadingResultController extends BaseRESTfulController {
 
     /**
      * 通过主键修改车皮装车作业实绩
+     *
      * @param tmstrainLoadingResult
      * @return
      */
-    @ApiOperation(value="通过主键修改车皮装车作业实绩")
+    @ApiOperation(value = "通过主键修改车皮装车作业实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstrainLoadingResult", value = "修改车皮装车map", required = false, dataType = "TmstrainWagonLoadResult")
     })
     @PostMapping(value = "/upadteTmstrainLoadingResultByResultId")
-    public RESTfulResult upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) TmstrainLoadingResult tmstrainLoadingResult){
+    public RESTfulResult upadteTmstrainLoadingResultByResultId(@RequestBody(required = false) TmstrainLoadingResult tmstrainLoadingResult) {
         int i = tmstrainLoadingResultService.updateTmstrainLoadingResult(tmstrainLoadingResult);
         return success(i);
     }
 
     /**
      * 通过主键删除车皮装车作业实绩
+     *
      * @param resultId
      * @return
      */
-    @ApiOperation(value="通过主键删除车皮装车作业实绩")
+    @ApiOperation(value = "通过主键删除车皮装车作业实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "主键ID", required = false, dataType = "BigDecimal")
     })
     @PostMapping(value = "/deleteTmstrainLoadingResultByResultId")
-    public RESTfulResult deleteTmstrainLoadingResultByResultId(@RequestParam BigDecimal resultId){
+    public RESTfulResult deleteTmstrainLoadingResultByResultId(@RequestParam BigDecimal resultId) {
         int i = tmstrainLoadingResultService.deleteTmstrainLoadingResultByResultId(resultId);
         return success(i);
     }
 
     /**
      * 获取发站地点名称
+     *
      * @param
      * @return
      */
-    @ApiOperation(value="获取发站地点名称")
+    @ApiOperation(value = "获取发站地点名称")
     @ApiImplicitParams({
     })
     @GetMapping(value = "/getSendStationName")
-    public RESTfulResult getSendStationName(){
+    public RESTfulResult getSendStationName() {
 
         return success(tmstrainLoadingResultService.getSendStationName());
     }
 
     /**
      * 获取到站地点名称
+     *
      * @param
      * @return
      */
-    @ApiOperation(value="获取到站地点名称")
+    @ApiOperation(value = "获取到站地点名称")
     @GetMapping(value = "/getArrivalStationName")
-    public RESTfulResult getArrivalStationName(){
+    public RESTfulResult getArrivalStationName() {
         return success(tmstrainLoadingResultService.getArrivalStationName());
     }
 
     /**
      * 获取批次ID
+     *
      * @param
      * @return
      */
-    @ApiOperation(value="获取批次ID")
+    @ApiOperation(value = "获取批次ID")
     @GetMapping(value = "/getBatchId")
-    public RESTfulResult getBatchId(){
+    public RESTfulResult getBatchId() {
         return success(tmstrainLoadingResultService.getBatchId());
     }
 
     /**
      * 获取装车车皮号
+     *
      * @param
      * @return
      */
-    @ApiOperation(value="获取装车车皮号")
+    @ApiOperation(value = "获取装车车皮号")
     @GetMapping(value = "/getWagonNo/{resultType}")
-    public RESTfulResult getWagonNo(@PathVariable("resultType") Integer resultType){
+    public RESTfulResult getWagonNo(@PathVariable("resultType") Integer resultType) {
         return success(tmstrainLoadingResultService.getWagonNo(resultType));
     }
 
 
     //内转物流新增装车
-    @ApiOperation(value="内转物流新增装车")
+    @ApiOperation(value = "内转物流新增装车")
     @GetMapping(value = "/addTrainLoadResultForConverted")
-    public RESTfulResult addTrainLoadResultForConverted(TmstrainLoadingResult tmstrainLoadingResult){
+    public RESTfulResult addTrainLoadResultForConverted(TmstrainLoadingResult tmstrainLoadingResult) {
         return success(tmstrainLoadingResultService.addTrainLoadResultForConverted(tmstrainLoadingResult));
     }
+
     /**
      * 内转物流通过主键查询车皮装车作业信息
+     *
      * @param resultId
      * @return
      */
-    @ApiOperation(value="内转物流通过主键查询车皮装车作业信息")
+    @ApiOperation(value = "内转物流通过主键查询车皮装车作业信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "车皮装车主键", required = false, dataType = "BigDecimal")
     })
     @PostMapping(value = "/selectLoadByResultId/{resultId}")
-    public RESTfulResult selectLoadByResultId(@PathVariable("resultId") BigDecimal resultId){
+    public RESTfulResult selectLoadByResultId(@PathVariable("resultId") BigDecimal resultId) {
         List<Map<String, Object>> loadingResultByResultId = tmstrainLoadingResultService.selectLoadByResultId(resultId);
         System.out.println(loadingResultByResultId);
         return success(loadingResultByResultId);
     }
+
     /**
      * 内转展示车皮装车实绩
      */
 
-    @ApiOperation(value="查询装车作业信息")
+    @ApiOperation(value = "查询装车作业信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(203)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping("/getTmstrainWagonLoadForConverted")
-    public RESTfulResult getTmstrainWagonLoadForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize){
-
-        List<Map<String, Object>> tmstrainWagonLoad = tmstrainLoadingResultService.selectLoadedForConverted(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
+    public RESTfulResult getTmstrainWagonLoadForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize) {
+        //初始化过滤
+        List<Map<String, Object>> wagonLoadForConverted = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue == null) {
+            //将查询结果存入索引中
+            wagonLoadForConverted = tmstrainLoadingResultService.selectLoadedForConverted(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_wagon_load_converted");
+            //添加id
+            map.put("indexId", "result2");
+            wagonLoadForConverted.add(map);
+            //新建索引
+            String s = JSON.toJSONString(wagonLoadForConverted);
+            esFeign.insertIndex(wagonLoadForConverted);
+            //删除
+            wagonLoadForConverted.remove(wagonLoadForConverted.size() - 1);
+        }
+        if (wagonLoadForConverted == null) {
+            wagonLoadForConverted = tmstrainLoadingResultService.selectLoadedForConverted(mapValue);
+        }
+        PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> tmstrainWagonLoad1 = tmstrainLoadingResultService.selectLoadedForConverted(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, tmstrainWagonLoad,tmstrainWagonLoad1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, wagonLoadForConverted, tmstrainWagonLoad1);
         return success(pageList);
     }
+
+    @PostMapping("/getTmstrainWagonLoadForConverted/{apiId}")
+    public RESTfulResult getWagonLoadForConvertedByCon(@PathVariable("apiId") Integer apiId,
+                                            @RequestBody(required = false) Map<String, Object> mapValue,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        //设置要查询的索引名称
+        String index = "get_wagon_load_converted";
+        //获取查询结果
+        PageListAdd list = esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con);
+        return success(list);
+    }
 }

src/main/java/com/steerinfo/dil/controller/TmstrainPleaseApproveResultController.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.TmstrainPleaseApproveResult;
 import com.steerinfo.dil.service.ITmstrainPleaseApproveResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -23,6 +25,7 @@ import java.util.Map;
 
 /**
  * TmstrainPleaseApproveResult RESTful接口：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2021-08-30 02:27
  * 类描述
@@ -31,8 +34,8 @@ import java.util.Map;
  * 作者：generator
  * 参考：
  * 描述：TmstrainPleaseApproveResult RESTful接口
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @RestController
 @RequestMapping("/${api.version}/tmstrainpleaseapproveresults")
@@ -44,7 +47,10 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
     @Autowired
     ColumnDataUtil columnDataUtil;
 
-    @ApiOperation(value="查询请车作业")
+    @Autowired
+    ESFeign esFeign;
+
+    @ApiOperation(value = "查询请车作业")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(57)", value = "动态表头", required = false, dataType = "Integer"),
@@ -53,60 +59,101 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getAllWagonPlease")
-    public RESTfulResult getAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
+    public RESTfulResult getAllWagonPlease(@RequestBody(required = false) Map<String, Object> mapValue,
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
                                            Integer status,
-                                           Integer resultType){
-        mapValue.put("status", status);
-        mapValue.put("resultType", resultType);
-        //不分页筛选数据
-        List<Map<String, Object>> wagonPleaseTotal = tmstrainPleaseApproveResultService.getAllWagonPlease(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
+                                           Integer resultType) {
+        //初始化过滤
+        List<Map<String, Object>> wagonPleaseList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue == null) {
+            mapValue.put("resultType", resultType);
+            mapValue.put("status", status);
+            //将查询结果存入索引中
+            wagonPleaseList = tmstrainPleaseApproveResultService.getAllWagonPlease(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_all_wagon_please");
+            //添加id
+            map.put("indexId", "resultId3");
+            wagonPleaseList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(wagonPleaseList);
+            esFeign.insertIndex(wagonPleaseList);
+            //删除
+            wagonPleaseList.remove(wagonPleaseList.size() - 1);
+        }
+        if (wagonPleaseList == null) {
+            mapValue.put("resultType", resultType);
+            mapValue.put("status", status);
+            wagonPleaseList = tmstrainPleaseApproveResultService.getAllWagonPlease(mapValue);
+        }
+        PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> wagonPlease = tmstrainPleaseApproveResultService.getAllWagonPlease(mapValue);
         DataChange.changeDateToDayDate(wagonPlease, "resultPleaseDate", "resultPlanDate");
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, wagonPleaseTotal,wagonPlease);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, wagonPleaseList, wagonPlease);
         return success(pageList);
     }
 
-    @ApiOperation(value="通过Id查询请车作业")
-    @PostMapping ("/getWagonPleaseById/{resultId}")
-    public RESTfulResult getWagonPleaseById(@PathVariable("resultId")Integer resultId){
+    @PostMapping("/getAllWagonPlease/{apiId}")
+    public RESTfulResult getAllWagonPleaseByCon(@PathVariable("apiId") Integer apiId,
+                                                @RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer resultType,
+                                                Integer status,
+                                                String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("status", status);
+        mapValue.put("resultType", resultType);
+        //设置要查询的索引名称
+        String index = "get_all_wagon_please";
+        //获取查询结果
+        PageListAdd list = esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con);
+        return success(list);
+    }
+
+    @ApiOperation(value = "通过Id查询请车作业")
+    @PostMapping("/getWagonPleaseById/{resultId}")
+    public RESTfulResult getWagonPleaseById(@PathVariable("resultId") Integer resultId) {
         List<Map<String, Object>> wagonPleaseById = tmstrainPleaseApproveResultService.getWagonPleaseById(resultId);
         return success(wagonPleaseById);
     }
 
 
-    @ApiOperation(value="新增请车作业")
+    @ApiOperation(value = "新增请车作业")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "amstrainWagonPlease", value = "请车作业对象", required = false, dataType = "AmstrainWagonPlease"),
     })
     @PostMapping("/addWagonPlease")
-    public RESTfulResult addWagonPlease(@RequestBody TmstrainPleaseApproveResult tmstrainPleaseApproveResult){
+    public RESTfulResult addWagonPlease(@RequestBody TmstrainPleaseApproveResult tmstrainPleaseApproveResult) {
         int i = tmstrainPleaseApproveResultService.insertSelective(tmstrainPleaseApproveResult);
         return success(i);
     }
 
 
-    @ApiOperation(value="修改请车作业")
+    @ApiOperation(value = "修改请车作业")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
     })
     @PostMapping("/updateWagonPlease")
-    public RESTfulResult updateWagonPlease(@RequestBody TmstrainPleaseApproveResult tmstrainPleaseApproveResult){
+    public RESTfulResult updateWagonPlease(@RequestBody TmstrainPleaseApproveResult tmstrainPleaseApproveResult) {
         tmstrainPleaseApproveResult.setUpdateTime(new Date());
         int i = tmstrainPleaseApproveResultService.updateByPrimaryKeySelective(tmstrainPleaseApproveResult);
         return success(i);
     }
 
-    @ApiOperation(value="逻辑删除请车作业 设置状态码为 3")
+    @ApiOperation(value = "逻辑删除请车作业 设置状态码为 3")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
     })
     @PostMapping("/deleteWagonPlease/{resultId}")
-    public RESTfulResult deleteWagonPlease(@PathVariable("resultId") Integer resultId){
+    public RESTfulResult deleteWagonPlease(@PathVariable("resultId") Integer resultId) {
         TmstrainPleaseApproveResult tmstrainPleaseApproveResult = new TmstrainPleaseApproveResult();
         tmstrainPleaseApproveResult.setResultId(new BigDecimal(resultId));
         tmstrainPleaseApproveResult.setStatus(new BigDecimal(3));
@@ -114,12 +161,12 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
         return success(i);
     }
 
-    @ApiOperation(value="下发请车作业 设置状态码为 1")
+    @ApiOperation(value = "下发请车作业 设置状态码为 1")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "请车作业实绩对象", required = false, dataType = "Integer"),
     })
     @PostMapping("/sendWagonPlease/{resultId}")
-    public RESTfulResult sendWagonPlease(@PathVariable("resultId") Integer resultId){
+    public RESTfulResult sendWagonPlease(@PathVariable("resultId") Integer resultId) {
         TmstrainPleaseApproveResult tmstrainPleaseApproveResult = new TmstrainPleaseApproveResult();
         tmstrainPleaseApproveResult.setResultId(new BigDecimal(resultId));
         tmstrainPleaseApproveResult.setStatus(new BigDecimal(1));
@@ -129,37 +176,39 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
 
     //********************************下拉框******************************************
 
-    @ApiOperation(value="查询所有发货单位")
+    @ApiOperation(value = "查询所有发货单位")
     @GetMapping("/getShipper")
-    public RESTfulResult getShipper(){
+    public RESTfulResult getShipper() {
         List<Map<String, Object>> shipper = tmstrainPleaseApproveResultService.getShipper();
         return success(shipper);
     }
 
-    @ApiOperation(value="查询所有发运计划")
+    @ApiOperation(value = "查询所有发运计划")
     @GetMapping("/getRailPlan")
-    public RESTfulResult getRailPlan(){
+    public RESTfulResult getRailPlan() {
         List<Map<String, Object>> shipper = tmstrainPleaseApproveResultService.getRailPlan();
         return success(shipper);
     }
+
     //内转物流
-    @ApiOperation(value="查询所有发站/到站")
+    @ApiOperation(value = "查询所有发站/到站")
     @GetMapping("/getArrivalSend")
-    public RESTfulResult getArrivalSend(){
+    public RESTfulResult getArrivalSend() {
         List<Map<String, Object>> send = tmstrainPleaseApproveResultService.getArrivalSend();
         return success(send);
     }
+
     //查询请车计划号
-    @ApiOperation(value="查询请车计划号")
+    @ApiOperation(value = "查询请车计划号")
     @GetMapping("/getPleasePlanNo")
-    public RESTfulResult getPleasePlanNo(){
+    public RESTfulResult getPleasePlanNo() {
         List<Map<String, Object>> PlanNo = tmstrainPleaseApproveResultService.getPleasePlanNo();
         return success(PlanNo);
     }
 
     //******************************批车作业**************************************
 
-    @ApiOperation(value="查询批车作业")
+    @ApiOperation(value = "查询批车作业")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(70)", value = "动态表头", required = false, dataType = "Integer"),
@@ -168,59 +217,96 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getApproveAllWagonPlease")
-    public RESTfulResult getApproveAllWagonPlease(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                                  Integer resultType){
-        mapValue.put("resultType", resultType);
-        //不分页筛选数据
-        List<Map<String, Object>> wagonPleaseTotal = tmstrainPleaseApproveResultService.getAllApproveWagonPlease(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
+    public RESTfulResult getApproveAllWagonPlease(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer resultType) {
+        //初始化过滤
+        List<Map<String, Object>> approveWagonPleaseList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue == null) {
+            mapValue.put("resultType", resultType);
+            //将查询结果存入索引中
+            approveWagonPleaseList = tmstrainPleaseApproveResultService.getAllApproveWagonPlease(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_approve_wagon_please");
+            //添加id
+            map.put("indexId", "resultId4");
+            approveWagonPleaseList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(approveWagonPleaseList);
+            esFeign.insertIndex(approveWagonPleaseList);
+            //删除
+            approveWagonPleaseList.remove(approveWagonPleaseList.size() - 1);
+        }
+        if (approveWagonPleaseList == null) {
+            mapValue.put("resultType", resultType);
+            approveWagonPleaseList = tmstrainPleaseApproveResultService.getAllApproveWagonPlease(mapValue);
+        }
+        PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> wagonPlease = tmstrainPleaseApproveResultService.getAllApproveWagonPlease(mapValue);
         DataChange.changeDateToDayDate(wagonPlease, "resultApproveDate");
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, wagonPleaseTotal,wagonPlease);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, approveWagonPleaseList, wagonPlease);
         return success(pageList);
     }
 
-    @ApiOperation(value="通过Id查询批车作业")
-    @PostMapping ("/getApproveWagonPleaseById/{resultId}")
-    public RESTfulResult getApproveWagonPleaseById(@PathVariable("resultId")Integer resultId){
+    @PostMapping("/getApproveAllWagonPlease/{apiId}")
+    public RESTfulResult getApproveAllWagonPleaseByCon(@PathVariable("apiId") Integer apiId,
+                                                       @RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer resultType,
+                                                       String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("resultType", resultType);
+        //设置要查询的索引名称
+        String index = "get_approve_wagon_please";
+        //获取查询结果
+        PageListAdd list = esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con);
+        return success(list);
+    }
+
+    @ApiOperation(value = "通过Id查询批车作业")
+    @PostMapping("/getApproveWagonPleaseById/{resultId}")
+    public RESTfulResult getApproveWagonPleaseById(@PathVariable("resultId") Integer resultId) {
         List<Map<String, Object>> approveWagonPleaseById = tmstrainPleaseApproveResultService.getApproveWagonPleaseById(resultId);
         return success(approveWagonPleaseById);
     }
 
-    @ApiOperation(value="新增批车作业")
+    @ApiOperation(value = "新增批车作业")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
     })
     @PostMapping("/addApproveWagonPlease")
-    public RESTfulResult addApproveWagonPlease(@RequestBody TmstrainPleaseApproveResult tmstrainPleaseApproveResult){
+    public RESTfulResult addApproveWagonPlease(@RequestBody TmstrainPleaseApproveResult tmstrainPleaseApproveResult) {
         tmstrainPleaseApproveResult.setStatus(new BigDecimal(2));
         int i = tmstrainPleaseApproveResultService.updateByPrimaryKeySelective(tmstrainPleaseApproveResult);
         return success(i);
     }
 
-    @ApiOperation(value="修改批车作业")
+    @ApiOperation(value = "修改批车作业")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstrainPleaseApproveResult", value = "请车作业实绩对象", required = false, dataType = "TmstrainPleaseApproveResult"),
     })
     @PostMapping("/updateApproveWagonPlease")
-    public RESTfulResult updateApproveWagonPlease(@RequestBody TmstrainPleaseApproveResult tmstrainPleaseApproveResult){
+    public RESTfulResult updateApproveWagonPlease(@RequestBody TmstrainPleaseApproveResult tmstrainPleaseApproveResult) {
         tmstrainPleaseApproveResult.setUpdateTime(new Date()); //设置更新时间
         int i = tmstrainPleaseApproveResultService.updateByPrimaryKeySelective(tmstrainPleaseApproveResult);
         return success(i);
     }
 
 
-
-    @ApiOperation(value="逻辑删除批车作业")
+    @ApiOperation(value = "逻辑删除批车作业")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "请车作业实绩对象", required = false, dataType = "Integer"),
     })
     @PostMapping("/deleteApproveWagonPlease/{resultId}")
-    public RESTfulResult deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId){
+    public RESTfulResult deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId) {
         TmstrainPleaseApproveResult tmstrainPleaseApproveResult = new TmstrainPleaseApproveResult();
         tmstrainPleaseApproveResult.setStatus(new BigDecimal(3));
         tmstrainPleaseApproveResult.setResultId(new BigDecimal(resultId));
@@ -236,21 +322,23 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
      * @return
      */
 
-    @ApiOperation(value="新增请车作业")
+    @ApiOperation(value = "新增请车作业")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "amstrainWagonPlease", value = "请车作业对象", required = false, dataType = "AmstrainWagonPlease"),
     })
     @PostMapping("/addWagonApprove")
-    public RESTfulResult addWagonApprove(@RequestBody Map<String,Object> map){
+    public RESTfulResult addWagonApprove(@RequestBody Map<String, Object> map) {
         int i = tmstrainPleaseApproveResultService.addPleaseApprove(map);
         return success(i);
     }
+
     /**
      * 内转查询请车实绩
+     *
      * @return
      */
 
-    @ApiOperation(value="查询请车作业")
+    @ApiOperation(value = "查询请车作业")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId(199)", value = "动态表头", required = false, dataType = "Integer"),
@@ -259,45 +347,82 @@ public class TmstrainPleaseApproveResultController extends BaseRESTfulController
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
     @PostMapping("/getAllWagonPleaseForConverted")
-    public RESTfulResult getAllWagonPleaseForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+    public RESTfulResult getAllWagonPleaseForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
                                                        Integer apiId,
                                                        Integer pageNum,
                                                        Integer pageSize,
-                                                       Integer status){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
+                                                       Integer status) {
+        //初始化过滤
+        List<Map<String, Object>> wagonPleaseConvertedList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue == null) {
+            mapValue.put("status", status);
+            //将查询结果存入索引中
+            wagonPleaseConvertedList = tmstrainPleaseApproveResultService.selectPleaseApprovePlanForConverted(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_tmstrain_wagon_load");
+            //添加id
+            map.put("indexId", "resultId5");
+            wagonPleaseConvertedList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(wagonPleaseConvertedList);
+            esFeign.insertIndex(wagonPleaseConvertedList);
+            //删除
+            wagonPleaseConvertedList.remove(wagonPleaseConvertedList.size() - 1);
         }
-        mapValue.put("status", status);
-        //不分页筛选数据
-        List<Map<String, Object>> wagonPleaseTotal = tmstrainPleaseApproveResultService.selectPleaseApprovePlanForConverted(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
+        if (wagonPleaseConvertedList == null) {
+            mapValue.put("status", status);
+            wagonPleaseConvertedList = tmstrainPleaseApproveResultService.selectPleaseApprovePlanForConverted(mapValue);
+        }
+        PageHelper.startPage(pageNum, pageSize);
         //分页数据
         List<Map<String, Object>> wagonPlease = tmstrainPleaseApproveResultService.selectPleaseApprovePlanForConverted(mapValue);
         DataChange.changeDateToDayDate(wagonPlease, "resultPleaseDate", "resultPlanDate");
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, wagonPleaseTotal,wagonPlease);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, wagonPleaseConvertedList, wagonPlease);
         return success(pageList);
     }
 
+    @PostMapping("/getAllWagonPleaseForConverted/{apiId}")
+    public RESTfulResult getAllWagonPleaseForConverted(@PathVariable("apiId") Integer apiId,
+                                                       @RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer status,
+                                                       String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("status", status);
+        //设置要查询的索引名称
+        String index = "get_wagon_please_converted";
+        //获取查询结果
+        PageListAdd list = esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con);
+        return success(list);
+    }
+
     /**
      * 通过id查询请车作业
+     *
      * @param resultId
      * @return
      */
-    @ApiOperation(value="通过Id查询请车作业")
-    @PostMapping ("/getPleasePlanByResultId/{resultId}")
-    public RESTfulResult getPleasePlanByResultId(@PathVariable("resultId")Integer resultId){
+    @ApiOperation(value = "通过Id查询请车作业")
+    @PostMapping("/getPleasePlanByResultId/{resultId}")
+    public RESTfulResult getPleasePlanByResultId(@PathVariable("resultId") Integer resultId) {
         List<Map<String, Object>> WagonPleaseById = tmstrainPleaseApproveResultService.selectPleasePlanByResultId(resultId);
         return success(WagonPleaseById);
     }
 
     /**
      * 通过id查询批车作业
+     *
      * @param resultId
      * @return
      */
-    @ApiOperation(value="通过id查询批车作业")
-    @PostMapping ("/getApproveByResultId/{resultId}")
-    public RESTfulResult getApproveByResultId(@PathVariable("resultId")Integer resultId){
+    @ApiOperation(value = "通过id查询批车作业")
+    @PostMapping("/getApproveByResultId/{resultId}")
+    public RESTfulResult getApproveByResultId(@PathVariable("resultId") Integer resultId) {
         List<Map<String, Object>> ApproveBYResultId = tmstrainPleaseApproveResultService.selectApproveBYResultId(resultId);
         return success(ApproveBYResultId);
     }

src/main/java/com/steerinfo/dil/controller/TmstrainWagonUnloadResultController.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.TmstrainWagonUnloadResult;
 import com.steerinfo.dil.service.ITmstrainWagonUnloadResultService;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -24,6 +26,7 @@ import java.util.Map;
 
 /**
  * TmstrainWagonUnloadResult RESTful接口：
+ *
  * @author generator
  * @version 1.0-SNAPSHORT 2021-08-19 09:22
  * 类描述
@@ -32,8 +35,8 @@ import java.util.Map;
  * 作者：generator
  * 参考：
  * 描述：TmstrainWagonUnloadResult RESTful接口
- * @see null
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
  */
 @RestController
 @RequestMapping("/${api.version}/tmstrainwagonunloadresults")
@@ -48,163 +51,318 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
     @Autowired
     ColumnDataUtil columnDataUtil;
 
-    @ApiOperation(value="查询卸车作业信息")
+    @Autowired
+    ESFeign esFeign;
+
+    @ApiOperation(value = "查询卸车作业信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(60)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping("/getTmstrainWagonUnLoad")
-    public RESTfulResult getTmstrainWagonUnLoad(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              Integer resultType){
+    public RESTfulResult getTmstrainWagonUnLoad(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer resultType) {
 
-        mapValue.put("resultType", resultType);
-        List<Map<String, Object>> tmstrainWagonUnLoad = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoad(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
+        //初始化过滤
+        List<Map<String, Object>> wagonUnloadList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue == null) {
+            mapValue.put("resultType", resultType);
+            //将查询结果存入索引中
+            wagonUnloadList = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoad(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_tmstrain_wagon_unload");
+            //添加id
+            map.put("indexId", "resultId6");
+            wagonUnloadList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(wagonUnloadList);
+            esFeign.insertIndex(wagonUnloadList);
+            //删除
+            wagonUnloadList.remove(wagonUnloadList.size() - 1);
+        }
+        if (wagonUnloadList == null) {
+            mapValue.put("resultType", resultType);
+            wagonUnloadList = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoad(mapValue);
+        }
+        PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> tmstrainWagonUnLoad1 = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoad(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, tmstrainWagonUnLoad,tmstrainWagonUnLoad1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, wagonUnloadList, tmstrainWagonUnLoad1);
         return success(pageList);
     }
 
+    @PostMapping("/getTmstrainWagonUnLoad/{apiId}")
+    public RESTfulResult getTmstrainWagonUnLoadByCon(@PathVariable("apiId") Integer apiId,
+                                                     @RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer resultType,
+                                                     String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("resultType", resultType);
+        //设置要查询的索引名称
+        String index = "get_tmstrain_wagon_unload";
+        //获取查询结果
+        PageListAdd list = esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con);
+        return success(list);
+    }
+
     /**
      * 通过主键删除车皮卸车作业实绩
+     *
      * @param unloadingId
      * @return
      */
-    @ApiOperation(value="通过主键删除车皮卸车作业实绩")
+    @ApiOperation(value = "通过主键删除车皮卸车作业实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "unloadingId", value = "主键ID", required = false, dataType = "BigDecimal")
     })
     @PostMapping(value = "/deleteTmstrainWagonUnLoadResultByUnLoadingId")
-    public RESTfulResult deleteTmstrainWagonUnLoadResultByUnLoadingId(@RequestParam BigDecimal unloadingId){
+    public RESTfulResult deleteTmstrainWagonUnLoadResultByUnLoadingId(@RequestParam BigDecimal unloadingId) {
         int i = tmstrainWagonUnloadResultService.deleteTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
         return success(i);
     }
 
     /**
      * 新增车皮卸车作业实绩
+     *
      * @param tmstrainWagonUnloadResult
      * @return
      */
-    @ApiOperation(value="新增车皮卸车作业实绩")
+    @ApiOperation(value = "新增车皮卸车作业实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstrainWagonUnloadResult", value = "车皮卸车对象", required = false, dataType = "TmstrainWagonUnloadResult")
     })
     @PostMapping(value = "/insertTmstrainWagonUnLoadResult")
-    public RESTfulResult insertTmstrainWagonUnLoadResult(@RequestBody(required = false) TmstrainWagonUnloadResult tmstrainWagonUnloadResult,Integer orderType){
+    public RESTfulResult insertTmstrainWagonUnLoadResult(@RequestBody(required = false) TmstrainWagonUnloadResult tmstrainWagonUnloadResult, Integer orderType) {
         tmstrainWagonUnloadResultService.insertTmstrainWagonUnLoadResult(tmstrainWagonUnloadResult);
         return success();
     }
 
     /**
      * 通过主键修改车皮卸车作业实绩
+     *
      * @param tmstrainWagonUnloadResult
      * @return
      */
-    @ApiOperation(value="通过主键修改车皮卸车作业实绩")
+    @ApiOperation(value = "通过主键修改车皮卸车作业实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "tmstrainWagonUnloadResult", value = "车皮卸车对象", required = false, dataType = "TmstrainWagonUnloadResult")
     })
     @PostMapping(value = "/upadteTmstrainWagonUnLoadResultByUnLoadingId")
-    public RESTfulResult upadteTmstrainWagonUnLoadResultByUnLoadingId(@RequestBody(required = false) TmstrainWagonUnloadResult tmstrainWagonUnloadResult){
+    public RESTfulResult upadteTmstrainWagonUnLoadResultByUnLoadingId(@RequestBody(required = false) TmstrainWagonUnloadResult tmstrainWagonUnloadResult) {
         System.out.println(tmstrainWagonUnloadResult);
         int i = tmstrainWagonUnloadResultService.updateTmstrainWagonUnLoadResult(tmstrainWagonUnloadResult);
         return success(i);
     }
 
-    @ApiOperation(value="查看火运实绩")
+    @ApiOperation(value = "查看火运实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(65)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping("/getTmstrainresult")
-    public RESTfulResult getTmstrainresult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                Integer apiId,
-                                                Integer pageNum,
-                                                Integer pageSize){
-
-        List<Map<String, Object>> tmstrainResult = tmstrainWagonUnloadResultService.getTmstrainResult(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
+    public RESTfulResult getTmstrainresult(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        //初始化过滤
+        List<Map<String, Object>> tmstrainList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue == null) {
+            //将查询结果存入索引中
+            tmstrainList = tmstrainWagonUnloadResultService.getTmstrainResult(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_tmstrain_result");
+            //添加id
+            map.put("indexId", "result7");
+            tmstrainList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(tmstrainList);
+            esFeign.insertIndex(tmstrainList);
+            //删除
+            tmstrainList.remove(tmstrainList.size() - 1);
+        }
+        if (tmstrainList == null) {
+            tmstrainList = tmstrainWagonUnloadResultService.getTmstrainResult(mapValue);
+        }
+        PageHelper.startPage(pageNum, pageSize);
         List<Map<String, Object>> tmstrainResult1 = tmstrainWagonUnloadResultService.getTmstrainResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, tmstrainResult,tmstrainResult1);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, tmstrainList, tmstrainResult1);
         return success(pageList);
     }
 
+    @PostMapping("/getTmstrainresult/{apiId}")
+    public RESTfulResult getTmstrainresultByCon(@PathVariable("apiId") Integer apiId,
+                                                @RequestBody(required = false) Map<String, Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        //设置要查询的索引名称
+        String index = "get_tmstrain_result";
+        //获取查询结果
+        PageListAdd list = esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con);
+        return success(list);
+    }
+
     /**
      * 获取卸车地点名称
+     *
      * @param
      * @return
      */
-    @ApiOperation(value="获取卸车地点名称")
+    @ApiOperation(value = "获取卸车地点名称")
     @ApiImplicitParams({
     })
     @GetMapping(value = "/getUnloadingPointName")
-    public RESTfulResult getUnloadingPointName(){
+    public RESTfulResult getUnloadingPointName() {
 
         return success(tmstrainWagonUnloadResultService.getUnloadingPointName());
     }
 
     /**
      * 获取卸车路径名称
+     *
      * @param
      * @return
      */
-    @ApiOperation(value="获取卸车路径名称")
+    @ApiOperation(value = "获取卸车路径名称")
     @ApiImplicitParams({
     })
     @GetMapping(value = "/getUnloadingRouteName")
-    public RESTfulResult getUnloadingRouteName(){
+    public RESTfulResult getUnloadingRouteName() {
         return success(tmstrainWagonUnloadResultService.getUnloadingRouteName());
     }
 
     /**
      * 通过主键查询车皮卸车作业信息
+     *
      * @param unloadingId
      * @return
      */
-    @ApiOperation(value="通过主键查询车皮卸车作业信息")
+    @ApiOperation(value = "通过主键查询车皮卸车作业信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "unloadingId", value = "车皮卸车主键", required = false, dataType = "BigDecimal")
     })
     @PostMapping(value = "/getTmstrainWagonUnLoadResultByUnLoadingId/{unloadingId}")
-    public RESTfulResult getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId,Integer orderType){
+    public RESTfulResult getTmstrainWagonUnLoadResultByUnLoadingId(@PathVariable("unloadingId") BigDecimal unloadingId, Integer orderType) {
         List<Map<String, Object>> mes = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoadResultByUnLoadingId(unloadingId);
         return success(mes);
     }
-   //********内转物流展示卸车实绩**************************************
-   @ApiOperation(value="查询卸车作业信息")
-   @ApiImplicitParams({
-           @ApiImplicitParam(name = "apiId(201)", value = "表头", required = false, dataType = "Interger")
-   })
-   @PostMapping("/selectWagonUnLoadResultForConverted")
-   public RESTfulResult selectWagonUnLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize){
-
-       List<Map<String, Object>> tmstrainWagonUnLoad = tmstrainWagonUnloadResultService.selectWagonUnLoadResult(mapValue);
-       PageHelper.startPage(pageNum,pageSize);
-       List<Map<String, Object>> tmstrainWagonUnLoad1 = tmstrainWagonUnloadResultService.selectWagonUnLoadResult(mapValue);
-       PageListAdd pageList = columnDataUtil.tableColumnData(apiId, tmstrainWagonUnLoad,tmstrainWagonUnLoad1);
-       return success(pageList);
-   }
-   //*********内转物流查询火车卸车实绩************************************
-   @ApiOperation(value="查询火车卸车信息")
-   @ApiImplicitParams({
-           @ApiImplicitParam(name = "apiId(202)", value = "表头", required = false, dataType = "Interger")
-   })
-   @PostMapping("/selectTrainUnLoadResultForConverted")
-   public RESTfulResult selectTrainUnLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                            Integer apiId,
-                                                            Integer pageNum,
-                                                            Integer pageSize){
-
-       List<Map<String, Object>> tmstrainWagonUnLoad = tmstrainWagonUnloadResultService.getTmstrainResult(mapValue);
-       PageHelper.startPage(pageNum,pageSize);
-       List<Map<String, Object>> tmstrainWagonUnLoad1 = tmstrainWagonUnloadResultService.getTmstrainResult(mapValue);
-       PageListAdd pageList = columnDataUtil.tableColumnData(apiId, tmstrainWagonUnLoad,tmstrainWagonUnLoad1);
-       return success(pageList);
-   }
+
+    //********内转物流展示卸车实绩**************************************
+    @ApiOperation(value = "查询卸车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(201)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/selectWagonUnLoadResultForConverted")
+    public RESTfulResult selectWagonUnLoadResultForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                             Integer apiId,
+                                                             Integer pageNum,
+                                                             Integer pageSize) {
+        //初始化过滤
+        List<Map<String, Object>> wagonUnLoadResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue == null) {
+            //将查询结果存入索引中
+            wagonUnLoadResult = tmstrainWagonUnloadResultService.selectWagonUnLoadResult(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "wagon_unload_result");
+            //添加id
+            map.put("indexId", "result8");
+            wagonUnLoadResult.add(map);
+            //新建索引
+            String s = JSON.toJSONString(wagonUnLoadResult);
+            esFeign.insertIndex(wagonUnLoadResult);
+            //删除
+            wagonUnLoadResult.remove(wagonUnLoadResult.size() - 1);
+        }
+        if (wagonUnLoadResult == null) {
+            wagonUnLoadResult = tmstrainWagonUnloadResultService.selectWagonUnLoadResult(mapValue);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        List<Map<String, Object>> tmstrainWagonUnLoad1 = tmstrainWagonUnloadResultService.selectWagonUnLoadResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, wagonUnLoadResult, tmstrainWagonUnLoad1);
+        return success(pageList);
+    }
+
+    @PostMapping("/selectWagonUnLoadResultForConverted/{apiId}")
+    public RESTfulResult selectWagonUnLoadResultForConvertedByCon(@PathVariable("apiId") Integer apiId,
+                                                       @RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        //设置要查询的索引名称
+        String index = "wagon_unload_result";
+        //获取查询结果
+        PageListAdd list = esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con);
+        return success(list);
+    }
+
+    //*********内转物流查询火车卸车实绩************************************
+    @ApiOperation(value = "查询火车卸车信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(202)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/selectTrainUnLoadResultForConverted")
+    public RESTfulResult selectTrainUnLoadResultForConverted(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                             Integer apiId,
+                                                             Integer pageNum,
+                                                             Integer pageSize) {
+        //初始化过滤
+        List<Map<String, Object>> trainUnLoadResult = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue == null) {
+            //将查询结果存入索引中
+            trainUnLoadResult = tmstrainWagonUnloadResultService.getTmstrainResult(null);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "wagon_unload_result");
+            //添加id
+            map.put("indexId", "result8");
+            trainUnLoadResult.add(map);
+            //新建索引
+            String s = JSON.toJSONString(trainUnLoadResult);
+            esFeign.insertIndex(trainUnLoadResult);
+            //删除
+            trainUnLoadResult.remove(trainUnLoadResult.size() - 1);
+        }
+        if (trainUnLoadResult == null) {
+            trainUnLoadResult = tmstrainWagonUnloadResultService.getTmstrainResult(mapValue);
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        List<Map<String, Object>> tmstrainWagonUnLoad1 = tmstrainWagonUnloadResultService.getTmstrainResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, trainUnLoadResult, tmstrainWagonUnLoad1);
+        return success(pageList);
+    }
+
+    @PostMapping("/selectTrainUnLoadResultForConverted/{apiId}")
+    public RESTfulResult selectTrainUnLoadResultForConvertedByCon(@PathVariable("apiId") Integer apiId,
+                                                       @RequestBody(required = false) Map<String, Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        //设置要查询的索引名称
+        String index = "unload_result_converted";
+        //获取查询结果
+        PageListAdd list = esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con);
+        return success(list);
+    }
 
 
 }

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

@@ -0,0 +1,30 @@
+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 = "https://portal-dev.steerinfo.com/icore.icp.web/pass/dil/dil-es-api")
+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/application-dev.yml

@@ -1,9 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
-    name: dil-tms-truck-dev
-
+    name: dil-tms-truck-dev

src/main/resources/application-prod.yml

@@ -1,8 +1,8 @@
 spring:
   datasource:
-    url: jdbc:oracle:thin:@192.168.1.51:1521:steerinfo
-    password: st#0901
-    username: DIL0901
+    url: jdbc:oracle:thin:@172.16.33.163:1521:ilsdbpri
+    password: Dil123789
+    username: dil
     driver-class-name: oracle.jdbc.OracleDriver
   application:
     name: dil-tms-truck-dev

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

@@ -650,9 +650,9 @@
       #{id}
     </foreach>
   </delete>
+
   <!-- 友情提示！！！-->
   <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
-
   <select id="getTmsWagonLoadInfo" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select * from(
     select t_load.RESULT_ID "resultId",
@@ -667,7 +667,7 @@
     t_load.RESULT_BILLABLE_TONNAGE "resultBillableTonnage",
     t_load.RESULT_ISCLEAR "resultIsclear",
     t_load.RESULT_REMARKS "resultRemarks",
-           RS.SUPPLIER_NAME "supplierName",
+    RS.SUPPLIER_DUTY_PARAGRAPH "supplierName",
     t_load.INSERT_TIME "insertTime"
     from TMSTRAIN_LOADING_RESULT t_load
     left join AMS_PURCHASE_ORDER a_order