局部修改

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/AdminBootstrap.java

@@ -21,9 +21,8 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableDiscoveryClient
 @EnableCircuitBreaker
 @SpringBootApplication
-
-@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign","com.xxfc.platform","com.github.wxiaoqi.security.admin.feign"})
-//@EnableFeignClients({"com.github.wxiaoqi.security","com.xxfc.platform"})
+//@EnableFeignClients({"com.github.wxiaoqi.security.auth.client.feign","com.xxfc.platform","com.github.wxiaoqi.security.admin.feign"})
+@EnableFeignClients({"com.github.wxiaoqi.security","com.xxfc.platform"})
 @EnableScheduling
 @EnableAceAuthClient
 @EnableAceCache

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

@@ -891,7 +891,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         fillBookedDateSearchParam(params,yearMonthAndDate,yearMonthAndDateNotBooked);
     }
 
-    public PageDataVO<Vehicle> searchUsableVehicle(RentVehicleBookDTO dto){
+    public PageDataVO<Vehicle>  searchUsableVehicle(RentVehicleBookDTO dto){
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         List<String> notBookedDates = Lists.newArrayList();
         if(StringUtils.isNotBlank(dto.getBookEndDate())&&
@@ -1010,6 +1010,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
                                .andEqualTo(Vehicle::getId,id)
                                .andEqualTo(Vehicle::getStatus,0))
                        .build()));
+
     }
 
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -272,7 +272,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
     @RequestMapping(value = "/book/4employee/lift", method = RequestMethod.PUT)
     public RestResponse<Integer> liftVehicle(@RequestBody LiftVehicleVo liftVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
-        String userName = BaseContextHandler.getName();
+        String userName = BaseContextHandler.getName ();
         return vehicleBookRecordBiz.lift(operatorId, userName, liftVehicleVo);
     }
 

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.rest;
 import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
@@ -54,6 +55,9 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @Autowired
     private UserFeign userFeign;
 
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+
 
     //修改评分
     @RequestMapping(value = "/app/addScore", method = RequestMethod.GET)
@@ -87,7 +91,17 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @ApiOperation("车型列表")
     @PostMapping(value = "/app/findVehicleModelPage")
     public ObjectRestResponse<VehicleModelVo> findVehicleModelPage(
-            @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc) {
+            @RequestBody @ApiParam("查询条件") VehicleModelQueryCondition vmqc ,HttpServletRequest request) {
+
+//        UserDTO user = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+//
+//        if (user!=null) {
+//            if (user.getDataAll()==2) {
+//
+//            }
+//        }
+
+
         if (vmqc == null || vmqc.getPage() == null || vmqc.getLimit() == null || vmqc.getPage() < 0 || vmqc.getLimit() <= 0) {
             return ObjectRestResponse.createDefaultFail();
         }
@@ -209,6 +223,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
                 VehicleCata vc = new VehicleCata();
                 vc.setCataId(Integer.parseInt(con));
                 vc.setVehicleModelId(vm.getId());
+                vc.setCrtTime(System.currentTimeMillis());
                 vcs.add(vc);
             }
             vehicleCataBiz.inserts(vcs);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleUpkeepController.java

@@ -44,7 +44,7 @@ public class VehicleUpkeepController {
     }
 
     /**
-     * 保存保养项目
+     * 添加保养项目
      * @param name
      * @return
      */
@@ -150,7 +150,6 @@ public class VehicleUpkeepController {
         }
         vehicleUpkeepService.addLog(vulvo);
         return RestResponse.suc();
-
     }
 
 }