ddshsh

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

@@ -2,7 +2,6 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.RmsConsigneeServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -31,8 +30,7 @@ public class RmsConsigneeController extends BaseRESTfulController {
 
     @Autowired
     RmsConsigneeServiceImpl rmsConsigneeService;
-    @Autowired
-    ColumnDataUtil columnDataUtil;
+
 
     /**
      * 收货客户管理对接接口
@@ -47,32 +45,6 @@ public class RmsConsigneeController extends BaseRESTfulController {
         return success(result);
     }
 
-    /**
-     * 展示收获客户信息
-     * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @ApiOperation(value="展示收获客户信息", notes="分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/getConsigneeList")
-    public RESTfulResult getConsigneeList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                         Integer apiId){
-        List<Map<String,Object>> list = rmsConsigneeService.getConsigneeList(mapVal);
-        PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = rmsConsigneeService.getConsigneeList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
-        return success(data);
-    }
 
 
 }

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

@@ -2,7 +2,6 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.RmsMaterialServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -31,8 +30,7 @@ public class RmsMaterialController extends BaseRESTfulController {
 
     @Autowired
     RmsMaterialServiceImpl rmsMaterialService;
-    @Autowired
-    ColumnDataUtil columnDataUtil;
+
 
     /**
      * 物资管理对接接口
@@ -58,32 +56,6 @@ public class RmsMaterialController extends BaseRESTfulController {
         return success(result);
     }
 
-    /**
-     * 展示物资信息
-     * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @ApiOperation(value="展示物资信息", notes="分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/getMaterialList")
-    public RESTfulResult getMaterialList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                         Integer apiId){
-        List<Map<String,Object>> list = rmsMaterialService.getMaterialList(mapVal);
-        PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = rmsMaterialService.getMaterialList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
-        return success(data);
-    }
 
 
 }

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

@@ -2,7 +2,6 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.RmsMaterialSteelServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -27,8 +26,7 @@ public class RmsMaterialSteelController extends BaseRESTfulController {
 
     @Autowired
     RmsMaterialSteelServiceImpl rmsMaterialSteelService;
-    @Autowired
-    ColumnDataUtil columnDataUtil;
+
 
     /**
      * 得到没有质保书的炉号

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

@@ -2,7 +2,6 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.RmsPersonnelServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -31,8 +30,7 @@ public class RmsPersonnelController extends BaseRESTfulController {
 
     @Autowired
     RmsPersonnelServiceImpl rmsPersonnelService;
-    @Autowired
-    ColumnDataUtil columnDataUtil;
+
 
     /**
      * 人员管理对接接口
@@ -54,32 +52,6 @@ public class RmsPersonnelController extends BaseRESTfulController {
         return success(result);
     }
 
-    /**
-     * 展示人员信息
-     * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @ApiOperation(value="展示人员信息", notes="分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "197", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/getPersonnelList")
-    public RESTfulResult getPersonnelList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                         Integer apiId){
-        List<Map<String,Object>> list = rmsPersonnelService.getPersonnelList(mapVal);
-        PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = rmsPersonnelService.getPersonnelList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
-        return success(data);
-    }
 
 
 }

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

@@ -2,7 +2,6 @@ package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.service.impl.RmsSupplierServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
 import com.steerinfo.dil.util.PageListAdd;
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.pagehelper.PageHelper;
@@ -31,8 +30,7 @@ public class RmsSupplierController extends BaseRESTfulController {
 
     @Autowired
     RmsSupplierServiceImpl rmsSupplierService;
-    @Autowired
-    ColumnDataUtil columnDataUtil;
+
 
     /**
      * 供应商管理对接接口
@@ -58,32 +56,6 @@ public class RmsSupplierController extends BaseRESTfulController {
         return success(result);
     }
 
-    /**
-     * 展示供应商信息
-     * @param mapVal
-     * @param pageNum
-     * @param pageSize
-     * @param apiId
-     * @return
-     */
-    @ApiOperation(value="展示供应商信息", notes="分页查询")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "198", required = false, dataType = "BigDecimal"),
-    })
-    @PostMapping(value = "/getSupplierList")
-    public RESTfulResult getSupplierList(@RequestBody(required = false) Map<String,Object> mapVal,
-                                                      Integer pageNum,
-                                                      Integer pageSize,
-                                                      Integer apiId){
-        List<Map<String,Object>> list = rmsSupplierService.getSupplierList(mapVal);
-        PageHelper.startPage(pageNum, pageSize);
-        //分页查询数据
-        List<Map<String, Object>> columnList = rmsSupplierService.getSupplierList(mapVal);
-        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
-        return success(data);
-    }
 
 
 }

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

@@ -1,19 +0,0 @@
-package com.steerinfo.dil.feign;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Author zhangnan
- * @Date 2021/6/23 9:58
- * @Version 1.0
- */
-@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "${openfeign.ColumnDataFeign.url}")
-public interface ColumnDataFeign {
-    @RequestMapping("getColumnData")
-    List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);
-}

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -1,38 +0,0 @@
-package com.steerinfo.dil.util;
-
-import com.steerinfo.dil.feign.ColumnDataFeign;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.*;
-
-@Component
-public class ColumnDataUtil {
-    @Autowired
-    ColumnDataFeign columnDataFeign;
-
-    private Set<Map<String, Object>> setListMap(List<Map<String, Object>> list, String name) {
-        Set<Map<String, Object>> setString = new HashSet<>();
-        for (Map<String, Object> map : list) {//遍历每条数据
-            Map<String, Object> map1 = new HashMap<>();
-            //map.get(name)获取每条数据中对应表头字段的数据
-            map1.put("text", map.get(name));
-            if (map.get(name) != null) {
-                map1.put("value", map.get(name));
-                setString.add(map1);
-            }
-        }
-        return setString;
-    }
-
-    public PageListAdd tableColumnData(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data) {
-        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
-        for (Map<String, Object> columnData : columnDataList) {
-            //每个表头字段的过滤条件
-            columnData.put("filters", setListMap(list, columnData.get("prop").toString()));
-        }
-        PageListAdd pageList = new PageListAdd(data);
-        pageList.setColumnData(columnDataList);
-        return pageList;
-    }
-}

src/main/resources/bootstrap.yml

@@ -23,10 +23,6 @@ eureka:
     instance-id: ${spring.cloud.client.ip-address}:${server.port}
 
 
-openfeign:
-   ColumnDataFeign:
-   url: ${COLUMNDATAFEIGN_URL:localhost:8083}
-
 genxml:
   pth: com/a
 cache: