'汽运结算纳入框计算'

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.impl.BmstruckDetailsOrderServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -31,10 +33,13 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
     BmstruckDetailsOrderServiceImpl bmstruckDetailsOrderService;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    ESFeign esFeign;
 
     /**
      * 展示汽运详单信息
-     * @param mapVal
+     *
+     * @param mapValue
      * @param pageNum
      * @param pageSize
      * @param apiId
@@ -45,25 +50,59 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "apiId", value = "销售：176/采购：140", required = false, dataType = "BigDecimal"),
-            @ApiImplicitParam(name = "orderType" ,value = "1:销售,3:采购",required = false,dataType = "Integer")
+            @ApiImplicitParam(name = "orderType", value = "1:销售,3:采购", required = false, dataType = "Integer")
     })
     @PostMapping("/getTruckDetailsOrderList")
-    public RESTfulResult getTruckDetailsOrderList(@RequestBody(required = false) Map<String,Object> mapVal,
+    public RESTfulResult getTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   Integer pageNum,
                                                   Integer pageSize,
                                                   Integer apiId,
-                                                  Integer orderType) {
-        List<Map<String, Object>> list = bmstruckDetailsOrderService.getTruckDetailsOrderList(mapVal,orderType);
+                                                  Integer orderType,
+                                                  String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("orderType",orderType);
+        if (con != null) {
+            if (!"undefined".equals(con)) {
+                //设置要查询的索引名称
+                String index = "get_truck_details_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> truckDetailList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue.size() == 1) {
+            //将查询结果存入索引中
+            truckDetailList = bmstruckDetailsOrderService.getTruckDetailsOrderList(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_truck_details_list");
+            //添加id
+            map.put("indexId", "detailsId");
+            truckDetailList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(truckDetailList);
+            esFeign.insertIndex(truckDetailList);
+            //删除
+            truckDetailList.remove(truckDetailList.size() - 1);
+        }
+        if (truckDetailList == null) {
+            truckDetailList = bmstruckDetailsOrderService.getTruckDetailsOrderList(mapValue);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
-        List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getTruckDetailsOrderList(mapVal,orderType);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getTruckDetailsOrderList(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckDetailList, columnList);
         return success(data);
     }
 
     /**
      * 展示汽运未生成账单的详单信息
-     * @param mapVal
+     *
+     * @param mapValue
      * @param pageNum
      * @param pageSize
      * @param apiId
@@ -74,24 +113,54 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "apiId", value = "销售：176", required = false, dataType = "BigDecimal"),
-            @ApiImplicitParam(name = "orderType" ,value = "1:销售",required = false,dataType = "Integer")
+            @ApiImplicitParam(name = "orderType", value = "1:销售", required = false, dataType = "Integer")
     })
     @PostMapping("/getUnFinishedTruckDetailsOrderList")
-    public RESTfulResult getUnFinishedTruckDetailsOrderList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                                  Integer pageNum,
-                                                  Integer pageSize,
-                                                  Integer apiId,
-                                                  Integer orderType) {
-        List<Map<String, Object>> list = bmstruckDetailsOrderService.getUnFinishedTruckDetailsOrderList(mapVal,orderType);
+    public RESTfulResult getUnFinishedTruckDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                            Integer pageNum,
+                                                            Integer pageSize,
+                                                            Integer apiId,
+                                                            Integer orderType,
+                                                            String con) {
+        if (con != null) {
+            if (!"undefined".equals(con)) {
+                //设置要查询的索引名称
+                String index = "get_unfinished_details_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> truckDetailList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue.size() == 0) {
+            //将查询结果存入索引中
+            truckDetailList = bmstruckDetailsOrderService.getUnFinishedTruckDetailsOrderList(mapValue, orderType);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_unfinished_details_list");
+            //添加id
+            map.put("indexId", "detailsId");
+            truckDetailList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(truckDetailList);
+            esFeign.insertIndex(truckDetailList);
+            //删除
+            truckDetailList.remove(truckDetailList.size() - 1);
+        }
+        if (truckDetailList == null) {
+            truckDetailList = bmstruckDetailsOrderService.getUnFinishedTruckDetailsOrderList(mapValue, orderType);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
-        List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getUnFinishedTruckDetailsOrderList(mapVal,orderType);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        List<Map<String, Object>> columnList = bmstruckDetailsOrderService.getUnFinishedTruckDetailsOrderList(mapValue, orderType);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckDetailList, columnList);
         return success(data);
     }
 
     /**
      * 展示汽运实绩信息
+     *
      * @param mapVal
      * @param pageNum
      * @param pageSize
@@ -105,7 +174,7 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "销售：177/采购：142", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getTruckResultList")
-    public RESTfulResult getTruckResultList(@RequestBody(required = false) Map<String,Object> mapVal,
+    public RESTfulResult getTruckResultList(@RequestBody(required = false) Map<String, Object> mapVal,
                                             Integer pageNum,
                                             Integer pageSize,
                                             Integer apiId,
@@ -113,7 +182,7 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
         if (mapVal == null) {
             mapVal = new HashMap<>();
         }
-        mapVal.put("orderId",orderId);
+        mapVal.put("orderId", orderId);
         List<Map<String, Object>> list = bmstruckDetailsOrderService.getTruckResultList(mapVal);
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
@@ -124,6 +193,7 @@ public class BmstruckDetailsOrderController extends BaseRESTfulController {
 
     /**
      * 新增详单
+     *
      * @param orderId
      * @return
      */

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.BmstruckInvoice;
 import com.steerinfo.dil.service.impl.BmstruckInvoiceServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -28,6 +30,7 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -45,6 +48,8 @@ public class BmstruckInvoiceController extends BaseRESTfulController {
     BmstruckInvoiceServiceImpl bmstruckInvoiceService;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    ESFeign esFeign;
 
     private final String UPLOAD_PATH = "C:/Download/Files/InvoicePhotos/";
 
@@ -90,12 +95,41 @@ public class BmstruckInvoiceController extends BaseRESTfulController {
     public RESTfulResult getInvoiceList(@RequestBody(required = false) Map<String, Object> mapValue,
                                         Integer pageNum,
                                         Integer pageSize,
-                                        Integer apiId) {
-        List<Map<String, Object>> list = bmstruckInvoiceService.getInvoiceList(mapValue);
+                                        Integer apiId,
+                                        String con) {
+        if (con != null && !con.equals("")) {
+            if (!"undefined".equals(con)) {
+                //设置要查询的索引名称
+                String index = "get_invoice_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> invoiceList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue.size() == 0) {
+            //将查询结果存入索引中
+            invoiceList = bmstruckInvoiceService.getInvoiceList(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_invoice_list");
+            //添加id
+            map.put("indexId", "invoiceId");
+            invoiceList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(invoiceList);
+            esFeign.insertIndex(invoiceList);
+            //删除
+            invoiceList.remove(invoiceList.size() - 1);
+        }
+        if (invoiceList == null) {
+            invoiceList = bmstruckInvoiceService.getInvoiceList(mapValue);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = bmstruckInvoiceService.getInvoiceList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, invoiceList, columnList);
         return success(data);
     }
 

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

@@ -1,6 +1,8 @@
 package com.steerinfo.dil.controller;
 
+import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.impl.BmstruckStatementServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -32,9 +34,12 @@ public class BmstruckStatementController extends BaseRESTfulController {
     BmstruckStatementServiceImpl bmstruckStatementService;
     @Autowired
     ColumnDataUtil columnDataUtil;
+    @Autowired
+    ESFeign esFeign;
 
     /**
      * 展示汽运账单信息
+     *
      * @param mapValue
      * @param pageNum
      * @param pageSize
@@ -48,20 +53,50 @@ public class BmstruckStatementController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "179", required = false, dataType = "BigDecimal")
     })
     @PostMapping("/getTruckStatementList")
-    public RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String,Object> mapValue,
-                                          Integer pageNum,
-                                          Integer pageSize,
-                                          Integer apiId) {
-        List<Map<String, Object>> list = bmstruckStatementService.getTruckStatementList(mapValue);
+    public RESTfulResult getTruckStatementList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId,
+                                               String con) {
+        if (con != null) {
+            if (!"undefined".equals(con)) {
+                //设置要查询的索引名称
+                String index = "get_truck_statement_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> truckStatementList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue.size() == 0) {
+            //将查询结果存入索引中
+            truckStatementList = bmstruckStatementService.getTruckStatementList(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_truck_statement_list");
+            //添加id
+            map.put("indexId", "statementId");
+            truckStatementList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(truckStatementList);
+            esFeign.insertIndex(truckStatementList);
+            //删除
+            truckStatementList.remove(truckStatementList.size() - 1);
+        }
+        if (truckStatementList == null) {
+            truckStatementList = bmstruckStatementService.getTruckStatementList(mapValue);
+        }
         PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
         List<Map<String, Object>> columnList = bmstruckStatementService.getTruckStatementList(mapValue);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckStatementList, columnList);
         return success(data);
     }
 
     /**
      * 生成汽运账单
+     *
      * @param mapList
      * @return
      */
@@ -70,20 +105,21 @@ public class BmstruckStatementController extends BaseRESTfulController {
             @ApiImplicitParam(name = "mapList", value = "详单列表", required = false, dataType = "java.util.List"),
     })
     @PostMapping("/addTruckStatement")
-    public RESTfulResult addTruckStatement(@RequestBody List<Map<String,Object>> mapList) {
+    public RESTfulResult addTruckStatement(@RequestBody List<Map<String, Object>> mapList) {
         int code1 = bmstruckStatementService.addTruckStatement(mapList);
         return success(code1);
     }
 
     /**
      * 展示账单下的详单
-     * @param mapVal
+     *
+     * @param mapValue
      * @param pageNum
      * @param pageSize
      * @param apiId
      * @return
      */
-    @ApiOperation(value="展示账单下的详单", notes="分页查询")
+    @ApiOperation(value = "展示账单下的详单", notes = "分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "statementId", value = "账单id", required = false, dataType = "BigDecimal"),
             @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
@@ -91,24 +127,55 @@ public class BmstruckStatementController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "177", required = false, dataType = "BigDecimal"),
     })
     @PostMapping(value = "/getSaleTruckStatementDetailsOrderList")
-    public RESTfulResult getSaleTruckStatementDetailsOrderList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer apiId,
-                                                      BigDecimal statementId){
-        if (mapVal==null) {
-            mapVal = new HashMap<>();
+    public RESTfulResult getSaleTruckStatementDetailsOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                               Integer pageNum,
+                                                               Integer pageSize,
+                                                               Integer apiId,
+                                                               BigDecimal statementId,
+                                                               String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("statementId", statementId);
+        if (con != null) {
+            if (!"undefined".equals(con)) {
+                //设置要查询的索引名称
+                String index = "get_sale_details_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
+            }
+        }
+        //初始化过滤
+        List<Map<String, Object>> truckStatementList = null;
+        //如果有条件查询则跳过初始化，和创建索引
+        if (mapValue.size() == 0) {
+            //将查询结果存入索引中
+            truckStatementList = bmstruckStatementService.getSaleTruckStatementDetailsOrderList(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index", "get_sale_details_list");
+            //添加id
+            map.put("indexId", "detailsId");
+            truckStatementList.add(map);
+            //新建索引
+            String s = JSON.toJSONString(truckStatementList);
+            esFeign.insertIndex(truckStatementList);
+            //删除
+            truckStatementList.remove(truckStatementList.size() - 1);
+        }
+        if (truckStatementList == null) {
+            truckStatementList = bmstruckStatementService.getSaleTruckStatementDetailsOrderList(mapValue);
         }
-        mapVal.put("statementId",statementId);
-        List<Map<String,Object>> list = bmstruckStatementService.getSaleTruckStatementDetailsOrderList(mapVal);
         com.steerinfo.framework.service.pagehelper.PageHelper.startPage(pageNum, pageSize);
         //分页查询数据
-        List<Map<String, Object>> columnList = bmstruckStatementService.getSaleTruckStatementDetailsOrderList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        List<Map<String, Object>> columnList = bmstruckStatementService.getSaleTruckStatementDetailsOrderList(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, truckStatementList, columnList);
         return success(data);
     }
+
     /**
      * 生成内转汽运账单
+     *
      * @param mapList
      * @return
      */
@@ -117,18 +184,20 @@ public class BmstruckStatementController extends BaseRESTfulController {
             @ApiImplicitParam(name = "mapList", value = "详单列表", required = false, dataType = "java.util.List"),
     })
     @PostMapping("/addConvertedTruckStatement")
-    public RESTfulResult addConvertedTruckStatement(@RequestBody List<Map<String,Object>> mapList,Integer orderType) {
-        int code1 = bmstruckStatementService.addConvertedTruckStatement(mapList,orderType);
+    public RESTfulResult addConvertedTruckStatement(@RequestBody List<Map<String, Object>> mapList, Integer orderType) {
+        int code1 = bmstruckStatementService.addConvertedTruckStatement(mapList, orderType);
         return success(code1);
     }
+
     /**
-     *删除汽运账单
+     * 删除汽运账单
      */
     @PostMapping("/deleteConvertedTruckStatement/{statementId}")
     public RESTfulResult deleteConvertedTruckStatement(@PathVariable("statementId") BigDecimal statementId) {
         bmstruckStatementService.delete(statementId);
         return success("删除成功");
     }
+
     /**
      * 审批计费账单
      */

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 = "172.16.33.161:8089/api/v1/es")
+public interface ESFeign {
+    @PostMapping("getConResult")
+    PageListAdd getConResult(@RequestBody(required = false) Map<String, Object> mapValue,
+                             @RequestParam String index,
+                             @RequestParam Integer apiId,
+                             @RequestParam Integer pageNum,
+                             @RequestParam Integer pageSize,
+                             @RequestParam String con);
+
+    @PostMapping( value = "insertIndex",consumes = "application/json", produces = "application/json")
+    void insertIndex(@RequestBody List<Map<String, Object>> detailListTotal);
+}

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

@@ -18,7 +18,7 @@ public interface IBmstruckDetailsOrderService {
      * @param mapVal
      * @return
      */
-    List<Map<String,Object>> getTruckDetailsOrderList(Map<String,Object> mapVal,Integer orderType);
+    List<Map<String,Object>> getTruckDetailsOrderList(Map<String,Object> mapVal);
 
     /**
      * 新增汽运详单

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

@@ -37,11 +37,8 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
      * @return
      */
     @Override
-    public List<Map<String, Object>> getTruckDetailsOrderList(Map<String, Object> mapVal,Integer orderType) {
-        if (mapVal == null) {
-            mapVal = new HashMap<>();
-        }
-        mapVal.put("orderType",orderType);
+    public List<Map<String, Object>> getTruckDetailsOrderList(Map<String, Object> mapVal) {
+        Integer orderType = (Integer) mapVal.get("orderType");
         List<Map<String, Object>> truckDetailsOrderList;
         if (orderType == 3) {
             truckDetailsOrderList = bmstruckDetailsOrderMapper.getTruckDetailsOrderList(mapVal);