Merge branch 'master' of auyen/tms into test

src/main/java/com/aoyang/tms/controller/TruckEscortController.java

@@ -133,7 +133,7 @@ public class TruckEscortController {
             return new Result<>(ErrCodeEnum.ONLY_ONE_ESCORT.getCode(), ErrCodeEnum.ONLY_ONE_ESCORT.getMessage());
         }
 
-        return new Result<>(truckEscortService.add(param));
+        return truckEscortService.add(param);
     }
 
     @ApiOperation(value = "修改车辆押运员", notes = "必传参数:EscortId")

src/main/java/com/aoyang/tms/service/TruckEscortService.java

@@ -1,6 +1,7 @@
 package com.aoyang.tms.service;
 
 import com.aoyang.common.param.PageParam;
+import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.param.TruckEscortAddParam;
 import com.aoyang.tms.controller.param.TruckEscortListParam;
 import com.aoyang.tms.controller.vo.TruckDeptListVO;
@@ -55,7 +56,7 @@ public interface TruckEscortService extends IService<TruckEscort> {
      * @Date 2022/4/22
      * @Param
      **/
-    boolean add(TruckEscortAddParam param);
+    Result add(TruckEscortAddParam param);
 
 
     /**

src/main/java/com/aoyang/tms/service/impl/CommonServiceImpl.java

@@ -301,8 +301,8 @@ public class CommonServiceImpl implements CommonService {
     @Override
     public User addUser(User user) {
         Result<User> result = userFeignClient.add(user.getCreater() + "", user);
+        log.info("CommonServiceImpl addUser result:{}", JSON.toJSONString(result));
         if (verifyResult(result)) {
-            log.info("CommonServiceImpl addUser result:{}", JSON.toJSONString(result));
             return result.getData();
         }
         return null;

src/main/java/com/aoyang/tms/service/impl/TruckEscortServiceImpl.java

@@ -2,12 +2,14 @@ package com.aoyang.tms.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.aoyang.common.param.PageParam;
+import com.aoyang.common.result.Result;
 import com.aoyang.tms.controller.param.TruckEscortAddParam;
 import com.aoyang.tms.controller.param.TruckEscortListParam;
 import com.aoyang.tms.entity.Truck;
 import com.aoyang.tms.entity.TruckDriver;
 import com.aoyang.tms.entity.TruckEscort;
 import com.aoyang.tms.entity.User;
+import com.aoyang.tms.feign.UserFeignClient;
 import com.aoyang.tms.mapper.TruckEscortMapper;
 import com.aoyang.tms.service.CommonService;
 import com.aoyang.tms.service.TruckDriverService;
@@ -40,7 +42,9 @@ import java.util.List;
 public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, TruckEscort> implements TruckEscortService {
 
     @Resource
-    TruckEscortMapper truckEscortMapper;
+    private TruckEscortMapper truckEscortMapper;
+    @Resource
+    private UserFeignClient userFeignClient;
     @Resource
     private CommonService commonService;
 
@@ -89,7 +93,7 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
     }
 
     @Override
-    public boolean add(TruckEscortAddParam param) {
+    public Result<Boolean> add(TruckEscortAddParam param) {
         boolean flag = false;
         //添加用户
         User user = new User();
@@ -101,7 +105,11 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
         user.setCreater(param.getCreater());
         user.setCreaterName(param.getCreaterName());
         user.setCreateDate(param.getCreateDate());
-        User userSave = commonService.addUser(user);
+        Result<User> result = userFeignClient.add(user.getCreater() + "", user);
+        if (!commonService.verifyResult(result)) {
+            return new Result<>(result.getCode(), result.getMessage());
+        }
+        User userSave =result.getData();
         log.info("添加新的user,参数:{}", JSON.toJSONString(userSave));
 
         if (userSave != null) {
@@ -126,7 +134,7 @@ public class TruckEscortServiceImpl extends ServiceImpl<TruckEscortMapper, Truck
             }
             flag = saveOrUpdate(truckEscort);
         }
-        return flag;
+        return new Result<>(flag);
     }
 
     @Override