修改结构

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTemplateBiz.java

@@ -28,8 +28,8 @@ public class OrderTemplateBiz extends BaseBiz<OrderTemplateMapper,OrderTemplate>
 //        TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig());
 //        OrderCostDetail orderCostDetail = orderCostDetailBiz.selectById(OrderCostEnum.RentVehicle.getCode());
 //        Template template = engine.getTemplate(orderCostDetail.getTemplate());
-//        String result = template.render(Dict.parse(vo));
-//        vo.setCostDetail(result);
+//        String result = template.render(Dict.parse(pojo));
+//        pojo.setCostDetail(result);
         List<OrderTemplate> all = this.selectListAll();
         Map<String, Object> allCodeMap = all.parallelStream().collect(Collectors.toMap(item -> "tem_"+ item.getCode(), OrderTemplate::getTemplate));
         List<String> codes = all.parallelStream().map(OrderTemplate::getCode).collect(Collectors.toList());

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderRentVehicleService.java

@@ -121,7 +121,7 @@ public class OrderRentVehicleService extends AbstractOrderHandle<OrderRentVehicl
      * @return
      */
     private String costDetail(RentVehiclePriceVO vo) {
-        //orderTemplateBiz.result(orderTemplateBiz.selectById(OrderCostEnum.RentVehicle.getCode()), Dict.parse(vo));
+        //orderTemplateBiz.result(orderTemplateBiz.selectById(OrderCostEnum.RentVehicle.getCode()), Dict.parse(pojo));
         TemplateEngine engine = TemplateUtil.createEngine(new TemplateConfig());
         OrderCostDetail orderCostDetail = orderCostDetailBiz.selectById(OrderCostEnum.RentVehicle.getCode());
         Template template = engine.getTemplate(orderCostDetail.getTemplate());

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java

@@ -3,7 +3,7 @@ package com.xxfc.platform.vehicle.feign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.vo.BookVehicleVo;
+import com.xxfc.platform.vehicle.pojo.BookVehicleVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/AddOrUpdateAccompanyingItem.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateAccompanyingItem.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/AddOrUpdateVehicleVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddOrUpdateVehicleVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/AddVehicleWarningMsgVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/AddVehicleWarningMsgVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BookVehicleVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BookVehicleVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BranchCompanyStockApplyInfoVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BranchCompanyStockApplyInfoVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BranchCompanyStockApplyVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BranchCompanyStockApplyVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BranchCompanyStockInfoVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BranchCompanyStockInfoVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BranchCompanyStockSearchVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BranchCompanyStockSearchVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/BranchCompanyVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BranchCompanyVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CampsiteVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CampsiteVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CataDto.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CataDto.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 
 import java.util.List;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CataVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CataVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CompanyDetail.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanyDetail.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.SysRegion;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CompanySearchDTO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanySearchDTO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/CompanySearchVO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/CompanySearchVO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import lombok.Data;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/ConstantVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/ConstantVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/LiftVehicleVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/LiftVehicleVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/QueryAccompanyItemVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/QueryAccompanyItemVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/QueryVehicleBookRecordVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/QueryVehicleBookRecordVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/QueryVehicleVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/QueryVehicleVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/QueryVehicleWarningMsgVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/QueryVehicleWarningMsgVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/RentVehicleBookDTO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Map;
-
 @Data
 public class RentVehicleBookDTO extends PageParam {
     //根据车型、时间、距离，门店，预定车辆

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/RetVehicleVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RetVehicleVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/UsableVehicleModelVO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/UsableVehicleModelVO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import lombok.Data;
 
 import java.math.BigDecimal;
-import java.util.List;
 
 @Data
 public class UsableVehicleModelVO {

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/UsableVeicleDTO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/UsableVeicleDTO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.github.wxiaoqi.security.common.vo.PageParam;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
 import java.time.Instant;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 
-import static java.time.LocalDateTime.ofEpochSecond;
-
 @Data
 public class UsableVeicleDTO extends PageParam {
         public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VModelDetailVO.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VModelDetailVO.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.xxfc.platform.vehicle.entity.VehicleModel;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleArrivalVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleArrivalVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleBookRecordAndTbNameVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordAndTbNameVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleBookRecordQueryVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordQueryVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleDepartureLogVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleDepartureLogVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleDepartureStatisticDataVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleDepartureStatisticDataVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleDepartureVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleDepartureVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehiclePageQueryVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehiclePageQueryVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleRepairVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleRepairVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleUpkeepEndVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleUpkeepEndVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleUpkeepLogItemVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleUpkeepLogItemVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleUpkeepLogVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleUpkeepLogVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleUpkeepVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleUpkeepVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleUserLicenseVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleUserLicenseVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/vo/VehicleWarningMsgQueryVo.java → xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleWarningMsgQueryVo.java

-package com.xxfc.platform.vehicle.vo;
+package com.xxfc.platform.vehicle.pojo;
 
 import lombok.Data;
 

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

@@ -9,9 +9,9 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.entity.AccompanyingItem;
 import com.xxfc.platform.vehicle.mapper.AccompanyingItemMapper;
-import com.xxfc.platform.vehicle.vo.AddOrUpdateAccompanyingItem;
+import com.xxfc.platform.vehicle.pojo.AddOrUpdateAccompanyingItem;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.QueryAccompanyItemVo;
+import com.xxfc.platform.vehicle.pojo.QueryAccompanyItemVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.stereotype.Service;

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

@@ -14,11 +14,10 @@ import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
 import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.feign.dto.UserDTO;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyMapper;
-import com.xxfc.platform.vehicle.rest.BranchCompanyController;
 import com.xxfc.platform.vehicle.util.excel.ExcelImport;
-import com.xxfc.platform.vehicle.vo.BranchCompanyVo;
-import com.xxfc.platform.vehicle.vo.CompanyDetail;
-import com.xxfc.platform.vehicle.vo.CompanySearchDTO;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;

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

@@ -14,10 +14,10 @@ import com.xxfc.platform.vehicle.mapper.BranchCompanyStockApplyInfoMapper;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyStockInfoMapper;
 import com.xxfc.platform.vehicle.mapper.SysRegionMapper;
 import com.xxfc.platform.vehicle.util.excel.ExcelImport;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyInfoVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockInfoVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockSearchVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyInfoVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockInfoVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockSearchVo;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.joda.time.DateTime;

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

@@ -14,7 +14,7 @@ import com.xxfc.platform.vehicle.mapper.CampsiteMapper;
 import com.xxfc.platform.vehicle.mapper.ConstantMapper;
 import com.xxfc.platform.vehicle.mapper.SysRegionMapper;
 import com.xxfc.platform.vehicle.util.excel.ExcelImport;
-import com.xxfc.platform.vehicle.vo.CampsiteVo;
+import com.xxfc.platform.vehicle.pojo.CampsiteVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;

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

@@ -9,7 +9,7 @@ import com.xxfc.platform.vehicle.constant.ConstantType;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.entity.Constant;
 import com.xxfc.platform.vehicle.mapper.ConstantMapper;
-import com.xxfc.platform.vehicle.vo.ConstantVo;
+import com.xxfc.platform.vehicle.pojo.ConstantVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;

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

@@ -7,10 +7,8 @@ import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.constant.RegionType;
-import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.mapper.SysRegionMapper;
-import com.xxfc.platform.vehicle.vo.CompanySearchVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

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

@@ -10,10 +10,10 @@ import com.xxfc.platform.vehicle.entity.VehicleActiveLog;
 import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepLog;
 import com.xxfc.platform.vehicle.mapper.*;
-import com.xxfc.platform.vehicle.vo.VehicleArrivalVo;
-import com.xxfc.platform.vehicle.vo.VehicleDepartureVo;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepEndVo;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepVo;
+import com.xxfc.platform.vehicle.pojo.VehicleArrivalVo;
+import com.xxfc.platform.vehicle.pojo.VehicleDepartureVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepEndVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepVo;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -4,6 +4,8 @@ import cn.hutool.core.bean.BeanUtil;
 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.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -19,7 +21,7 @@ import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookInfoMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleMapper;
-import com.xxfc.platform.vehicle.vo.*;
+import com.xxfc.platform.vehicle.pojo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
@@ -270,7 +272,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
      * @return
      */
     @Transactional
-    public RestResponse applyVehicle4Employee(Integer userId, BookVehicleVo bookVehicleVo, String userName) throws Exception{
+    public void applyVehicle4Employee(Integer userId, BookVehicleVo bookVehicleVo, String userName) throws Exception{
         //检查车辆信息是否合法
         checkIfVehicleExists(bookVehicleVo.getVehicle());
         //提取日期和相应的预定目标日期
@@ -285,7 +287,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         for(Map.Entry<String,List<String>> entry:yearMonthAndDate.entrySet()){
             Boolean rsEach = applyVehicle4EmployeePerMonth(bookVehicleVo.getVehicle(),entry.getValue(),entry.getKey());
             if(Boolean.FALSE.equals(rsEach)){
-                return RestResponse.code(ResCode.VEHICLE_BOOKED_INFO_ALREADY_CHANGED.getCode());
+                throw new BaseException(ResultCode.FAILED_CODE);
             }
         }
         //加入预定申请记录
@@ -304,6 +306,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
         vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
         vehicleBookRecordMapper.insertSelective(vehicleBookRecord);
+
+        //修改相关车辆预定记录
+        Boolean hasSuc = bookedVehicle(bookVehicleVo);
+        if(!hasSuc){
+            throw new BaseException(ResultCode.FAILED_CODE);
+        }
+
+        //添加随车物品
         List<Map<String,Object>> params = Lists.newArrayList();
         if(MapUtils.isNotEmpty(bookVehicleVo.getSelectedAccItem())){
             for(Map.Entry<Integer,Integer> idAndAmount : bookVehicleVo.getSelectedAccItem().entrySet()){
@@ -315,7 +325,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             }
             bookRecordAccItemMapper.batchAdd(params);
         }
-        return RestResponse.suc();
     }
 
     @Transactional
@@ -362,13 +371,13 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         BeanUtils.copyProperties(bookVehicleVo,vehicleBookRecord);
         bookVehicleVo.setBookStartDate(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
         bookVehicleVo.setBookEndDate(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
-        //审核通过的话，需要修改相关车辆预定记录
-        if(VehicleBookRecordStatus.APPROVE.getCode().equals(rsStatus)) {
-            Boolean hasSuc = bookedVehicle(bookVehicleVo);
-            if(!hasSuc){
-                return RestResponse.code(ResCode.VEHICLE_BOOKED_INFO_ALREADY_CHANGED.getCode());
-            }
-        }
+//        //审核通过的话，需要修改相关车辆预定记录
+//        if(VehicleBookRecordStatus.APPROVE.getCode().equals(rsStatus)) {
+//            Boolean hasSuc = bookedVehicle(bookVehicleVo);
+//            if(!hasSuc){
+//                return RestResponse.code(ResCode.VEHICLE_BOOKED_INFO_ALREADY_CHANGED.getCode());
+//            }
+//        }
         //成功后修改预定记录状态
         Map<String,Object> updateParam = Maps.newHashMap();
         updateParam.put("id",bookRecordId);
@@ -426,8 +435,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         return RestResponse.suc();
     }
 
-
-
     /**
      * 获取预定车辆相关与操作参数
      * @return

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

@@ -16,7 +16,7 @@ import com.xxfc.platform.vehicle.entity.BookRecordAccItem;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper;
-import com.xxfc.platform.vehicle.vo.*;
+import com.xxfc.platform.vehicle.pojo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;

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

@@ -8,8 +8,8 @@ import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
 import com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleMapper;
-import com.xxfc.platform.vehicle.vo.VehicleDepartureLogVo;
-import com.xxfc.platform.vehicle.vo.VehicleDepartureStatisticDataVo;
+import com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo;
+import com.xxfc.platform.vehicle.pojo.VehicleDepartureStatisticDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -8,7 +8,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.mapper.VehicleLicenseMapper;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.VehicleUserLicenseVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUserLicenseVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;

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

@@ -10,7 +10,7 @@ import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.mapper.VehiclePlatCataMapper;
-import com.xxfc.platform.vehicle.vo.CataVo;
+import com.xxfc.platform.vehicle.pojo.CataVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -5,8 +5,8 @@ import com.github.pagehelper.PageInfo;
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepItem;
 import com.xxfc.platform.vehicle.mapper.VehicleUpkeepItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleUpkeepLogMapper;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepLogItemVo;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepLogVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogItemVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

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

@@ -15,9 +15,9 @@ import com.xxfc.platform.vehicle.mapper.VehicleMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleWarningMsgMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleWarningRuleMapper;
 import com.xxfc.platform.vehicle.util.JSUtil;
-import com.xxfc.platform.vehicle.vo.AddVehicleWarningMsgVo;
+import com.xxfc.platform.vehicle.pojo.AddVehicleWarningMsgVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.QueryVehicleWarningMsgVo;
+import com.xxfc.platform.vehicle.pojo.QueryVehicleWarningMsgVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyInfoVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyInfoVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyInfoVo;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockInfoVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockSearchVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockInfoVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockSearchVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
-import com.xxfc.platform.vehicle.vo.QueryVehicleBookRecordVo;
-import com.xxfc.platform.vehicle.vo.VehicleBookRecordAndTbNameVo;
+import com.xxfc.platform.vehicle.pojo.QueryVehicleBookRecordVo;
+import com.xxfc.platform.vehicle.pojo.VehicleBookRecordAndTbNameVo;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
-import com.xxfc.platform.vehicle.vo.VehicleDepartureLogVo;
+import com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.BaseMapper;
 

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.Vehicle;
-import com.xxfc.platform.vehicle.vo.AddOrUpdateVehicleVo;
-import com.xxfc.platform.vehicle.vo.QueryVehicleVo;
-import com.xxfc.platform.vehicle.vo.UsableVehicleModelVO;
+import com.xxfc.platform.vehicle.pojo.AddOrUpdateVehicleVo;
+import com.xxfc.platform.vehicle.pojo.QueryVehicleVo;
+import com.xxfc.platform.vehicle.pojo.UsableVehicleModelVO;
 import org.springframework.data.repository.query.Param;
 import tk.mybatis.mapper.common.Mapper;
 

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleUpkeepLog;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepLogItemVo;
-import com.xxfc.platform.vehicle.vo.VehicleUpkeepLogVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogItemVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleWarningMsg;
-import com.xxfc.platform.vehicle.vo.QueryVehicleWarningMsgVo;
+import com.xxfc.platform.vehicle.pojo.QueryVehicleWarningMsgVo;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;

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

@@ -9,9 +9,9 @@ import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.AccompanyingItem;
-import com.xxfc.platform.vehicle.vo.AddOrUpdateAccompanyingItem;
+import com.xxfc.platform.vehicle.pojo.AddOrUpdateAccompanyingItem;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.QueryAccompanyItemVo;
+import com.xxfc.platform.vehicle.pojo.QueryAccompanyItemVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -9,16 +9,14 @@ import com.xxfc.platform.vehicle.common.BaseController;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
-import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.feign.UserFeign;
 import com.xxfc.platform.vehicle.feign.dto.UserDTO;
-import com.xxfc.platform.vehicle.vo.BranchCompanyVo;
-import com.xxfc.platform.vehicle.vo.CompanyDetail;
-import com.xxfc.platform.vehicle.vo.CompanySearchDTO;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
+import com.xxfc.platform.vehicle.pojo.CompanyDetail;
+import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

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

@@ -6,9 +6,9 @@ import com.xxfc.platform.vehicle.biz.BranchCompanyStockService;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockApplyInfo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockInfoVo;
-import com.xxfc.platform.vehicle.vo.BranchCompanyStockSearchVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockInfoVo;
+import com.xxfc.platform.vehicle.pojo.BranchCompanyStockSearchVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;

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

@@ -10,7 +10,7 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.Campsite;
 import com.xxfc.platform.vehicle.feign.UserFeign;
 import com.xxfc.platform.vehicle.feign.dto.UserDTO;
-import com.xxfc.platform.vehicle.vo.CampsiteVo;
+import com.xxfc.platform.vehicle.pojo.CampsiteVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -7,7 +7,7 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ConstantType;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.Constant;
-import com.xxfc.platform.vehicle.vo.ConstantVo;
+import com.xxfc.platform.vehicle.pojo.ConstantVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;

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

@@ -3,7 +3,7 @@ package com.xxfc.platform.vehicle.rest;
 import com.xxfc.platform.vehicle.biz.VehicleActiveService;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
-import com.xxfc.platform.vehicle.vo.*;
+import com.xxfc.platform.vehicle.pojo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;

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

 package com.xxfc.platform.vehicle.rest;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONException;
 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.github.wxiaoqi.security.common.context.BaseContextHandler;
-import com.xxfc.platform.vehicle.biz.VehicleBiz;
-import com.xxfc.platform.vehicle.biz.VehicleBookRecordBiz;
 import com.xxfc.platform.vehicle.biz.VehicleCataBiz;
 import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
-import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.common.VehicleBaseController;
-import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
-import com.xxfc.platform.vehicle.entity.VehicleCata;
-import com.xxfc.platform.vehicle.feign.UserFeign;
 import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
-import com.xxfc.platform.vehicle.feign.dto.UserDTO;
-import com.xxfc.platform.vehicle.vo.*;
+import com.xxfc.platform.vehicle.pojo.*;
 import lombok.extern.slf4j.Slf4j;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
 
 @RestController
 @RequestMapping("/cata")

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

@@ -7,8 +7,6 @@ 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.github.wxiaoqi.security.common.context.BaseContextHandler;
-import com.github.wxiaoqi.security.common.exception.BaseException;
-import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
@@ -21,11 +19,10 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleBookInfo;
-import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.feign.UserFeign;
 import com.xxfc.platform.vehicle.feign.dto.UserDTO;
-import com.xxfc.platform.vehicle.vo.*;
+import com.xxfc.platform.vehicle.pojo.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -38,8 +35,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.Weekend;
-import tk.mybatis.mapper.weekend.WeekendCriteria;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.util.ArrayList;
@@ -160,7 +155,8 @@ public class VehicleController extends BaseController<VehicleBiz> {
     public RestResponse<Integer> applyVehicle(@RequestBody BookVehicleVo bookVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
-        return baseBiz.applyVehicle4Employee(operatorId, bookVehicleVo, userName);
+        baseBiz.applyVehicle4Employee(operatorId, bookVehicleVo, userName);
+        return RestResponse.suc();
     }
 
     /**
@@ -218,7 +214,6 @@ public class VehicleController extends BaseController<VehicleBiz> {
 
     @RequestMapping(value = "/bookedRecord/{bookEndDate}/{id}", method = RequestMethod.GET)
     public RestResponse<QueryVehicleBookRecordVo> getBookedRecord(@PathVariable String bookEndDate, @PathVariable Long id) throws Exception {
-
         try {
             return RestResponse.codeAndData(RestResponse.SUC_CODE, vehicleBookRecordBiz.getById(id, DateTime.parse(bookEndDate, DEFAULT_FORMATTER)));
         } catch (JSONException ex) {
@@ -310,7 +305,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
      */
     @ApiOperation("租车触发的申请预定车辆")
     @RequestMapping(value = "/rent/book/vehicle", method = RequestMethod.POST)
-    public RestResponse<String> rentApplyVehicle(@RequestBody RentVehicleBookDTO dto) throws Exception {
+    public ObjectRestResponse<Integer> rentApplyVehicle(@RequestBody RentVehicleBookDTO dto) throws Exception {
         //默认USER_APP 预约
         Integer operatorId = USER_APP;
         String userName = BaseContextHandler.getName();
@@ -322,6 +317,8 @@ public class VehicleController extends BaseController<VehicleBiz> {
         PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto);
         bookVehicleVo.setVehicle(pageDataVO.getData().get(0).getId());
 
-        return baseBiz.applyVehicle4Employee(operatorId, bookVehicleVo, userName);
+        baseBiz.applyVehicle4Employee(operatorId, bookVehicleVo, userName);
+
+        return ObjectRestResponse.success();
     }
 }

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

@@ -8,7 +8,7 @@ import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
 import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.VehicleUserLicenseVo;
+import com.xxfc.platform.vehicle.pojo.VehicleUserLicenseVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 

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

@@ -5,29 +5,18 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
-import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.biz.VehicleModelBiz;
 import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
 import com.xxfc.platform.vehicle.common.RestResponse;
-import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
-import com.xxfc.platform.vehicle.entity.VehicleCata;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
-import com.xxfc.platform.vehicle.entity.VehicleUserLicense;
-import com.xxfc.platform.vehicle.feign.dto.AppUserDTO;
-import com.xxfc.platform.vehicle.vo.VModelDetailVO;
+import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import io.swagger.models.auth.In;
-import lombok.Data;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @Controller
 @RequestMapping("vehicleModel")
 @Api(value="车型controller",tags={"车型操作接口"})

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

@@ -3,16 +3,15 @@ package com.xxfc.platform.vehicle.rest;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONException;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
-import com.github.wxiaoqi.security.common.msg.BaseResponse;
 import com.xxfc.platform.vehicle.biz.VehicleWarningMsgBiz;
 import com.xxfc.platform.vehicle.common.BaseController;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.VehicleWarningMsg;
-import com.xxfc.platform.vehicle.vo.AddVehicleWarningMsgVo;
+import com.xxfc.platform.vehicle.pojo.AddVehicleWarningMsgVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.vo.QueryVehicleWarningMsgVo;
+import com.xxfc.platform.vehicle.pojo.QueryVehicleWarningMsgVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyMapper.xml

@@ -18,7 +18,7 @@
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
 
-  <select id="search" resultType="com.xxfc.platform.vehicle.vo.CompanySearchVO">
+  <select id="search" resultType="com.xxfc.platform.vehicle.pojo.CompanySearchVO">
     select *
         <if test="lon != null and lat != null">
           , st_distance_sphere(point(#{lon}, #{lat}), point(longitude, latitude)) as distance
@@ -28,11 +28,13 @@
           <if test="addrCity != null">
             addr_city = #{addrCity}
           </if>
+          <if test="lon != null and lat != null">
+              longitude is not null and latitude is not null
+          </if>
         </trim>
 
         <if test="lon != null and lat != null">
             order by distance asc
         </if>
-
   </select>
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyStockApplyInfoMapper.xml

@@ -14,7 +14,7 @@
     <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
     <result column="update_time" property="updateTime" jdbcType="TIMESTAMP" />
   </resultMap>
-    <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.vo.BranchCompanyStockApplyInfoVo">
+    <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyStockApplyInfoVo">
       select a.*, b.company_name
       from branch_company_stock_apply_info a
       left join branch_company_stock_info b on a.company_id = b.id

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/BranchCompanyStockInfoMapper.xml

@@ -7,11 +7,11 @@
         set balance = #{balance}
         where id = #{companyId} and balance = #{lastBalance}
     </update>
-    <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.vo.BranchCompanyStockInfoVo">
+    <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyStockInfoVo">
         select *
         from branch_company_stock_info
     </select>
-    <select id="search" resultType="com.xxfc.platform.vehicle.vo.BranchCompanyStockInfoVo">
+    <select id="search" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyStockInfoVo">
         select *
         from branch_company_stock_info
         <trim prefix="where" suffixOverrides="and">

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -193,7 +193,7 @@
     limit #{pageStart},#{pageSize}
   </select>
 
-    <select id="getByPage" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.vo.QueryVehicleBookRecordVo">
+    <select id="getByPage" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.pojo.QueryVehicleBookRecordVo">
         select
             vbr.`id`,
             vbr.`vehicle`,

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml

@@ -16,7 +16,7 @@
         where vehicle_id = #{vehicleId}
         order by create_time desc
     </select>
-    <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.vo.VehicleDepartureLogVo">
+    <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
         select vehicle_departure_log.*,vehicle.number_plate
         from vehicle_departure_log
         left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
@@ -27,7 +27,7 @@
         </trim>
         order by create_time desc
     </select>
-    <select id="selectVoAllNotAllData" resultType="com.xxfc.platform.vehicle.vo.VehicleDepartureLogVo">
+    <select id="selectVoAllNotAllData" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
         select vehicle_departure_log.*,vehicle.number_plate
         from vehicle_departure_log
         left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleMapper">
 
-    <resultMap id="searchUsableModelMap" type="com.xxfc.platform.vehicle.vo.UsableVehicleModelVO">
+    <resultMap id="searchUsableModelMap" type="com.xxfc.platform.vehicle.pojo.UsableVehicleModelVO">
 <!--        <collection column="company_id" property="id" ofType="com.xxfc.platform.vehicle.entity.BranchCompany" select="com.xxfc.platform.vehicle.mapper.BranchCompanyMapper.selectByPrimaryKey" />-->
 <!--        <result column="company_id" property="companyId" jdbcType="VARCHAR" javaType="java.lang.Integer"/>-->
 <!--        <result column="model_id" property="modelId" jdbcType="INTEGER" javaType="java.lang.Integer"/>-->
@@ -21,7 +21,7 @@
 
 
     <select id="getByPage" parameterType="java.util.Map"
-            resultType="com.xxfc.platform.vehicle.vo.QueryVehicleVo">
+            resultType="com.xxfc.platform.vehicle.pojo.QueryVehicleVo">
         select v.`id`,
         v.`code`,
         v.`status`,
@@ -113,7 +113,7 @@
     </select>
 
     <select id="getByPageNotAllData" parameterType="java.util.Map"
-            resultType="com.xxfc.platform.vehicle.vo.QueryVehicleVo">
+            resultType="com.xxfc.platform.vehicle.pojo.QueryVehicleVo">
         select v.`id`,
         v.`code`,
         v.`status`,
@@ -222,7 +222,7 @@
     </select>
 
     <select id="lockByCode" resultType="com.xxfc.platform.vehicle.entity.Vehicle"
-            parameterType="com.xxfc.platform.vehicle.vo.AddOrUpdateVehicleVo">
+            parameterType="com.xxfc.platform.vehicle.pojo.AddOrUpdateVehicleVo">
         select
             v.`id`,
             v.`code`,

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleUpkeepLogMapper.xml

@@ -28,7 +28,7 @@
         delete from vehicle_upkeep_log_item
         where log_id = #{id}
     </delete>
-    <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.vo.VehicleUpkeepLogVo">
+    <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo">
         select a.*, b.number_plate, c.name as branch_company_name
         from vehicle_upkeep_log a
         left join vehicle b on a.vehicle_id = b.id
@@ -40,14 +40,14 @@
         </trim>
         order by a.create_time desc
     </select>
-    <select id="selectVoById" resultType="com.xxfc.platform.vehicle.vo.VehicleUpkeepLogVo">
+    <select id="selectVoById" resultType="com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogVo">
         select a.*, b.number_plate, c.name as branch_company_name
         from vehicle_upkeep_log a
         left join vehicle b on a.vehicle_id = b.id
         left join branch_company c on a.branch_company_id = c.id
         where a.id = #{id}
     </select>
-    <select id="getItemsByLogId" resultType="com.xxfc.platform.vehicle.vo.VehicleUpkeepLogItemVo">
+    <select id="getItemsByLogId" resultType="com.xxfc.platform.vehicle.pojo.VehicleUpkeepLogItemVo">
         select a.*, b.name as item_name
         from vehicle_upkeep_log_item a
         left join vehicle_upkeep_item b on a.item_id = b.id

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleWarningMsgMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleWarningMsgMapper">
-    <select id="getByPage" resultType="com.xxfc.platform.vehicle.vo.VehicleWarningMsgQueryVo"
-            parameterType="com.xxfc.platform.vehicle.vo.QueryVehicleWarningMsgVo">
+    <select id="getByPage" resultType="com.xxfc.platform.vehicle.pojo.VehicleWarningMsgQueryVo"
+            parameterType="com.xxfc.platform.vehicle.pojo.QueryVehicleWarningMsgVo">
         select
         vwn.id, vwn.type, vwn.`status`, vwn.msg, vwn.rule_id, vwn.msg_key, vwn.vehicle_id, vwn.create_time, vwn.update_time, vwn.remark, v.code as vehicleCode, v.number_plate
         from vehicle_warning_msg vwn left join vehicle v on vwn.vehicle_id = v.id

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleWarningRuleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleWarningRuleMapper">
 
-    <select id="getByPage" parameterType="com.xxfc.platform.vehicle.vo.QueryVehicleWarningMsgVo" resultType="com.xxfc.platform.vehicle.entity.VehicleWarningMsg" >
+    <select id="getByPage" parameterType="com.xxfc.platform.vehicle.pojo.QueryVehicleWarningMsgVo" resultType="com.xxfc.platform.vehicle.entity.VehicleWarningMsg" >
 
     </select>