增加出车

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/VehicleDepartureService.java

@@ -3,6 +3,7 @@ package com.xinxincaravan.caravan.vehicle.biz;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xinxincaravan.caravan.vehicle.constant.ResCode.ResCode;
 import com.xinxincaravan.caravan.vehicle.entity.Vehicle;
 import com.xinxincaravan.caravan.vehicle.entity.VehicleDepartureLog;
@@ -61,4 +62,5 @@ public class VehicleDepartureService {
         statisticData.setDepartureMileage(vehicleDepartureLogMapper.selectMileageByVehicleId(vehicle.getId()));
         return statisticData;
     }
+
 }

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/VehicleDepartureController.java

@@ -2,12 +2,15 @@ package com.xinxincaravan.caravan.vehicle.rest;
 
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xinxincaravan.caravan.vehicle.biz.VehicleBiz;
 import com.xinxincaravan.caravan.vehicle.biz.VehicleDepartureService;
 import com.xinxincaravan.caravan.vehicle.common.RestResponse;
 import com.xinxincaravan.caravan.vehicle.constant.ResCode.ResCode;
+import com.xinxincaravan.caravan.vehicle.entity.VehicleDepartureLog;
 import com.xinxincaravan.caravan.vehicle.feign.UserFeign;
 import com.xinxincaravan.caravan.vehicle.feign.dto.UserDTO;
+import com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureStatisticDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -17,6 +20,9 @@ import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * 车辆出行状态
+ */
 @IgnoreClientToken
 @RestController
 @RequestMapping("departure")
@@ -33,6 +39,7 @@ public class VehicleDepartureController {
     @Autowired
     private UserAuthConfig userAuthConfig;
 
+
     @GetMapping("page")
     public RestResponse page(String numberPlate, Integer page, Integer limit, HttpServletRequest request) {
         if (page == null || limit == null) {
@@ -70,6 +77,4 @@ public class VehicleDepartureController {
         }
         return RestResponse.suc(vehicleDepartureService.statistic(numberPlate));
     }
-
-
 }

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

@@ -74,6 +74,11 @@ public class VehiclePlatCata implements Serializable {
 	@Column(name = "isMore")
 	@ApiModelProperty(value = "多选 0:单选 1:多选" )
 	private Integer isMore;
-	
+
+
+	//是否多选
+	@Column(name = "start_using")
+	@ApiModelProperty(value = "是否作为客户端查询条件:0-否,1-是" )
+	private Integer startUsing;
 
 }

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

+package com.xxfc.platform.vehicle.pojo;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.util.Date;
+
+@Data
+public class  VehicleVo {
+    /**
+     * 主键(uuid)
+     */
+    @Id
+    private String id;
+
+    /**
+     * 车辆编号，0-没有
+     */
+    private Integer code;
+
+    /**
+     * 车辆状态： 1-正常运行 2-维修 3-报废
+     */
+    private Integer status;
+
+    /**
+     * 车牌号，空字符串-没有
+     */
+    @Column(name = "number_plate")
+    private String numberPlate;
+
+    /**
+     * 品牌（编码，对应关系见相关常量），0-未填写
+     */
+    private Integer brand;
+
+    /**
+     * 所属分支机构（id）
+     */
+    @Column(name = "subordinate_branch")
+    private Integer subordinateBranch;
+
+    /**
+     * 用途类型：租赁房车（1）、展车等，对应关系见车辆常量表
+     */
+    @Column(name = "use_type")
+    private Integer useType;
+
+    /**
+     * 备注信息
+     */
+    private String remark;
+
+    /**
+     * 车架号
+     */
+    private String vin;
+
+    /**
+     * 保险公司，见常量表
+     */
+    private Integer insuranceCompany;
+
+
+    /**
+     * 保险单号
+     */
+    private String insuranceNo;
+
+    /**
+     * 保险开始时间
+     */
+    private Date insuranceStartDate;
+
+    /**
+     * 保险结束时间
+     */
+    private Date insuranceEndDate;
+
+    /**
+     * 年审时间
+     */
+    private Date annualVerificationDate;
+
+    /**
+     * 保养时间
+     */
+    private Date maintenanceDate;
+
+    /**
+     * 保养里程数
+     */
+    private Integer maintenanceMileage;
+
+    /**
+     * 车辆所属人-类型
+     */
+    private Integer belongTo;
+
+    /**
+     * 所属人 名称
+     */
+    private String belongToName;
+
+    /**
+     * 行驶证路径
+     */
+    private String drivingLicensePath;
+
+    /**
+     * 发动机号
+     */
+    private String engineNum;
+
+    /**
+     * 生产商
+     */
+    private String manufacturer;
+
+    /**
+     * 收车时间
+     */
+    private Date receiveTime;
+
+    /**
+     * 最后更新里程数
+     */
+    private Integer mileageLastUpdate;
+    /**
+     * 停车分公司id
+     */
+    private Integer parkBranchCompanyId;
+    /**
+     * 预计目的地分公司id
+     */
+    private Integer expectDestinationBranchCompanyId;
+    /**
+     * 车型id
+     */
+    private Integer modelId;
+    /**
+     *片区id
+     */
+    private Integer zoneId;
+    /**
+     * 当前页
+     */
+    private Integer page;
+    /**
+     * 每页条数
+     */
+    private Integer limit;
+}
\ No newline at end of file

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

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.google.common.base.Function;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.xxfc.platform.vehicle.common.CustomIllegalParamException;
@@ -26,6 +27,7 @@ import com.xxfc.platform.vehicle.mapper.VehicleMapper;
 import com.xxfc.platform.vehicle.pojo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
@@ -49,6 +51,8 @@ import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.io.File;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -77,6 +81,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
     @Autowired
     private RedisTemplate customRedisTemplate;
 
+
     @Value("${vehicle.baseUploadPath}")
     private String baseUploadPath ;
 
@@ -934,24 +939,76 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         }
        return ObjectRestResponse.succ();
     }
-    public ObjectRestResponse findListByVehicle(Vehicle vehicle, Integer page, Integer limit){
+
+    /**
+     * 查找
+     * @param vehicleVo
+     * @param page
+     * @param limit
+     * @return
+     */
+    public ObjectRestResponse findListByVehicle(VehicleVo vehicleVo, Integer page, Integer limit){
+        Vehicle vehicle = new Vehicle();
+        // vehicleVo复制一份到vehicle
+
+        try {
+            BeanUtilsBean.getInstance().copyProperties(vehicle,vehicleVo);
+        } catch (IllegalAccessException e) {
+            e.printStackTrace();
+        } catch (InvocationTargetException e) {
+            e.printStackTrace();
+          return   ObjectRestResponse.createDefaultFail();
+        }
+
 
         WeekendSqls<Vehicle> sqls = WeekendSqls.<Vehicle>custom();
+        //车辆状态
          if (vehicle.getStatus()!=null||vehicle.getStatus()!=0){
              sqls.andEqualTo(Vehicle::getStatus,vehicle.getStatus());
          }
-
+         //车牌号
          if (StringUtils.isBlank(vehicle.getNumberPlate())){
              sqls.andEqualTo(Vehicle::getNumberPlate,vehicle.getNumberPlate());
+             Function<Vehicle, Integer> getStatus = Vehicle::getStatus;
          }
 
+         //公司
          if (vehicle.getSubordinateBranch()==null||vehicle.getSubordinateBranch()==0){
              sqls.andEqualTo(Vehicle::getSubordinateBranch,vehicle.getSubordinateBranch());
          }
 
-
+         //大区
+         if (vehicleVo.getZoneId()==null||vehicleVo.getZoneId()==0){
+             //获取大区内的公司id
+             Example example= Example.builder(BranchCompany.class).where(WeekendSqls.<BranchCompany>custom()
+                     .andEqualTo(BranchCompany::getZoneId,vehicleVo.getZoneId())).build();
+             List<BranchCompany> branchCompanies = branchCompanyBiz.selectByExample(example);
+             ArrayList<Integer> bIds = new ArrayList<>();
+             for (BranchCompany branchCompany : branchCompanies) {
+                  bIds.add(branchCompany.getId());
+             }
+             sqls.andIn(Vehicle::getSubordinateBranch,bIds);
+         }
+         sqls.andEqualTo(Vehicle::getStatus,0);
         Example exa = Example.builder(Vehicle.class).where(sqls).build();
-        selectByExample(exa);
-        return ObjectRestResponse.succ();
+        PageDataVO<Object> objectPageDataVO = PageDataVO.pageInfo(page, limit, () -> selectByExample(exa));
+        return ObjectRestResponse.succ(objectPageDataVO);
+    }
+
+    /**
+     * 查询条
+     * @param id
+     * @return
+     */
+    public ObjectRestResponse getOneById(Integer id){
+
+       return ObjectRestResponse.succ(selectByExample(
+               Example.builder(Vehicle.class)
+                       .where(WeekendSqls.<Vehicle>custom()
+                               .andEqualTo(Vehicle::getId,id)
+                               .andEqualTo(Vehicle::getStatus,0))
+                       .build()));
     }
+
+
 }

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

@@ -58,4 +58,12 @@ public class VehicleCataBiz extends BaseBiz<VehicleCataMapper, VehicleCata> {
         mapper.addCataList(vcs);
     }
 
+
+    public void updateIsdalByVehicleModelId(VehicleCata vehicleCata){
+        mapper.updateIsdalByVehicleModelId( vehicleCata);
+    }
+
+    public void updateIsdalByVehicleCataId(VehicleCata vehicleCata) {
+        mapper.updateIsdalByVehicleCataId(vehicleCata);
+    }
 }

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

@@ -2,7 +2,9 @@ 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.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
@@ -12,12 +14,16 @@ 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;
+import org.springframework.transaction.annotation.Transactional;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.util.Arrays;
+import java.util.Date;
 import java.util.List;
 
 @Service
-public class VehicleDepartureService {
+public class VehicleDepartureService extends BaseBiz<VehicleDepartureLogMapper, VehicleDepartureLog> {
 
     @Autowired
     VehicleDepartureLogMapper vehicleDepartureLogMapper;
@@ -61,4 +67,51 @@ public class VehicleDepartureService {
         statisticData.setDepartureMileage(vehicleDepartureLogMapper.selectMileageByVehicleId(vehicle.getId()));
         return statisticData;
     }
+
+
+    @Transactional
+    public ObjectRestResponse save(VehicleDepartureLog vehicleDepartureLog) {
+
+        Integer id = vehicleDepartureLog.getId();
+        if (id == null || id == 0) {
+            vehicleDepartureLog.setCreateTime(new Date());
+            vehicleDepartureLog.setState(0);
+            insertSelective(vehicleDepartureLog);
+        } else {
+             vehicleDepartureLog.setUpdateTime(new Date());
+            updateSelectiveById(vehicleDepartureLog);
+        }
+
+        return ObjectRestResponse.succ();
+    }
+
+
+
+    public ObjectRestResponse findOne(Integer vid) throws Exception {
+        Example exm = Example.builder(VehicleDepartureLog.class)
+                .where(WeekendSqls.<VehicleDepartureLog>custom()
+                        .andEqualTo(VehicleDepartureLog::getVehicleId, vid)
+                        .andEqualTo(VehicleDepartureLog::getState, 0))
+                .orderByDesc("create_time")
+                .build();
+
+        List<VehicleDepartureLog> vehicleDepartureLogs = mapper.selectByExample(exm);
+        if (vehicleDepartureLogs.size() == 1) {
+            VehicleDepartureLog vehicleDepartureLog = vehicleDepartureLogs.get(1);
+            if (vehicleDepartureLog!=null) {
+                return ObjectRestResponse.succ(vehicleDepartureLog);
+            }
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
+
+    @Transactional
+    public ObjectRestResponse collect(VehicleDepartureLog vdl){
+          vdl.setArrivalTime(new Date());
+         vdl.setState(1);
+         updateSelectiveById(vdl);
+         return ObjectRestResponse.succ();
+    }
+
+
 }

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

@@ -19,9 +19,14 @@ import com.xxfc.platform.vehicle.pojo.Cascade;
 import com.xxfc.platform.vehicle.pojo.CataVo;
 import lombok.extern.slf4j.Slf4j;
 import org.assertj.core.util.Arrays;
+import org.springframework.aop.framework.AopContext;
+import org.springframework.aop.framework.AopProxyUtils;
+import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
@@ -139,7 +144,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
      * @param cascade
      * @return
      */
-    @Transactional
+
     public ObjectRestResponse addCascade(Cascade<VehiclePlatCata> cascade)  {
 
             //取出一级标签
@@ -147,9 +152,10 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
             parent.setCrtTime(System.currentTimeMillis());
             parent.setState(0);
             //插入一级标签获得id
+            parent.setIsMore(0);
+            parent.setRank(0);
             mapper.insertSelective(parent);
             Integer parentId = parent.getId();
-
             //取出二级标签
             List<VehiclePlatCata> childrens = cascade.getChildren();
             //逐条插入二级标签
@@ -158,12 +164,13 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
                 children.setState(0);
                 children.setCrtTime(System.currentTimeMillis());
             }
-            mapper.addPlatCataList(childrens);
-            return ObjectRestResponse.succ();
+          mapper.addPlatCataList(childrens);
+        return ObjectRestResponse.succ();
     }
 
 
 
+
     /**
      * 根据父类id获取子标签
      *
@@ -295,9 +302,9 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
      * @param cas
      * @return
      */
-
+    @Transactional
     public ObjectRestResponse updateAndAdd( Cascade<VehiclePlatCata> cas) {
-        try {
+
             if (cas==null||cas.getParent()==null) {
                 return ObjectRestResponse.createDefaultFail();
             }
@@ -309,10 +316,6 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
 
                 return updateCascade(cas);
             }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ObjectRestResponse.createDefaultFail();
-        }
 
     }
 
@@ -322,7 +325,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
      * @param cas
      * @return
      */
-    @Transactional
+
     public ObjectRestResponse updateCascade(Cascade<VehiclePlatCata> cas) {
 
         try {
@@ -341,7 +344,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
             //遍历
             for (VehiclePlatCata child : children) {
                 //判断子标签是更新还是新增
-                if (child.getId()==null){
+                if (child.getId()==null||child.getId()==0){
                     child.setState(0);
                     child.setUpdTime(System.currentTimeMillis());
                     //添加
@@ -353,7 +356,8 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
                         VehicleCata vehicleCata = new VehicleCata();
                         vehicleCata.setCataId(id);
                         //修改车型和标签的中间表
-                        vehicleCataBiz.delete(vehicleCata);
+                         vehicleCata.setIsdel(1);
+                        vehicleCataBiz.updateIsdalByVehicleCataId(vehicleCata);
                     }
 
                     //更新
@@ -405,7 +409,11 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         return ObjectRestResponse.succ(vehiclePlatCatas);
     }
 
-
+    /**
+     * 删除一级标签及其子标签
+     * @param id
+     * @return
+     */
     @Transactional
     public ObjectRestResponse deleteCascadeById(Integer id){
         //修改一级标签
@@ -423,4 +431,35 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         return ObjectRestResponse.succ();
     }
 
+
+    /**
+     * 修改客户端查询条件
+     * @param id
+     * @param startUsing
+     * @return
+     */
+    @Transactional
+    public ObjectRestResponse setStartUsingById(Integer id, Integer startUsing){
+        VehiclePlatCata vehiclePlatCata = new VehiclePlatCata();
+        vehiclePlatCata.setId(id);
+        vehiclePlatCata.setStartUsing(startUsing);
+        updateSelectiveById(vehiclePlatCata);
+        return  ObjectRestResponse.succ();
+    }
+
+
+    /**
+     * 修改单选还是多选
+     * @param id
+     * @param isMore
+     * @return
+     */
+    @Transactional
+    public ObjectRestResponse setIsore(Integer id, Integer isMore){
+        VehiclePlatCata vehiclePlatCata = new VehiclePlatCata();
+        vehiclePlatCata.setId(id);
+        vehiclePlatCata.setIsMore(isMore);
+        updateSelectiveById(vehiclePlatCata);
+        return  ObjectRestResponse.succ();
+    }
 }

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleCata;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -24,4 +25,7 @@ public interface VehicleCataMapper extends Mapper<VehicleCata> {
     VehicleCata getOne(@Param("vehicleModelId")Integer vehicleModelId,@Param("cataId")Integer cataId );
 
 
+    void updateIsdalByVehicleModelId(VehicleCata vehicleCata);
+
+    void updateIsdalByVehicleCataId(VehicleCata vehicleCata);
 }

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

@@ -4,10 +4,11 @@ import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
 import com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.BaseMapper;
+import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
 
-public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLog> {
+public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLog>, Mapper<VehicleDepartureLog> {
 
     VehicleDepartureLog selectLastByVehicleId(String vehicleId);
 

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

@@ -12,7 +12,9 @@ import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
 import com.xxfc.platform.vehicle.pojo.*;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 import sun.java2d.pipe.AATextRenderer;
 
@@ -108,14 +110,11 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
      * @return
      */
     @PostMapping(value = "/add/addCascade/")
+    @Transactional
     public ObjectRestResponse addCascade(@RequestBody Cascade<VehiclePlatCata> cascade){
 
-        try {
             return baseBiz.addCascade(cascade);
-        } catch (Exception e) {
-            e.printStackTrace();
-            return ObjectRestResponse.createDefaultFail();
-        }
+
 
     }
 
@@ -165,6 +164,30 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
         return  baseBiz.deleteCascadeById(id);
     }
 
+
+    /**
+     * 修改客户端查询条件
+     * @param id
+     * @param startUsing
+     * @return
+     */
+    @PutMapping("/add/setStartUsingById/{id}/{startUsing}")
+    public ObjectRestResponse setStartUsingById(@PathVariable("id") Integer id,@PathVariable("startUsing") Integer startUsing){
+        return  baseBiz.setStartUsingById(id,startUsing);
+    }
+
+    /**
+     * 修改单选还是多选
+     * @param id
+     * @param isMore
+     * @return
+     */
+    @PutMapping("/add/setIsMore/{id}/{isMore}")
+    public ObjectRestResponse setIsMore (@PathVariable("id") Integer id,@PathVariable("isMore") Integer isMore){
+        return  baseBiz.setIsore(id,isMore);
+    }
+
+
    /* @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/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -50,7 +50,7 @@ import static com.xxfc.platform.vehicle.constant.VehicleConstant.USER_APP;
 
 @RestController
 @RequestMapping("/vehicleInfo")
-@Slf4j
+ @Slf4j
 @IgnoreClientToken
 @Api(value = "车辆管理controller", tags = {"车辆管理接口"})
 public class VehicleController extends BaseController<VehicleBiz> {
@@ -354,12 +354,30 @@ public class VehicleController extends BaseController<VehicleBiz> {
         return baseBiz.save(vehicle);
     }
 
+    /**
+     * 查找
+     * @param vehicleVo
+     * @param page
+     * @param limit
+     * @return
+     */
     @PostMapping("/add/findListByVehicle/{page}/{limit}")
     public ObjectRestResponse findListByVehicle(
-            @RequestBody Vehicle vehicle
+            @RequestBody VehicleVo vehicleVo
             , @PathVariable("page") Integer page
             , @PathVariable("limit") Integer limit) {
-        return  baseBiz.findListByVehicle(vehicle,page,limit);
+        return  baseBiz.findListByVehicle(vehicleVo,page,limit);
     }
 
+    /**
+     * 查询一条
+     * @param id
+     * @return
+     */
+   @GetMapping("/add/getOneById/{id}")
+    public ObjectRestResponse getOneById(@PathVariable("id")Integer id){
+     return   baseBiz.getOneById(id);
+   }
+
+
 }

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

@@ -4,14 +4,14 @@ 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.config.UserAuthConfig;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.biz.VehicleDepartureService;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
+import com.xxfc.platform.vehicle.entity.VehicleDepartureLog;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -70,5 +70,38 @@ public class VehicleDepartureController {
         return RestResponse.suc(vehicleDepartureService.statistic(numberPlate));
     }
 
+    /**
+     * 保存(出车)
+     * @param vehicleDepartureLog
+     * @return
+     */
+    @PostMapping("/app/save")
+    public ObjectRestResponse save(@RequestBody VehicleDepartureLog vehicleDepartureLog){
+        return vehicleDepartureService.save(vehicleDepartureLog);
+    }
+
+    /**
+     * 查询一条
+     * @param vid 车辆id
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("/app/findOne/{id}")
+    public  ObjectRestResponse findOne(@PathVariable Integer vid) throws Exception {
+       return vehicleDepartureService.findOne(vid);
+    }
+
+    /**
+     *
+     * 收车
+     * @param vdl
+     * @return
+     * @throws Exception
+     */
+    @PutMapping("/app/collect")
+    public  ObjectRestResponse collect(@RequestBody VehicleDepartureLog vdl) throws Exception {
+        return vehicleDepartureService.collect(vdl);
+    }
+
 
 }

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

@@ -7,6 +7,7 @@ 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.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.biz.VehicleCataBiz;
 import com.xxfc.platform.vehicle.biz.VehicleModelBiz;
 import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
@@ -24,13 +25,17 @@ import io.swagger.annotations.ApiParam;
 import net.bytebuddy.implementation.bytecode.Throw;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Select;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.List;
 
 @RestController
 @RequestMapping("vehicleModel")
@@ -49,6 +54,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @Autowired
     private UserFeign userFeign;
 
+
     //修改评分
     @RequestMapping(value = "/app/addScore", method = RequestMethod.GET)
     public RestResponse addScore(
@@ -126,7 +132,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         if (StringUtils.isBlank(host)) {
             return ObjectRestResponse.createDefaultFail();
         }
-  //设置信息
+        //设置信息
         vm.setCrtName(uorr.getData().getName());
         vm.setCrtUser(uorr.getData().getId());
         vm.setCrtTime(new Date());
@@ -155,7 +161,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
             return ObjectRestResponse.succ();
         } catch (NumberFormatException e) {
             e.printStackTrace();
-            throw  new BaseException(ResultCode.FAILED_CODE);
+            throw new BaseException(ResultCode.FAILED_CODE);
         }
 
     }
@@ -189,14 +195,14 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         vm.setUpdTime(new Date());
 
         try {
-    //修改车型
+            //修改车型
             vehicleModelBiz.updateSelectiveById(vm);
             VehicleCata vcDelete = new VehicleCata();
             vcDelete.setVehicleModelId(vm.getId());
-    // 删除车型对应的标签
+            // 删除车型对应的标签
             vehicleCataBiz.delete(vcDelete);
             ArrayList<VehicleCata> vcs = new ArrayList<>();
-    //从新插入车型对应的标签
+            //从新插入车型对应的标签
 //            获取cataid
             String[] config = vm.getConfig().split(",");
             for (String con : config) {
@@ -210,7 +216,7 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
             return ObjectRestResponse.succ();
         } catch (NumberFormatException e) {
             e.printStackTrace();
-            throw  new BaseException(ResultCode.FAILED_CODE);
+            throw new BaseException(ResultCode.FAILED_CODE);
 
         }
     }
@@ -221,16 +227,37 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     @DeleteMapping(value = "/app/{id}")
     @ResponseBody
     @Transactional
-    public ObjectRestResponse<VehicleModel> remove(@PathVariable int id){
-        try {
-            vehicleModelBiz.deleteById(id);
-            VehicleCata vehicleCata = new VehicleCata();
-            vehicleCata.setVehicleModelId(id);
-            vehicleCataBiz.delete(vehicleCata);
-           return ObjectRestResponse.succ();
-        } catch (Exception e) {
-            e.printStackTrace();
-            throw  new BaseException(ResultCode.FAILED_CODE);
-        }
+    public ObjectRestResponse<VehicleModel> remove(@PathVariable int id) {
+
+        //1.先判断是否有属于该车型可用的车辆,有不能删除,无可以进行删除
+        //根据车型查询对应的车辆
+//        Example exa = Example.builder(Vehicle.class).where(
+//                WeekendSqls.<Vehicle>custom()
+//                        .andEqualTo(Vehicle::getModelId, id)
+//                        .andEqualTo(Vehicle::getStatus, 1)
+//                        .orEqualTo(Vehicle::getStatus,"2")
+//        ).build();
+//
+//        List<Vehicle> vehicles = vehicleBiz.selectByExample(exa);
+//
+//        //判断是查询到对应的车辆
+//        if (vehicles != null) {
+//            ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "该车型,无法删除");
+//        }
+
+        //2.进行逻辑删除
+        VehicleModel vm = new VehicleModel();
+        vm.setId(id);
+        vm.setIsdel(1);
+        vehicleModelBiz.updateById(vm);
+
+        //3.删除车型对应的标签
+        VehicleCata vehicleCata = new VehicleCata();
+        vehicleCata.setVehicleModelId(id);
+        vehicleCata.setIsdel(1);
+        vehicleCataBiz.updateIsdalByVehicleModelId(vehicleCata);
+
+        return ObjectRestResponse.succ();
+
     }
 }
\ No newline at end of file

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

@@ -36,5 +36,10 @@
         </trim>
         ) and vehicle_model_id=#{vehicleModelId}
     </update>
-
+    <update id="updateIsdalByVehicleModelId" parameterType="com.xxfc.platform.vehicle.entity.VehicleCata">
+        update vehicle_cata set isdel=#{isdel} where vehicle_model_id=#{vehicleModelId}
+    </update>
+    <update id="updateIsdalByVehicleCataId" parameterType="com.xxfc.platform.vehicle.entity.VehicleCata">
+        update vehicle_cata set isdel=#{isdel} where cata_id=#{cataId}
+    </update>
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleCataPlatMapper.xml → xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehiclePlatCataMapper.xml

@@ -7,12 +7,12 @@
 
     <insert id="addPlatCataList" parameterType="java.util.List">
         insert into vehicle_plat_cata (
-        parent_id,name,icon,depict,rank,level,state,crt_time,upd_time,isMore
+        parent_id,name,icon,depict,rank,level,state,crt_time,upd_time,isMore,start_using
         ) VALUES
         <foreach collection ="vpclist" item="vpc" index="index" separator =",">
             (#{vpc.parentId},#{vpc.name},#{vpc.icon},#{vpc.depict}
             ,#{vpc.rank},#{vpc.level},#{vpc.state},#{vpc.crtTime}
-            ,#{vpc.updTime},#{vpc.isMore})
+            ,#{vpc.updTime},#{vpc.isMore},#{vpc.startUsing})
         </foreach>
     </insert>