修改

src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -30,6 +30,7 @@ public class RequestFilter implements Filter {
            String userId = httpRequest.getHeader("userid");
            String userName = httpRequest.getHeader("username");
            String orgCode = httpRequest.getHeader("orgCode");
+           String roleCodes = httpRequest.getHeader("roleCodes");
            //获取cookie用户数据
            if (cookies != null && cookies.length > 0) {
                for (Cookie cookie : cookies) {
@@ -39,7 +40,9 @@ public class RequestFilter implements Filter {
                        userName = URLDecoder.decode(cookie.getValue(), "utf-8");
                    } else if (cookie.getName().equals("orgCode") && orgCode == null) {
                        orgCode = URLDecoder.decode(cookie.getValue(), "utf-8");
-                   } else if (userId != null && userName != null && orgCode != null) {
+                   } else if (cookie.getName().equals("roleCodes") && roleCodes == null) {
+                       roleCodes = URLDecoder.decode(cookie.getValue(), "utf-8");
+                   }else if (userId != null && userName != null && orgCode != null && roleCodes != null) {
                        //都查到了，退出
                        break;
                    }
@@ -47,9 +50,11 @@ public class RequestFilter implements Filter {
            }
            userName = URLDecoder.decode(userName, "utf-8");
            orgCode = URLDecoder.decode(orgCode, "utf-8");
+           roleCodes = URLDecoder.decode(roleCodes, "utf-8");
            httpRequest.setAttribute("userId", userId);
            httpRequest.setAttribute("userName", userName);
            httpRequest.setAttribute("orgCode", orgCode);
+           httpRequest.setAttribute("roleCodes", roleCodes);
            //获取RequestBody数据
            BufferedReader streamReader = new BufferedReader(new InputStreamReader(request.getInputStream(), "UTF-8"));
            StringBuilder strBuilder = new StringBuilder();
@@ -63,6 +68,7 @@ public class RequestFilter implements Filter {
                params.put("userId", userId);
                params.put("userName", userName);
                params.put("orgCode", orgCode);
+               params.put("roleCodes",roleCodes);
                //将新的RequestBody写入新的请求对象保存
                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());
                chain.doFilter(requestWrapper, response);
@@ -70,8 +76,6 @@ public class RequestFilter implements Filter {
                chain.doFilter(request, response);
            }
        } catch (Exception e) {
-           e.printStackTrace();
-           log.error(e.getStackTrace());
            chain.doFilter(request, response);
        }
     }

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

@@ -131,6 +131,16 @@ public class AMScontroller {
         return amsFeign.purchaseRequirementUpdate(map);
     }
 
+    @ApiOperation(value = "采购需求修改接口", notes = "采购需求修改接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/purchaseRequirementReturn")
+    @LogAround(foreignKeys = {"transRequirementId"}, foreignKeyTypes = {"采购需求"})
+    public Map<String, Object> purchaseRequirementReturn(@RequestBody(required = false) Map<String, Object> map) {
+        return amsFeign.purchaseRequirementReturn(map);
+    }
+
     @ApiOperation(value = "采购需求修改状态接口", notes = "采购需求修改状态接口")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")

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

@@ -256,7 +256,6 @@ public class RMScontroller extends BaseRESTfulController {
                                                 Integer pageSize,
                                                 String con
     ) {
-
         return rmsFeign.getPersonnelList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
     }
 
@@ -446,19 +445,28 @@ public class RMScontroller extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "apiId", value = "196", required = false, dataType = "BigDecimal"),
     })
-    @PostMapping(value = "/getDriverCapacityList")
-    public Map<String, Object> getDriverCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+    @PostMapping(value = "/getCapacityDriverList")
+    public Map<String, Object> getCapacityDriverList(@RequestBody(required = false) Map<String, Object> mapValue,
                                                      Integer pageNum,
                                                      Integer pageSize,
                                                      Integer apiId) {
-        return rmsFeign.getDriverCapacityList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return rmsFeign.getCapacityDriverList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
 
     @ApiOperation(value = "创建", notes = "根据RmsDriverCapacity对象创建")
-    @ApiImplicitParam(name = "rmsDriverCapacity", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
+    @ApiImplicitParam(name = "rmsCapacityDriver", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
     @PostMapping(value = "/insertDriverCapacity")
-    public Map<String, Object> insertDriverCapacity(@RequestBody(required = false) Map<String, Object> map) {
-        return rmsFeign.insertDriverCapacity(map);
+    @LogAround(foreignKeys = {"capacityDriverId"},foreignKeyTypes = {"司机排班"})
+    public Map<String, Object> insertCapacityDriver(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertCapacityDriver(map);
+    }
+
+    @ApiOperation(value = "创建", notes = "根据RmsDriverCapacity对象创建")
+    @ApiImplicitParam(name = "rmsCapacityDriver", value = "详细实体rmsDriverCapacity", required = true, dataType = "RmsDriverCapacity")
+    @PostMapping(value = "/deleteCapacityDriver")
+    @LogAround(foreignKeys = {"capacityDriverId"},foreignKeyTypes = {"司机排班"})
+    public Map<String, Object> deleteCapacityDriver(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.deleteCapacityDriver(map);
     }
 
 
@@ -764,11 +772,7 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.insertTransRange(map);
     }
 
-    @PostMapping(value = "/test")
-    @LogAround(foreignKeys = {"orderId"}, foreignKeyTypes = {"运输订单"}, description = "测试日志功能")
-    public RESTfulResult test(@RequestBody(required = false) Map<String, Object> map) {
-        return success(map, "测试成功！");
-    }
+
 
     @ApiOperation(value = "新增集装箱数据")
     @PostMapping("insetShipContainer")

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

@@ -51,124 +51,86 @@ public class UniversalController extends BaseRESTfulController {
     private ImageFileUtils imageFileUtils;
 
     @ApiModelProperty(value = "边输边查物资大类")
-    @GetMapping("/getMaterialTypeByLike")
-    public RESTfulResult getMaterialTypeByLike(String index,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("id",id);
+    @PostMapping("/getMaterialTypeByLike")
+    public RESTfulResult getMaterialTypeByLike(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getMaterialTypeByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查物资")
-    @GetMapping("/getMaterialByLike")
-    public RESTfulResult getMaterialByLike(String index,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("id",id);
+    @PostMapping("/getMaterialByLike")
+    public RESTfulResult getMaterialByLike(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getMaterialByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查运力类型")
-    @GetMapping("/getCapacityTypeByLike")
-    public RESTfulResult getCapacityTypeByLike(String index,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("id",id);
+    @PostMapping("/getCapacityTypeByLike")
+    public RESTfulResult getCapacityTypeByLike(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getCapacityTypeByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查公司单位")
-    @GetMapping("/getCompanyMesByLike")
-    public RESTfulResult getCompanyMesByLike(String index,String companyType,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("companyType",companyType);
-        map.put("id",id);
+    @PostMapping("/getCompanyMesByLike")
+    public RESTfulResult getCompanyMesByLike(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getCompanyMesByLike(map);
         return success(list);
     }
 
 
     @ApiModelProperty(value = "边输边查环保标准")
-    @GetMapping("/getEmissionStandardByLike")
-    public RESTfulResult getEmissionStandardByLike(String index,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("id",id);
+    @PostMapping("/getEmissionStandardByLike")
+    public RESTfulResult getEmissionStandardByLike(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getEmissionStandardByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查作业点")
-    @GetMapping("/getOperationPointByLike")
-    public RESTfulResult getOperationPointByLike(String index,String operationPointType,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("operationPointType",operationPointType);
-        map.put("id",id);
+    @PostMapping("/getOperationPointByLike")
+    public RESTfulResult getOperationPointByLike(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getOperationPointByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查人员")
-    @GetMapping("/getPersonnelByLike")
-    public RESTfulResult getPersonnelByLike(String index,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("id",id);
+    @PostMapping("/getPersonnelByLike")
+    public RESTfulResult getPersonnelByLike(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getPersonnelByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查车牌号")
     @PostMapping("/getCapacityByLike")
-    public RESTfulResult getCapacityByLike(String index,String orgCode,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("orgCode",orgCode);
-        map.put("id",id);
+    public RESTfulResult getCapacityByLike(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getCapacityByLike(map);
         return success(list);
     }
+
     @ApiModelProperty(value = "边输边查快捷需求code")
-    @GetMapping("/getCategoryCodeByLike")
-    public RESTfulResult getCategoryCodeByLike(String index,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("id",id);
+    @PostMapping("/getCategoryCodeByLike")
+    public RESTfulResult getCategoryCodeByLike(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getCategoryCodeByLike(map);
         return success(list);
     }
     @ApiModelProperty(value = "边输岗位信息")
-    @GetMapping("/getJobInfosByLike")
-    public RESTfulResult getrmsrmsjobinfosBylike(String index,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("id",id);
+    @PostMapping("/getJobInfosByLike")
+    public RESTfulResult getrmsrmsjobinfosBylike(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getrmsrmsjobinfosBylike(map);
         return success(list);
     }
 
 
     @ApiModelProperty(value = "边输边查运输范围")
-    @GetMapping("/getTransRangeByLike")
-    public RESTfulResult getTransRange(String index,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("id",id);
+    @PostMapping("/getTransRangeByLike")
+    public RESTfulResult getTransRange(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getTransRangeByLike(map);
         return success(list);
     }
 
     @ApiModelProperty(value = "边输边查作业路径")
-    @GetMapping("/getLineByLike")
-    public RESTfulResult getLineByLike(String index,@RequestParam(required = false) List<String> id) {
-        Map<String,Object> map = new HashMap<>();
-        map.put("index",index);
-        map.put("id",id);
+    @PostMapping("/getLineByLike")
+    public RESTfulResult getLineByLike(@RequestBody(required = false) Map<String,Object> map) {
         List<Map<String, Object>> list = universalMapper.getLineByLike(map);
         return success(list);
     }

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

@@ -57,6 +57,9 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementUpdate")
     Map<String, Object> purchaseRequirementUpdate(Map<String, Object> map);
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementReturn")
+    Map<String, Object> purchaseRequirementReturn(Map<String, Object> map);
+
     @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseRequirementChange")
     Map<String, Object> purchaseRequirementChange(Map<String, Object> map);
 

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

@@ -253,27 +253,20 @@ public interface RmsFeign {
 
     //=================司机排班
     //获取司机排班信息
-    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverCapacityList")
-    Map<String, Object> getDriverCapacityList(@RequestBody(required = false) Map<String, Object> mapValue,
+    @PostMapping(value = "api/v1/rms/rmscapacitydrivers/getCapacityDriverList")
+    Map<String, Object> getCapacityDriverList(@RequestBody(required = false) Map<String, Object> mapValue,
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize);
 
     //新增司机排班信息
-    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/insertDriverCapacity")
-    Map<String, Object> insertDriverCapacity(@RequestBody(required = false) Map<String, Object> map);
-
-    //更新司机排班信息
-    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/updateDriverCapacity")
-    Map<String, Object> updateDriverCapacity(@RequestBody(required = false) Map<String, Object> map);
+    @PostMapping(value = "api/v1/rms/rmscapacitydrivers/insertCapacityDriver")
+    Map<String, Object> insertCapacityDriver(@RequestBody(required = false) Map<String, Object> map);
 
     //删除司机排班信息
-    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/deleteDriverCapacity/{id}")
-    Map<String, Object> deleteDriverCapacity(@PathVariable("id") BigDecimal id);
+    @PostMapping(value = "api/v1/rms/rmscapacitydrivers/deleteCapacityDriver")
+    Map<String, Object> deleteCapacityDriver(@RequestBody(required = false) Map<String, Object> map);
 
-    //根据id获取司机排班
-    @PostMapping(value = "api/v1/rms/rmsdrivercapacity/getDriverCapacityById/{id}")
-    Map<String, Object> getDriverCapacityById(@PathVariable("id") BigDecimal id);
 
 
     //================作业点

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

@@ -236,6 +236,7 @@
     <select id="getCapacityByLike" resultType="java.util.Map">
         select * from (
             SELECT DISTINCT
+            RCA .CAPACITY_ID "capacityId",
             RCA .CAPACITY_ID "id",
             RCA .CAPACITY_ID "value",
             RCA .CAPACITY_NUMBER "label",
@@ -244,7 +245,7 @@
             LEFT JOIN RMS_CAPACITY_CARRIER RCC ON RCA .CAPACITY_ID = RCC .CAPACITY_ID
             LEFT JOIN RMS_COMPANY RC ON RC .COMPANY_ID = RCC .COMPANY_ID
             WHERE RCA .DELETED = 0
-            <if test="orgCode!=null and orgCode!=''">
+            <if test="orgCode!=null and orgCode !='' and roleCodes.contains('chengyunshang')">
                 AND RC.SSO_CODE = #{orgCode}
             </if>
         )