Merge remote-tracking branch 'origin/base-modify' into base-modify

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -5,7 +5,9 @@ import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
@@ -58,7 +60,7 @@ import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.
 
 @Service
 @Slf4j
-public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
+public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserRestInterface {
 
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
     public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
@@ -83,7 +85,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
     @Autowired
     private VehicleBookHourInfoBiz vehicleBookHourInfoBiz;
     @Autowired
-    AdminInfoFeign adminInfoFeign;
+    UserFeign userFeign;
+
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
     @Value("${vehicle.baseUploadPath}")
     private String baseUploadPath ;
     @Value("${vehicle.fristMileage}")
@@ -1265,7 +1273,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         Integer limit = vehiclePlanDto.getLimit() == null ? 10 : vehiclePlanDto.getLimit();
         vehiclePlanDto.setPage(page);
         vehiclePlanDto.setLimit(limit);
-        UserDTO userDTO = adminInfoFeign.getAdminUserInfo();
+        UserDTO userDTO = getAdminUserInfo();
         if(userDTO == null) {
             return ObjectRestResponse.createFailedResult(235, "token失效");
         }