合并代码

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java

@@ -21,6 +21,8 @@ public interface UserFeign {
     public ObjectRestResponse<UserDTO> userinfoByToken(@RequestParam("token") String token);
     @RequestMapping(value = "/public/app/userinfo-by-token")
     public ObjectRestResponse<AppUserDTO> userDetailByToken(@RequestParam("token") String token);
+    @RequestMapping(value = "/public/userinfo-by-uid")
+    public ObjectRestResponse<UserDTO> userinfoByUid(@RequestParam("uid") Integer uid);
 
 
     /**

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

@@ -75,6 +75,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
 
     @Value("${vehicle.baseUploadPath}")
     private String baseUploadPath ;
+    @Value("${vehicle.fristMileage}")
+    private Integer fristMileage ;
 
     /**
      * 每批次最大更、插入车辆最大条目数
@@ -185,6 +187,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             Vehicle vehicle = new Vehicle();
             BeanUtils.copyProperties(vehicle, addOrUpdateVehicleVo);
             vehicle.setId(UUID.randomUUID().toString());
+            vehicle.setParkBranchCompanyId(vehicle.getSubordinateBranch());
+            vehicle.setMaintenanceMileage(fristMileage);
 //            检查车牌或者编码是否已存在，已存在则返回失败
             List<Vehicle> exitsVehicles = lockByCode(addOrUpdateVehicleVo);
             if(CollectionUtils.isNotEmpty(exitsVehicles)){
@@ -228,6 +232,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         for(AddOrUpdateVehicleVo addOrUpdateVehicleVo:addOrUpdateVehicleVoList){
             Vehicle vehicle = new Vehicle();
             BeanUtils.copyProperties(vehicle, addOrUpdateVehicleVo);
+            vehicle.setParkBranchCompanyId(vehicle.getSubordinateBranch());
             //悲观锁，检查是否已存在车牌或编码
             List<Vehicle> exitsVehicles = lockByCode(addOrUpdateVehicleVo);
             if(CollectionUtils.isNotEmpty(exitsVehicles)){
@@ -305,8 +310,9 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
         vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
         vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
+        vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
         vehicleBookRecordMapper.insertSelective(vehicleBookRecord);
-
+        Long bookRecordId=vehicleBookRecord.getId();
         //修改相关车辆预定记录
         Boolean hasSuc = bookedVehicle(bookVehicleVo);
         if(!hasSuc){

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.biz;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -89,16 +90,28 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     }
 
     public RestResponse<Integer> retVehicle(Integer operatorId, String userName, RetVehicleVo retVehicleVo) throws Exception{
-        Map<String, Object> params = PropertyUtils.describe(retVehicleVo);
-        params.put("targetStatus", VehicleBookRecordStatus.RETURNED.getCode());
-        params.put("conditionStatus", VehicleBookRecordStatus.LIFTED.getCode());
-        params.put("reviewerReturn", operatorId);
-        params.put("reviewerNameReturn", userName);
-        params.put("mileageRet", retVehicleVo.getMileageRet());
-        params.put("haveViolation", retVehicleVo.getHaveViolation());
-        Integer effected = mapper.liftOrRet(params);
-        if(effected == 0){
-            return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_STATUS_CHANGED.getCode());
+        VehicleBookRecord record=mapper.selectByPrimaryKey( retVehicleVo.getId());
+        Integer mileageRet=retVehicleVo.getMileageRet();
+        if(record==null||mileageRet==null){
+            //return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
+            throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
+        }
+
+        Integer mileageLift=record.getMileageLift();
+        if(mileageLift!=null&&mileageRet>=mileageLift){
+            Map<String, Object> params = PropertyUtils.describe(retVehicleVo);
+            params.put("targetStatus", VehicleBookRecordStatus.RETURNED.getCode());
+            params.put("conditionStatus", VehicleBookRecordStatus.LIFTED.getCode());
+            params.put("reviewerReturn", operatorId);
+            params.put("reviewerNameReturn", userName);
+            params.put("mileageRet", mileageRet);
+            params.put("haveViolation", retVehicleVo.getHaveViolation());
+            Integer effected = mapper.liftOrRet(params);
+            if(effected == 0){
+                return RestResponse.code(ResCode.VEHICLE_BOOKED_RECORD_STATUS_CHANGED.getCode());
+            }
+        }else{
+            throw new BaseException(ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getDesc(), ResCode.VEHICLE_BOOKED_RECORD_MILEAGE_CHANGED.getCode());
         }
         return RestResponse.suc();
     }
@@ -109,7 +122,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
      * @return
      * @throws Exception
      */
-    public PageDataVO<QueryVehicleBookRecordVo> page(VehicleBookRecordQueryVo vehicleBookRecordQueryVo) throws Exception{
+    public PageDataVO<QueryVehicleBookRecordVo> page(VehicleBookRecordQueryVo vehicleBookRecordQueryVo, List<Integer> companyList) throws Exception{
         Map<String, Object> params = PropertyUtils.describe(vehicleBookRecordQueryVo);
         String selectedMonth = (String)params.get("selectedMonth");
         if(StringUtils.isBlank(selectedMonth)){
@@ -128,6 +141,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         params.remove("pageSize");
         Integer pageNo = (Integer) params.get("page");
         params.remove("pageNo");
+        params.put("companyList", companyList);
         PageHelper.startPage(pageNo,pageSize);
         List<QueryVehicleBookRecordVo> bookRecordAndVehicleInfo = mapper.getByPage(params);
         Map<Long,Map<Integer,Integer>> rs = getRelatedAccItemsAndAmount(bookRecordAndVehicleInfo,

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

@@ -25,17 +25,17 @@ public class VehicleDepartureService {
     @Autowired
     VehicleMapper vehicleMapper;
 
-    public PageInfo<VehicleDepartureLogVo> page(String numberPlate, Integer page, Integer limit) {
+    public PageInfo<VehicleDepartureLogVo> page(String numberPlate, String time, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(vehicleDepartureLogMapper.selectVoAll(numberPlate));
+        return new PageInfo<>(vehicleDepartureLogMapper.selectVoAll(numberPlate, time));
     }
 
-    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate, Integer page, Integer limit, List<Integer> companyList) {
+    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate, String time, Integer page, Integer limit, List<Integer> companyList) {
         PageHelper.startPage(page, limit);
         if (companyList == null || companyList.size() == 0) {
             companyList = Arrays.asList(-1);
         }
-        return new PageInfo<>(vehicleDepartureLogMapper.selectVoAllNotAllData(numberPlate, companyList));
+        return new PageInfo<>(vehicleDepartureLogMapper.selectVoAllNotAllData(numberPlate, time, companyList));
     }
 
     public PageInfo<VehicleDepartureLogVo> findByVehicle(String vehicleId, Integer page, Integer limit) {

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

@@ -44,9 +44,9 @@ public class VehicleUpkeepService {
         vehicleUpkeepItemMapper.deleteByPrimaryKey(id);
     }
 
-    public PageInfo<VehicleUpkeepLogVo> pageLog(String numberPlate, Integer page, Integer limit) {
+    public PageInfo<VehicleUpkeepLogVo> pageLog(String numberPlate, Integer page, Integer limit, List<Integer> companyList) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(vehicleUpkeepLogMapper.selectVoAll(numberPlate));
+        return new PageInfo<>(vehicleUpkeepLogMapper.selectVoAll(numberPlate, companyList));
     }
 
     public VehicleUpkeepLogVo getLogVoById(Integer id) {

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

@@ -87,7 +87,7 @@ public class VehicleWarningMsgBiz extends BaseBiz<VehicleWarningMsgMapper, Vehic
      */
     public PageDataVO<VehicleWarningMsg> getByPage(QueryVehicleWarningMsgVo queryVehicleWarningMsgVo){
         PageHelper.startPage(queryVehicleWarningMsgVo.getPage(),queryVehicleWarningMsgVo.getLimit());
-        List<VehicleWarningMsg> vehicleWarningMsgs = mapper.getByPage(queryVehicleWarningMsgVo);
+        List<VehicleWarningMsg> vehicleWarningMsgs = mapper.getByPages(queryVehicleWarningMsgVo);
         PageInfo<VehicleWarningMsg> vehicleWarningMsgPageInfo = new PageInfo<>(vehicleWarningMsgs);
         return PageDataVO.pageInfo(vehicleWarningMsgPageInfo);
     }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleDepartureLogMapper.java

@@ -13,11 +13,11 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
 
     List<VehicleDepartureLogVo> selectByVehicleId(String vehicleId);
 
-    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate);
+    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate, @Param("time") String time);
 
-    List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("companyList") List<Integer> companyList);
+    List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("time") String time, @Param("companyList") List<Integer> companyList);
 
     Integer selectMileageByVehicleId(String vehicleId);
 
-    Integer selectDayByVehicleId(String vehicleId);
+    String selectDayByVehicleId(String vehicleId);
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleMapper.java

@@ -32,4 +32,11 @@ public interface VehicleMapper extends Mapper<Vehicle> {
     List<UsableVehicleModelVO> searchUsableModel(Map<String, Object> params);
 
     List<Vehicle> searchUsableVehicle(Map<String, Object> params);
+
+    //保养结束
+    int updateMileageStatusByIdAndStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status,
+                                         @Param("lastStatus") Integer lastStatus,@Param("mileage") Integer mileage);
+    //开始保养
+    int upMileageByIdAndStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status,
+                               @Param("lastStatus") Integer lastStatus,@Param("mileage") Integer mileage);
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleUpkeepLogMapper.java

@@ -9,7 +9,7 @@ import tk.mybatis.mapper.common.Mapper;
 import java.util.List;
 
 public interface VehicleUpkeepLogMapper extends Mapper<VehicleUpkeepLog> {
-    List<VehicleUpkeepLogVo> selectVoAll(@Param("numberPlate") String numberPlate);
+    List<VehicleUpkeepLogVo> selectVoAll(@Param("numberPlate") String numberPlate, @Param("companyList")List<Integer> companyList);
 
     VehicleUpkeepLogVo selectVoById(Integer id);
 

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

@@ -57,6 +57,23 @@ public class VehicleActiveController {
         return RestResponse.suc();
     }
 
+    /**
+     * 还车
+     *
+     * @param arrivalVo
+     * @return
+     */
+    @PostMapping("small/arrival")
+    public RestResponse arrivalBySmall(@RequestBody VehicleArrivalVo arrivalVo) {
+        if (arrivalVo == null || arrivalVo.getVehicleId() == null
+                || arrivalVo.getMileage() == null) {
+            return RestResponse.codeAndMessage(ResCode.INVALID_REST_REQ_PARAM.getCode(),
+                    ResCode.INVALID_REST_REQ_PARAM.getDesc());
+        }
+        vehicleActiveService.arrival(arrivalVo);
+        return RestResponse.suc();
+    }
+
     /**
      * 还车
      *
@@ -74,6 +91,8 @@ public class VehicleActiveController {
         return RestResponse.suc();
     }
 
+
+
     /**
      * 保养
      *

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

@@ -116,27 +116,27 @@ public class VehicleController extends BaseController<VehicleBiz> {
         }
     }
 
-//    @RequestMapping(value = "/small/page", method = RequestMethod.GET)
-//    @IgnoreUserToken
-//    public RestResponse<PageDataVO<QueryVehicleVo>> getByPageBySmall(@RequestParam String vehiclePageQueryVoJson,@RequestParam Integer uid) throws Exception {
-//        VehiclePageQueryVo vehiclePageQueryVo = null;
-//        try {
-//            vehiclePageQueryVo = JSON.parseObject(vehiclePageQueryVoJson, VehiclePageQueryVo.class);
-//            UserDTO userDTO = userFeign.userinfoByUid(uid).getData();
-//            if (userDTO != null) {
-//                if (userDTO.getDataAll() == 2) {
-//                    List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
-//                    return RestResponse.data(baseBiz.getByPageNotAllData(vehiclePageQueryVo, companyList));
-//                }
-//            }
-//
-//            return RestResponse.data(baseBiz.getByPage(vehiclePageQueryVo));
-//        } catch (JSONException ex) {
-//            return RestResponse.code(ResCode.INVALID_REST_REQ_PARAM.getCode());
-//        } catch (CustomIllegalParamException ex) {
-//            return RestResponse.code(ResCode.INVALID_REST_REQ_PARAM.getCode());
-//        }
-//    }
+    @RequestMapping(value = "/small/page", method = RequestMethod.GET)
+    @IgnoreUserToken
+    public RestResponse<PageDataVO<QueryVehicleVo>> getByPageBySmall(@RequestParam String vehiclePageQueryVoJson,@RequestParam Integer uid) throws Exception {
+        VehiclePageQueryVo vehiclePageQueryVo = null;
+        try {
+            vehiclePageQueryVo = JSON.parseObject(vehiclePageQueryVoJson, VehiclePageQueryVo.class);
+            UserDTO userDTO = userFeign.userinfoByUid(uid).getData();
+            if (userDTO != null) {
+                if (userDTO.getDataAll() == 2) {
+                    List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+                    return RestResponse.data(baseBiz.getByPageNotAllData(vehiclePageQueryVo, companyList));
+                }
+            }
+
+            return RestResponse.data(baseBiz.getByPage(vehiclePageQueryVo));
+        } catch (JSONException ex) {
+            return RestResponse.code(ResCode.INVALID_REST_REQ_PARAM.getCode());
+        } catch (CustomIllegalParamException ex) {
+            return RestResponse.code(ResCode.INVALID_REST_REQ_PARAM.getCode());
+        }
+    }
 
     @RequestMapping(value = "/upload/drivingLicense", method = RequestMethod.POST)
     public RestResponse uploadDrivingLicense(@RequestParam("file") MultipartFile file)
@@ -255,7 +255,14 @@ public class VehicleController extends BaseController<VehicleBiz> {
         VehicleBookRecordQueryVo vehicleBookRecordQueryVo = null;
         try {
             vehicleBookRecordQueryVo = JSON.parseObject(vehicleBookRecordQueryVoJson, VehicleBookRecordQueryVo.class);
-            return RestResponse.data(vehicleBookRecordBiz.page(vehicleBookRecordQueryVo));
+            UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+            List<Integer> companyList =new ArrayList<>();
+            if (userDTO != null) {
+                if (userDTO.getDataAll() == 2) {
+                    companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+                }
+            }
+            return RestResponse.data(vehicleBookRecordBiz.page(vehicleBookRecordQueryVo, companyList));
         } catch (JSONException ex) {
             return RestResponse.code(ResCode.INVALID_REST_REQ_PARAM.getCode());
         } catch (CustomIllegalParamException ex) {

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.rest;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.biz.VehicleDepartureService;
@@ -33,7 +34,7 @@ public class VehicleDepartureController {
     private UserAuthConfig userAuthConfig;
 
     @GetMapping("page")
-    public RestResponse page(String numberPlate, Integer page, Integer limit, HttpServletRequest request) {
+    public RestResponse page(String numberPlate, String time, Integer page, Integer limit, HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -42,10 +43,27 @@ public class VehicleDepartureController {
         if (userDTO != null) {
             if (userDTO.getDataAll() == 2) {
                 List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
-                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, page, limit, companyList));
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, time, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate, page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate, time, page, limit));
+    }
+
+    @GetMapping("small/page")
+    @IgnoreUserToken
+    public RestResponse pageBySmall(String numberPlate, String time,Integer page, Integer limit, Integer uid,HttpServletRequest request) {
+        if (page == null || limit == null) {
+            page = 1;
+            limit = 10;
+        }
+        UserDTO userDTO = userFeign.userinfoByUid(uid).getData();
+        if (userDTO != null) {
+            if (userDTO.getDataAll() == 2) {
+                List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate,time, page, limit, companyList));
+            }
+        }
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate,time,page, limit));
     }
 
     @GetMapping("findByVehicle")

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

 package com.xxfc.platform.vehicle.rest;
 
+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.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.biz.VehicleUpkeepService;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
@@ -7,13 +11,26 @@ import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
 @RestController
 @RequestMapping("upkeep")
 public class VehicleUpkeepController {
 
-
     @Autowired
     private VehicleUpkeepService vehicleUpkeepService;
+    @Autowired
+    VehicleBiz vehicleBiz;
+
+    @Autowired
+    UserFeign userFeign;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
+    @Autowired
+    protected HttpServletRequest request;
 
     @GetMapping("item/all")
     public RestResponse allItem() {
@@ -65,7 +82,14 @@ public class VehicleUpkeepController {
             page = 1;
             limit = 10;
         }
-        return RestResponse.suc(vehicleUpkeepService.pageLog(numberPlate, page, limit));
+        UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+        List<Integer> companyList =new ArrayList<>();
+        if (userDTO != null) {
+            if (userDTO.getDataAll() == 2) {
+                companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+            }
+        }
+        return RestResponse.suc(vehicleUpkeepService.pageLog(numberPlate, page, limit, companyList));
     }
 
     @GetMapping("log/{id}")