修改

src/main/java/com/steerinfo/dil/aspect/LogAspect.java

@@ -68,8 +68,8 @@ public class LogAspect {
             }
         }
         if(map==null || map.get("userId")==null ||map.get("userName") ==null){
-            log.error("缺乏日志必要参数"+requestParams);
-            return new RESTfulResult("500","缺乏日志必要参数"+requestParams,"缺乏日志必要参数"+requestParams);
+            log.error("缺乏日志必要参数"+map);
+            return new RESTfulResult("500","缺乏日志必要参数"+map,"缺乏日志必要参数"+map);
         }
         //获取切点处的注解及其参数
         LogAround logAround = method.getAnnotation(LogAround.class);
@@ -82,7 +82,7 @@ public class LogAspect {
         log.info("执行===" + methodName + "===开始");
         log.info("方法描述：" + description);
         log.info("方法名：" + signature);
-        log.info("方法参数：" + requestParams);
+        log.info("方法参数：" + map);
         //记录当前时间
         Date beginTime = new Date();
         //执行方法，并取得返回值
@@ -124,7 +124,6 @@ public class LogAspect {
                     logResult.setFilePath(logPrefix+format.format(beginTime));
                     logResult.setInsertUsername(""+map.get("userId"));
                     logResult.setRemark("自动记录");
-                    log.info("logResult:\n"+logResult);
                     logResults.add(logResult);
                 }
                 logResultMapper.batchInsert(logResults);

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

@@ -36,14 +36,14 @@ public class RequestFilter implements Filter {
                 if (userId==null && cookie.getName().equals("userId")) {
                     userId = cookie.getValue();
                 }else if(userName==null && cookie.getName().equals("userName")){
-                    userName = cookie.getValue();
+                    userName = URLDecoder.decode(cookie.getValue(),"utf-8");
                 }else if(userId!=null && userName!=null){
                     //都查到了，退出
                     break;
                 }
             }
             httpRequest.setAttribute("userId",userId);
-            httpRequest.setAttribute("userName", URLDecoder.decode(userName,"utf-8"));
+            httpRequest.setAttribute("userName", userName);
             //获取RequestBody数据
             BufferedReader streamReader = new BufferedReader( new InputStreamReader(request.getInputStream(), "UTF-8"));
             StringBuilder strBuilder = new StringBuilder();

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

@@ -235,7 +235,7 @@ public class RMScontroller extends BaseRESTfulController {
 
 
     //================公司
-    @ApiOperation(value="展示供应商信息")
+    @ApiOperation(value="展示公司信息")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -251,27 +251,30 @@ public class RMScontroller extends BaseRESTfulController {
     ){
         return   rmsFeign.getCompanyList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
     }
-    @ApiOperation(value="新增供应商信息", notes="根据rmsCompany对象创建")
+    @ApiOperation(value="新增公司信息", notes="根据rmsCompany对象创建")
     @ApiImplicitParam(name = "rmsCompany", value = "详细实体rmsCompany", required = true, dataType = "rmsCompany")
     @PostMapping(value = "/insertCompany")
+    @LogAround(foreignKeys = {"companyId"},foreignKeyTypes = "公司",description = "新增公司单位")
     public Map<String, Object> insertCompany(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.insertCompany(map);
     }
-    @ApiOperation(value="删除", notes="根据rmsCompany对象创建")
-    @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
+    @ApiOperation(value="删除")
+    @ApiImplicitParam(name = "公司id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/deleteCompany")
+    @LogAround(foreignKeys = {"companyId"},foreignKeyTypes = "公司",description = "删除公司单位")
     public Map<String, Object> deleteCompany(@RequestBody Map<String,Object> map){
         return rmsFeign.deleteCompany(map);
     }
 
-    @ApiOperation(value="更新供应商信息", notes="根据rmsCompany对象创建")
+    @ApiOperation(value="更新公司信息", notes="根据rmsCompany对象创建")
     @ApiImplicitParam(name = "rmsCompany", value = "详细实体rmsCompany", required = true, dataType = "rmsCompany")
     @PostMapping(value = "/updateCompany")
+    @LogAround(foreignKeys = {"companyId"},foreignKeyTypes = "公司",description = "修改公司单位")
     public Map<String, Object> updateCompany(@RequestBody(required = false) Map<String, Object> map){
         return rmsFeign.updateCompany(map);
     }
-    @ApiOperation(value="根据id查询供应商信息", notes="根据rmsCompany对象创建")
-    @ApiImplicitParam(name = "承运商id", value = "id", required = true, dataType = "int")
+    @ApiOperation(value="根据id查询公司信息", notes="根据rmsCompany对象创建")
+    @ApiImplicitParam(name = "公司id", value = "id", required = true, dataType = "int")
     @PostMapping(value = "/getCompanyById/{id}")
     public Map<String, Object> getCompanyById(@PathVariable("id")BigDecimal id){
         return rmsFeign.getCompanyById(id);
@@ -491,7 +494,7 @@ public class RMScontroller extends BaseRESTfulController {
     }
 
     @GetMapping(value="getCarrierId")
-    @ApiOperation(value = "获取承运商下拉id")
+    @ApiOperation(value = "获取公司下拉id")
     public Map<String,Object> getCarrierId(){
         return rmsFeign.getCarrierId();
     }
@@ -652,12 +655,12 @@ public class RMScontroller extends BaseRESTfulController {
     public Map<String,Object> getShipperMap(@RequestParam Integer shipperId) {
         return  rmsFeign.getShipperMap(shipperId);
     }
-    //根据运力id查询承运商
+    //根据运力id查询公司
     @PostMapping(value = "getCarrierNameById/{id}")
     public Map<String,Object> getCarrierNameById(@PathVariable("id") BigDecimal id){
         return rmsFeign.getCarrierNameById(id);
     }
-   //根据司机id查询承运商
+   //根据司机id查询公司
    @PostMapping(value = "getCarrierNameByDriverId/{id}")
    public Map<String,Object> getCarrierNameByDriverId(@PathVariable("id") BigDecimal id){
        return rmsFeign.getCarrierNameByDriverId(id);
@@ -715,7 +718,7 @@ public class RMScontroller extends BaseRESTfulController {
         return rmsFeign.oilNameSelect();
     }
 
-    @ApiOperation("解除承运商和车辆的绑定关系")
+    @ApiOperation("解除公司和车辆的绑定关系")
     @PostMapping("/deleteCapacityCarrier")
     public RESTfulResult deleteCapacityCarrier(@RequestBody(required = false) Map<String,Object> map){
         return rmsFeign.deleteCapacityCarrier(map!=null?map:new HashMap<>());

src/main/resources/application-prod.yml

@@ -44,7 +44,9 @@ openfeign:
 #前缀
 prefix:
   logPrefix: E:\logs\log\running.log.
-  picPrefix: E:\picture
+#  logPrefix: \data\antai-api\running.log.
+  picPrefix: E:\logs\file
+#  picPrefix: \data\file
 
 #远程调用
 feign: