Merge remote-tracking branch 'origin/dev' into dev

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/controller/AuthController.java

@@ -234,4 +234,14 @@ public class AuthController {
         return JsonResultUtil.createSuccessResultWithObj(authService.loginImiWithToken());
     }
 
+    /**
+     * 检查token是否失效
+     * @param token
+     * @return
+     */
+    @RequestMapping(value = "checkToken", method = RequestMethod.GET)
+    public ObjectRestResponse checkToken(String token){
+        return authService.checkToken(token);
+    }
+
 }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/AuthService.java

@@ -37,4 +37,6 @@ public interface AuthService {
     JSONObject appletRegistry(String username,String headimgurl,String nickname,Integer  userid);
 
     String loginImiWithToken();
+
+    ObjectRestResponse checkToken(String token);
 }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java

@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.auth.service.impl;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.api.vo.user.AppUserInfo;
 import com.github.wxiaoqi.security.api.vo.user.UserInfo;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.auth.common.util.jwt.JWTInfo;
 import com.github.wxiaoqi.security.auth.feign.IUserService;
 import com.github.wxiaoqi.security.auth.service.AuthService;
@@ -11,6 +12,7 @@ import com.github.wxiaoqi.security.auth.util.user.JwtTokenUtil;
 import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
 import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -117,4 +119,22 @@ public class AppAuthServiceImpl implements AuthService {
         return userService.loginImiWithToken();
     }
 
+    @Override
+    public ObjectRestResponse checkToken(String token) {
+        try {
+            if (StringUtils.isEmpty(token)){
+                return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+            }
+            IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
+            if (ijwtInfo==null){
+                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+            }
+            return ObjectRestResponse.succ();
+        }catch (Exception e){
+            e.printStackTrace();
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+        }
+
+    }
+
 }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AuthServiceImpl.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.auth.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.api.vo.user.UserInfo;
+import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.auth.common.util.jwt.JWTInfo;
 import com.github.wxiaoqi.security.auth.feign.IUserService;
 import com.github.wxiaoqi.security.auth.service.AuthService;
@@ -10,6 +11,7 @@ import com.github.wxiaoqi.security.auth.util.user.JwtTokenUtil;
 import com.github.wxiaoqi.security.common.constant.RequestTypeConstants;
 import com.github.wxiaoqi.security.common.exception.auth.UserInvalidException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -113,4 +115,22 @@ public class AuthServiceImpl implements AuthService {
     public String loginImiWithToken() {
         return userService.loginImiWithToken();
     }
+
+    @Override
+    public ObjectRestResponse checkToken(String token) {
+        try {
+            if (StringUtils.isEmpty(token)){
+                return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+            }
+            IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
+            if (ijwtInfo==null){
+                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+            }
+            return ObjectRestResponse.succ();
+        }catch (Exception e){
+            e.printStackTrace();
+            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+        }
+
+    }
 }

ace-gate/src/main/resources/bootstrap.yml

@@ -16,7 +16,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 127.0.0.1:8848,10.1.37.166:8848
+        server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
         shared-dataids: common-dev.yaml,mongodb-log-dev.yaml
 ---

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

 package com.xxfc.platform.uccn.rest;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ArrayUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.CommonBaseController;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
+import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
 import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
@@ -20,6 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Comparator;
+import java.util.List;
+import java.util.stream.Collectors;
 
 @RestController
 @RequestMapping("/vehicleModel/app/unauth")
@@ -57,6 +63,23 @@ public class VehicleModelController extends CommonBaseController {
     @IgnoreUserToken
     public ObjectRestResponse<PageDataVO<VehicleModelVo>> findVehicleModelPageUnauthfind(VehicleModelQueryCondition vmqc) {
         ObjectRestResponse<PageDataVO<VehicleModelVo>> objectRestResponse = vehicleFeign.findVehicleModelPageUnauthfind(vmqc);
+        PageDataVO<VehicleModelVo> pageDataVOs = objectRestResponse.getData();
+        pageDataVOs.getData().forEach( v -> {
+            List<VehiclePlatCata> vehiclePlatCataList = vehicleFeign.getCatasByIds(v.getConfig()).getData();
+            StrUtil.splitToInt("14,7,11", ",");
+            v.setUccnCataList(vehiclePlatCataList.parallelStream().filter(v1 -> {return ArrayUtil.contains(StrUtil.splitToInt("14,7,11", ","), v1.getParentId());}).sorted(Comparator.comparing(VehiclePlatCata::getParentId, (x, y) -> {
+                int xx = 0,yy = 0;
+                int[] array = StrUtil.splitToInt("14,7,11", ",");
+                for(int i = 0; i < array.length; i++) {
+                    if(x == array[i]) {
+                        xx = i;
+                    }else if(y == array[i]) {
+                        yy = i;
+                    }
+                }
+                return (xx - yy);
+            })).collect(Collectors.toList()));
+        });
         return objectRestResponse;
     }
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleModel.java

@@ -160,4 +160,8 @@ public class VehicleModel implements Serializable {
 	@Column(name = "sort")
 	@ApiModelProperty(value = "排序")
 	private Integer sort;
+
+	@Column(name = "intro")
+	@ApiModelProperty(value = "简介")
+	private String intro;
 }

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

@@ -135,4 +135,14 @@ public interface VehicleFeign {
 
     @PostMapping("/vehicleModel/app/unauth/findVehicleModelPage")
     public ObjectRestResponse<PageDataVO<VehicleModelVo>> findVehicleModelPageUnauthfind(@RequestBody VehicleModelQueryCondition vmqc);
+
+
+    //cata
+    /**
+     * 查询当前车型拥有的标签
+     * @param ids
+     * @return
+     */
+    @GetMapping("/cata/add/getCatasByIds/{ids}")
+    public ObjectRestResponse<List<VehiclePlatCata>> getCatasByIds(@PathVariable("ids") String ids);
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleModelVo.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.vehicle.pojo;
 
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
+import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -12,6 +13,7 @@ import javax.persistence.Table;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -25,128 +27,6 @@ import java.util.Date;
 @Table(name = "vehicle_model")
 public class VehicleModelVo extends VehicleModel implements Serializable {
 	private static final long serialVersionUID = 1L;
-	//主键
-	@Id
-	@GeneratedValue(generator = "JDBC")
-	@ApiModelProperty("主键")
-	private Integer id;
-
-	//名称
-	@Column(name = "name")
-	@ApiModelProperty(value = "名称")
-	private String name;
-
-	//房车配置，code逗号分割
-	@Column(name = "config")
-	@ApiModelProperty(value = "房车配置，code逗号分割")
-	private String config;
-
-	@Column(name = "number")
-	@ApiModelProperty(value = "乘卧数id")
-	private String number;
-
-	@Column(name = "brand")
-	@ApiModelProperty(value = "品牌id")
-	private String brand;
-
-	//关键标签，code逗号分割
-	@Column(name = "keyword")
-	@ApiModelProperty(value = "关键标签，code逗号分割")
-	private String keyword;
-
-	//车型详情
-	@Column(name = "models_details")
-	@ApiModelProperty(value = "车型详情")
-	private String modelsDetails;
-
-	//参数
-	@Column(name = "model_param")
-	@ApiModelProperty(value = "参数")
-	private String modelParam;
-
-	//图片地址 多张为逗号分割
-	@Column(name = "picture")
-	@ApiModelProperty(value = "图片地址 多张为逗号分割")
-	private String picture;
-
-	//价格
-	@Column(name = "price")
-	@ApiModelProperty(value = "价格")
-	private BigDecimal price;
-
-
-	//总押金
-	@Column(name = "deposit")
-	@ApiModelProperty(value = "总押金")
-	private BigDecimal deposit;
-
-	//违章押金
-	@Column(name = "vio_deposit")
-	@ApiModelProperty(value = "违章押金")
-	private BigDecimal vioDeposit;
-
-	//创建时间
-	@Column(name = "crt_time")
-	@ApiModelProperty(value = "创建时间", hidden = true )
-	private Date crtTime;
-
-	//创建者id
-	@Column(name = "crt_user")
-	@ApiModelProperty(value = "创建者id")
-	private Integer crtUser;
-
-	//创建者名称
-	@Column(name = "crt_name")
-	@ApiModelProperty(value = "创建者名称")
-	private String crtName;
-
-	//创建者host
-	@Column(name = "crt_host")
-	@ApiModelProperty(value = "创建者host")
-	private String crtHost;
-
-	//修改时间
-	@Column(name = "upd_time")
-	@ApiModelProperty(value = "修改时间", hidden = true )
-	private Date updTime;
-
-	//修改者
-	@Column(name = "upd_user")
-	@ApiModelProperty(value = "修改者")
-	private Integer updUser;
-
-	//修改者名称
-	@Column(name = "upd_name")
-	@ApiModelProperty(value = "修改者名称")
-	private String updName;
-
-	//修改者host
-	@Column(name = "upd_host")
-	@ApiModelProperty(value = "修改者host")
-	private String updHost;
-
-	//评分
-	@Column(name = "score")
-	@ApiModelProperty(value = "评分")
-	private Integer score;
-
-	@Column(name = "hot_sign")
-	@ApiModelProperty(value = "热度标记，1--热门；2--非热门")
-	private Integer hotSign;
-
-	@ApiModelProperty(value = "是否删除")
-	private  Integer isdel;
-	@Column(name = "rent_discount_status")
-	@ApiModelProperty(value = "租车优惠状态 0--没有优惠;1--会员折扣;2--固定值")
-	private Integer rentDiscountStatus;
-
-	@Column(name = "rent_discount_price")
-	@ApiModelProperty(value = "租车优惠价格")
-	private  String rentDiscountPrice;
-
-	@Column(name = "buy_price")
-	@ApiModelProperty(value = "购买价格")
-	private  BigDecimal buyPrice;
 
 	@ApiModelProperty(value = "总数量")
 	private Integer sum;
@@ -168,17 +48,6 @@ public class VehicleModelVo extends VehicleModel implements Serializable {
 	@ApiModelProperty(value = "品牌")
 	private String brandName;
 
-	@Column(name = "sort")
-	@ApiModelProperty(value = "排序")
-	private Integer sort;
-
-
-//	@Column(name = "status")
-//	@ApiModelProperty(value = "状态 0--下架；1--上架")
-//	private String status;
-
-//	@Column(name = "cover_pic")
-//	@ApiModelProperty(value = "封面图")
-//	private String coverPic;
+	List<VehiclePlatCata> UccnCataList;
 
 }

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

@@ -123,6 +123,11 @@ public class CompanyBaseBiz extends BaseBiz<CompanyBaseMapper, CompanyBase>  {
                 || companyVo.getAddrCity()==null||companyVo.getAddrCity()==0){
             return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
         }
+        Area area=areaBiz.selectById(companyVo.getZoneId());
+        Integer provinc=companyVo.getAddrProvince();
+        if (area==null||StringUtils.isBlank(area.getProvinceIds())||!area.getProvinceIds().contains(provinc+"")){
+            return  ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE,"片区和省份不一致");
+        }
         Integer state=companyVo.getState()==null?2:companyVo.getState();
         BigDecimal latitude=companyVo.getLatitude();
         BigDecimal longitude=companyVo.getLongitude();

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

@@ -198,10 +198,10 @@ public class VehicleActiveService {
             throw new BaseException(ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getDesc(),
                     ResCode.CHECKUSER_AND_PHONE_NOT_NULL.getCode());
         }
-        if (!vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
-                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
-        }
+//        if (!vehicle.getStatus().equals(VehicleStatus.DEPARTURE.getCode())) {
+//            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
+//                    ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
+//        }
         Integer Mileagerest = vehicle.getMileageLastUpdate();
         Integer Mileagerest1 = arrivalVo.getMileage();
         if (Mileagerest1 == null) {
@@ -223,21 +223,33 @@ public class VehicleActiveService {
             vehicle.setExpectDestinationBranchCompanyId(0);
             vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
-            // 修改状态，确认是出车状态
-            int result = vehicleMapper.updateStatusByIdAndStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode(),
-                    VehicleStatus.DEPARTURE.getCode());
-            if (result == 0) {
-                throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
-                        ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
-            }
 
 
             // 出车记录
-            VehicleDepartureLog departureLog = vehicleDepartureLogMapper.selectLastByVehicleId(arrivalVo.getVehicleId());
-            if (departureLog == null) {
+            VehicleDepartureLogVo departureLogVo = vehicleDepartureLogMapper.selectByBookRecordId(arrivalVo.getBookRecordId());
+
+            if (departureLogVo == null) {
                 throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
                         ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
             }
+            // 修改状态，确认是出车状态
+            //兼容错误还车流程，先查询,是否有其他出行记录
+            boolean flag = true;
+            VehicleDepartureLog departureLog = departureLogVo.getVehicleDeparture(departureLogVo);
+            List<VehicleDepartureLog> list = vehicleDepartureLogMapper.selectByVehicle(arrivalVo.getVehicleId());
+            for(VehicleDepartureLog vehicleDepartureLogVo : list) {
+                if(vehicleDepartureLogVo.getState() != 1 && vehicleDepartureLogVo.getId() > departureLog.getId()) { //后面还有未收车的记录
+                    flag = false;
+                }
+            }
+            if(flag) { //如果此条记录后面还有未收车记录，就不修改车辆状态
+                int result = vehicleMapper.updateStatus(arrivalVo.getVehicleId(), VehicleStatus.NORMAL.getCode());
+//                if (result == 0) {
+//                    throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getDesc(),
+//                            ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
+//                }
+            }
+
             DateTime arrivalDate = new DateTime(vehicleBookRecord.getBookEndDate());
             DateTime actualArrivalDate = new DateTime(new Date());
             //提前还车处理
@@ -325,7 +337,7 @@ public class VehicleActiveService {
                         }
                     }
                 }
-                if (!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode() && (list == null || list.size() <= 0))) {
+                if(!(startDate.minusDays(1).compareTo(DateTime.now()) <= 0 && DateTime.now().compareTo(endDate) <= 0 && vehicleBookRecord.getStatus() == VehicleBookRecordStatus.APPROVE.getCode() && (list == null || list.size() <= 0))) {
                     throw new BaseException(ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getDesc(),
                             ResCode.VEHICLE_DEPARTURE_DATE_IS_NOT_ABLED.getCode());
                 }
@@ -350,9 +362,9 @@ public class VehicleActiveService {
     }
 
 
+
     /**
      * 车辆保养
-     *
      * @param vehicleUpkeepVo
      */
     @Transactional
@@ -406,7 +418,6 @@ public class VehicleActiveService {
 
     /**
      * 保养结束
-     *
      * @param vehicleUpkeepEndVo
      */
     @Transactional

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

@@ -804,10 +804,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if (vehicle == null) {
             return false;
         }
-        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode())) {
-            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
-                    ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
-        }
+//        if (vehicle.getStatus().equals(VehicleStatus.DISCARD.getCode())) {
+//            throw new BaseException(ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getDesc() + ", 车辆状态是：" + getVehicleStatus(vehicle.getStatus(), vehicle.getId()),
+//                    ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
+//        }
         return true;
     }
 

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

@@ -410,7 +410,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
      * @param ids
      * @return
      */
-    public ObjectRestResponse getCatasByIds(String ids) {
+    public ObjectRestResponse<List<VehiclePlatCata>> getCatasByIds(String ids) {
         Example exa = Example.builder(VehiclePlatCata.class).where(
                 WeekendSqls.<VehiclePlatCata>custom()
                         .andIn(VehiclePlatCata::getId, Arrays.asList(ids.split(",")))

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

@@ -13,7 +13,7 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
     VehicleDepartureLog selectLastByVehicleId(String vehicleId);
 
     List<VehicleDepartureLogVo> selectByVehicleId(String vehicleId);
-
+    List<VehicleDepartureLog> selectByVehicle(String vehicleId);
     List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate, @Param("time") String time);
 
     List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("time") String time, @Param("companyList") List<Integer> companyList);

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

@@ -29,6 +29,8 @@ public interface VehicleMapper extends Mapper<Vehicle> {
     int updateStatusByIdAndStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status,
                                   @Param("lastStatus") Integer lastStatus);
 
+    int updateStatus(@Param("vehicleId") String vehicleId, @Param("status") Integer status);
+
     Vehicle selectByNumberPlate(String numberPlate);
 
     List<UsableVehicleModelVO> searchUsableModel(Map<String, Object> params);

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

@@ -16,6 +16,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/cata")
 @Slf4j
@@ -146,7 +148,7 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
      * @return
      */
     @GetMapping("/add/getCatasByIds/{ids}")
-    public ObjectRestResponse getCatasByIds(@PathVariable String ids){
+    public ObjectRestResponse<List<VehiclePlatCata>> getCatasByIds(@PathVariable String ids){
         return  baseBiz.getCatasByIds(ids);
     }
 
@@ -184,6 +186,8 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
     }
 
 
+
+
    /* @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public RestResponse<Vehicle> get(@PathVariable String id) {
         return RestResponse.data(baseBiz.get(id));

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

@@ -17,6 +17,13 @@
         order by create_time desc
     </select>
 
+    <select id="selectByVehicle" parameterType="java.lang.String" resultType="com.xxfc.platform.vehicle.entity.VehicleDepartureLog">
+        select vehicle_departure_log.*
+        from vehicle_departure_log
+        where vehicle_id = #{vehicleId}
+        order by create_time desc
+    </select>
+
     <select id="selectByBookRecordId" parameterType="java.lang.Long" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
         select vehicle_departure_log.*
         from vehicle_departure_log

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

@@ -359,6 +359,12 @@
         where id = #{vehicleId} and status = #{lastStatus}
     </update>
 
+    <update id="updateStatus">
+        update vehicle
+        set status = #{status}
+        where id = #{vehicleId} and status != 3
+    </update>
+
     <update id="updateMileageStatusByIdAndStatus">
         update vehicle
         set status = #{status},maintenance_mileage=#{mileage}