'修改火运'

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

@@ -68,7 +68,7 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
         if (con != null) {
             if (!"undefined".equals(con)) {
                 //设置要查询的索引名称
-                String index = "get_tmstrain_wagon_unload";
+                String index = "get_train_wagon_unload";
                 //获取查询结果
                 return success(esFeign.getConResult(mapValue, index, apiId, pageNum, pageSize, con));
             }
@@ -77,12 +77,12 @@ public class TmstrainWagonUnloadResultController extends BaseRESTfulController {
         List<Map<String, Object>> wagonUnloadList = null;
         mapValue.put("resultType", resultType);
         //如果有条件查询则跳过初始化，和创建索引
-        if (mapValue.size() == 0) {
+        if (mapValue.size() == 1) {
             //将查询结果存入索引中
             wagonUnloadList = tmstrainWagonUnloadResultService.getTmstrainWagonUnLoad(mapValue);
             Map<String, Object> map = new HashMap<>();
             //添加索引
-            map.put("index", "get_tmstrain_wagon_unload");
+            map.put("index", "get_train_wagon_unload");
             //添加id
             map.put("indexId", "resultId6");
             wagonUnloadList.add(map);

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

@@ -15,7 +15,7 @@ import java.util.Map;
  * @Version 1.0
  */
 
-@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,

src/main/resources/bootstrap.yml

@@ -23,7 +23,7 @@ openfeign:
   ESFeign:
     url: ${ESFEIGN_URL:localhost:8089}
   ColumnDataFeign:
-    url: ${COLUMNDATAFEIGN_URL:192.168.1.102:8083}
+    url: ${COLUMNDATAFEIGN_URL:localhost:8083}
   WmsBoundFeign:
     url: ${WMSHBOUNDFEIGN_URL:localhost:8070}