Quellcode durchsuchen

集合采购框计算

txf vor 3 Jahren
Ursprung
Commit
7be1be5f83

+ 33 - 3
src/main/java/com/steerinfo/dil/controller/TmstruckEnfactoryResultController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckEnfactoryResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -36,6 +37,9 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckEnfactoryResultService tmstruckEnfactoryResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -52,11 +56,37 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
                                        Integer apiId,
                                        Integer pageNum,
                                        Integer pageSize,
-                                       Integer orderType
+                                       Integer orderType,
+                                       String con
                                        ){
         mapValue.put("orderTypee", orderType);
-        //不分页筛选数据
-        List<Map<String, Object>> allEnFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                //设置要查询的索引名称
+                String index="get_enfactory_list";
+                //获取查询结果
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));
+            }
+        }
+        List<Map<String, Object>> allEnFactoryResult = null;
+        //如果有条件查询则跳过初始化,和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allEnFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_enfactory_list");
+            //添加id
+            map.put("indexId","enFactoryId");
+            allEnFactoryResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allEnFactoryResult);
+            //删除
+            allEnFactoryResult.remove(allEnFactoryResult.size()-1);
+        }
+        if(allEnFactoryResult == null)
+            allEnFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> enFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);

+ 31 - 4
src/main/java/com/steerinfo/dil/controller/TmstruckLeaveFactoryResultController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -40,6 +41,9 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
     @Autowired
     ITmstruckLeaveFactoryResultService tmstruckLeaveFactoryResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -66,11 +70,34 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                               Integer orderType
-    ){
+                                          Integer orderType,
+                                          String con){
         mapValue.put("orderTypee", orderType);
-        //不分页筛选数据
-        List<Map<String, Object>> allLeaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_leavefactory_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        List<Map<String, Object>> allLeaveFactoryResult = null;
+        //如果有条件查询则跳过初始化,和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allLeaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_leavefactory_list");
+            //添加id
+            map.put("indexId","leaveFactoryId");
+            allLeaveFactoryResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allLeaveFactoryResult);
+            //删除
+            allLeaveFactoryResult.remove(allLeaveFactoryResult.size()-1);
+        }
+        if(allLeaveFactoryResult == null)
+            allLeaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> leaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);

+ 32 - 7
src/main/java/com/steerinfo/dil/controller/TmstruckLoadResultController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmstruckLoadResult;
 import com.steerinfo.dil.service.ITmstruckLoadResultService;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -38,6 +39,9 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckLoadResultService tmstruckLoadResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -54,15 +58,36 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
                                         Integer pageNum,
                                         Integer pageSize,
                                         Integer status,
-                                        @RequestParam("orderType") Integer orderType){
-        if(status != null){
-            mapValue.put("status", status);
-        }
-        if(orderType != null){
-            mapValue.put("orderTypee", orderType);
+                                        Integer orderType,
+                                        String con){
+        mapValue.put("status", status);
+        mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_truck_load_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
         }
         //不分页筛选数据
-        List<Map<String, Object>> allLoadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);
+        List<Map<String, Object>> allLoadResult = null;
+        //如果有条件查询则跳过初始化,和创建索引
+        if(mapValue.size() == 2){
+            //将查询结果存入索引中
+            allLoadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_truck_load_list");
+            //添加id
+            map.put("indexId","truckLoadId");
+            allLoadResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allLoadResult);
+            //删除
+            allLoadResult.remove(allLoadResult.size()-1);
+        }
+        if(allLoadResult == null)
+            allLoadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> loadResult = tmstruckLoadResultService.getAllLoadResult(mapValue);

+ 31 - 2
src/main/java/com/steerinfo/dil/controller/TmstruckQualityResultController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.model.TmstruckQualityResult;
 import com.steerinfo.dil.service.ITmstruckQualityResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -42,6 +43,9 @@ public class TmstruckQualityResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckQualityResultService tmstruckQualityResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -57,10 +61,35 @@ public class TmstruckQualityResultController extends BaseRESTfulController {
     public RESTfulResult getQualityResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize
+                                          Integer pageSize,
+                                          String con
     ){
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_quality_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
         //不分页筛选数据
-        List<Map<String, Object>> allQualityResult = tmstruckQualityResultService.getQualityResult(mapValue);
+        List<Map<String, Object>> allQualityResult = null;
+        //如果有条件查询则跳过初始化,和创建索引
+        if(mapValue.size() == 0){
+            //将查询结果存入索引中
+            allQualityResult = tmstruckQualityResultService.getQualityResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_quality_list");
+            //添加id
+            map.put("indexId","qualityId");
+            allQualityResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allQualityResult);
+            //删除
+            allQualityResult.remove(allQualityResult.size()-1);
+        }
+        if(allQualityResult == null)
+            allQualityResult = tmstruckQualityResultService.getQualityResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> qualityResult = tmstruckQualityResultService.getQualityResult(mapValue);

+ 33 - 3
src/main/java/com/steerinfo/dil/controller/TmstruckReceiptResultController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckReceiptResultService;
 
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -13,6 +14,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.util.Map;
 
@@ -36,6 +38,9 @@ public class TmstruckReceiptResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckReceiptResultService tmstruckReceiptResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -52,15 +57,40 @@ public class TmstruckReceiptResultController extends BaseRESTfulController {
                                           Integer apiId,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          Integer orderType
+                                          Integer orderType,
+                                          String con
     ){
         mapValue.put("orderTypee", orderType);
-        //不分页筛选数据
-        List<Map<String, Object>> allReceiveResult = tmstruckReceiptResultService.getReceiveResult(mapValue);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_receive_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        List<Map<String, Object>> allReceiveResult = null;
+        //如果有条件查询则跳过初始化,和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allReceiveResult = tmstruckReceiptResultService.getReceiveResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_receive_list");
+            //添加id
+            map.put("indexId","receiveId");
+            allReceiveResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allReceiveResult);
+            //删除
+            allReceiveResult.remove(allReceiveResult.size()-1);
+        }
+        if(allReceiveResult == null)
+            allReceiveResult = tmstruckReceiptResultService.getReceiveResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> receiveResult = tmstruckReceiptResultService.getReceiveResult(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allReceiveResult,receiveResult);
         return success(pageList);
     }
+
 }

+ 36 - 9
src/main/java/com/steerinfo/dil/controller/TmstruckSmsRusultController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckSmsRusultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -10,11 +11,9 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -38,6 +37,8 @@ public class TmstruckSmsRusultController extends BaseRESTfulController{
     @Autowired
     ITmstruckSmsRusultService tmstruckSmsRusultService;
     @Autowired
+    ESFeign esFeign;
+    @Autowired
     ColumnDataUtil columnDataUtil;
     @ApiOperation(value = "新增短信实绩", notes = "通过人工稽核判断点击新增短信实绩")
     @PostMapping(value = "/insertSmsResult")//BigDecimal
@@ -57,14 +58,40 @@ public class TmstruckSmsRusultController extends BaseRESTfulController{
     public RESTfulResult getSmsResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                                       Integer apiId,
                                                       Integer pageNum,
-                                                      Integer pageSize
+                                                      Integer pageSize,
+                                                      String con
     ){
-        //不分页筛选数据
-        List<Map<String, Object>> allLeaveFactoryResult = tmstruckSmsRusultService.getSmsResult(mapValue);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_sms_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        List<Map<String, Object>> allSmsResult = null;
+        //如果有条件查询则跳过初始化,和创建索引
+        if(mapValue.size() == 0){
+            //将查询结果存入索引中
+            allSmsResult = tmstruckSmsRusultService.getSmsResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_sms_list");
+            //添加id
+            map.put("indexId","smsId");
+            allSmsResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allSmsResult);
+            //删除
+            allSmsResult.remove(allSmsResult.size()-1);
+        }
+        if(allSmsResult == null){
+            allSmsResult = tmstruckSmsRusultService.getSmsResult(mapValue);
+        }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> leaveFactoryResult = tmstruckSmsRusultService.getSmsResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allLeaveFactoryResult,leaveFactoryResult);
+        List<Map<String, Object>> smsResult = tmstruckSmsRusultService.getSmsResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allSmsResult,smsResult);
         return success(pageList);
     }
+
 }

+ 33 - 2
src/main/java/com/steerinfo/dil/controller/TmstruckUnloadResultController.java

@@ -1,4 +1,5 @@
 package com.steerinfo.dil.controller;
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckUnloadResultService;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.ColumnDataUtil;
@@ -12,6 +13,7 @@ import org.apache.commons.collections4.Put;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -36,6 +38,9 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckUnloadResultService tmstruckUnloadResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -52,11 +57,36 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer orderType
+                                           Integer orderType,String con
     ){
         mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_truck_unload_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
         //不分页筛选数据
-        List<Map<String, Object>> allUnloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
+        List<Map<String, Object>> allUnloadResult = null;
+        //如果有条件查询则跳过初始化,和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allUnloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_truck_unload_list");
+            //添加id
+            map.put("indexId","truckUnloadId");
+            allUnloadResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allUnloadResult);
+            //删除
+            allUnloadResult.remove(allUnloadResult.size()-1);
+        }
+        if(allUnloadResult == null){
+            allUnloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
+        }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> unloadResult = tmstruckUnloadResultService.getUnloadResult(mapValue);
@@ -64,6 +94,7 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
+
     @ApiOperation(value="更新卸货实绩 ")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),

+ 62 - 9
src/main/java/com/steerinfo/dil/controller/TmstruckWeightResultController.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.controller;
 
+import com.steerinfo.dil.feign.ESFeign;
 import com.steerinfo.dil.service.ITmstruckWeightResultService;
 
 import com.steerinfo.dil.util.BaseRESTfulController;
@@ -39,6 +40,9 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
     @Autowired
     ITmstruckWeightResultService tmstruckWeightResultService;
 
+    @Autowired
+    ESFeign esFeign;
+
     @Autowired
     ColumnDataUtil columnDataUtil;
 
@@ -65,13 +69,36 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
                                                Integer apiId,
                                                Integer pageNum,
                                                Integer pageSize,
-                                               Integer orderType
+                                               Integer orderType,
+                                               String con
     ){
-
         mapValue.put("orderTypee", orderType);
-
-        //不分页筛选数据
-        List<Map<String, Object>> allJiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_jimao_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        List<Map<String, Object>> allJiMaoResult = null;
+        //如果有条件查询则跳过初始化,和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allJiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_jimao_list");
+            //添加id
+            map.put("indexId","jiMaoId");
+            allJiMaoResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allJiMaoResult);
+            //删除
+            allJiMaoResult.remove(allJiMaoResult.size()-1);
+        }
+        if(allJiMaoResult == null){
+            allJiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
+        }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
         List<Map<String, Object>> jiMaoResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
@@ -79,6 +106,7 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
+
     @ApiOperation(value="查询计皮实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -92,16 +120,41 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
                                            Integer apiId,
                                            Integer pageNum,
                                            Integer pageSize,
-                                           Integer orderType
+                                           Integer orderType,String con
     ){
 
         mapValue.put("orderTypee", orderType);
+        //框计算
+        if(con != null){
+            if(!"undefined".equals(con)){
+                String index="get_jipi_list";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
         //不分页筛选数据
-        List<Map<String, Object>> allJiMaoResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
+        List<Map<String, Object>> allJiPiResult = null;
+        //如果有条件查询则跳过初始化,和创建索引
+        if(mapValue.size() == 1){
+            //将查询结果存入索引中
+            allJiPiResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
+            Map<String, Object> map = new HashMap<>();
+            //添加索引
+            map.put("index","get_jipi_list");
+            //添加id
+            map.put("indexId","jiPiId");
+            allJiPiResult.add(map);
+            //新建索引
+            esFeign.insertIndex(allJiPiResult);
+            //删除
+            allJiPiResult.remove(allJiPiResult.size()-1);
+        }
+        if(allJiPiResult == null){
+            allJiPiResult = tmstruckWeightResultService.getAllJiMaoResult(mapValue);
+        }
         PageHelper.startPage(pageNum,pageSize);
         //分页数据
-        List<Map<String, Object>> jiMaoResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allJiMaoResult,jiMaoResult);
+        List<Map<String, Object>> jiPiResult = tmstruckWeightResultService.getAllJiPiResult(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allJiPiResult,jiPiResult);
         return success(pageList);
     }
 

+ 1 - 1
src/main/java/com/steerinfo/dil/feign/ESFeign.java

@@ -16,7 +16,7 @@ import java.util.Map;
  */
 
 
-@FeignClient(value = "DIL-ES-DEV",url = "https://portal-dev.steerinfo.com/icore.icp.web/pass/dil/dil-es-api")
+@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,

+ 1 - 1
src/main/resources/bootstrap.yml

@@ -35,7 +35,7 @@ openfeign:
 eureka:
   client:
     service-url:
-      defaultZone: http://root:root@${EUREKA_HOST:localhost}:${EUREKA_PORT:8061}/eureka/
+      defaultZone: http://root:root@${EUREKA_HOST:172.16.33.161}:${EUREKA_PORT:8061}/eureka/
 
   instance:
     prefer-ip-address: true