修改地区联动

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

+package com.xxfc.platform.vehicle.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Id;
+import java.util.Date;
+
+@Data
+public class Area {
+    /**
+     * 主键
+     */
+    @Id
+    private Integer id;
+    private String name;
+    /**
+     * 省份id字符串，多个以逗号隔开
+     */
+    @Column(name = "province_ids")
+    private String provinceIds;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+
+}

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

@@ -126,7 +126,7 @@ public class AddOrUpdateVehicleVo {
     /**
      * 车型
      */
-    private Integer modeLId;
+    private Integer modelId;
     /**
      * 车辆状态
      */

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

+package com.xxfc.platform.vehicle.biz;
+
+import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.vehicle.entity.Area;
+import com.xxfc.platform.vehicle.mapper.AreaMapper;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AreaBiz extends BaseBiz<AreaMapper, Area> {
+}

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

+package com.xxfc.platform.vehicle.mapper;
+
+import com.xxfc.platform.vehicle.entity.Area;
+import tk.mybatis.mapper.common.Mapper;
+
+public interface AreaMapper extends Mapper<Area> {
+}

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

@@ -13,6 +13,7 @@ import com.xxfc.platform.vehicle.pojo.AddOrUpdateAccompanyingItem;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.vehicle.pojo.QueryAccompanyItemVo;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -23,6 +24,9 @@ import java.util.List;
 @Slf4j
 public class AccompanyingItemController extends BaseController<AccompanyingItemBiz> {
 
+    @Autowired
+    AccompanyingItemBiz accompanyingItemBiz;
+
     @RequestMapping(value ="/{id}",method = RequestMethod.GET)
     private RestResponse<AccompanyingItem> get(@PathVariable Integer id) throws Exception{
         return RestResponse.codeAndData(RestResponse.SUC_CODE,baseBiz.get(id));
@@ -30,7 +34,7 @@ public class AccompanyingItemController extends BaseController<AccompanyingItemB
 
     @RequestMapping(value ="/all",method = RequestMethod.GET)
     private RestResponse<List<AccompanyingItem>> getAll(){
-        return RestResponse.codeAndData(RestResponse.SUC_CODE,baseBiz.getAll());
+        return RestResponse.codeAndData(RestResponse.SUC_CODE,accompanyingItemBiz.getAll());
     }
 
 

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

+package com.xxfc.platform.vehicle.rest;
+
+import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.vehicle.biz.AreaBiz;
+import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.entity.Area;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/area")
+@Slf4j
+@IgnoreClientToken
+public class AreaController extends BaseController<AreaBiz, Area> {
+
+    @GetMapping("/findAll")
+    public RestResponse<List<Area>> findAll(){
+        return RestResponse.suc(baseBiz.selectListAll());
+
+    }
+
+}

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

@@ -11,7 +11,10 @@ import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.SysRegion;
 import lombok.extern.slf4j.Slf4j;
+import org.assertj.core.util.Arrays;
 import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import java.util.List;
 
@@ -57,4 +60,19 @@ public class SysRegionController extends BaseController<SysRegionBiz> {
         }
     }
 
+
+    /**
+     * 根据多个id查找省份
+     * @param ids
+     * @return
+     */
+    @GetMapping("/getSysRegionByIds/{ids}")
+    public RestResponse getSysRegionByIds(@PathVariable String ids){
+        Example exam = Example.builder(SysRegion.class)
+                .where(WeekendSqls.<SysRegion>custom()
+                        .andIn(SysRegion::getId, Arrays.asList(ids.split(",")))).build();
+        return RestResponse.suc( baseBiz.selectByExample(exam));
+
+    }
+
 }

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

@@ -7,6 +7,7 @@ import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.vehicle.biz.VehicleBiz;
 import com.xxfc.platform.vehicle.biz.VehicleCataBiz;
@@ -287,4 +288,15 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         return ObjectRestResponse.succ();
 
     }
+
+
+    @ApiOperation("查询所有")
+    @RequestMapping(value = "/findAll",method = RequestMethod.GET)
+    @ResponseBody
+    public ObjectRestResponse findAll(){
+        VehicleModel vehicleModel = new VehicleModel();
+        vehicleModel.setIsdel(0);
+        return ObjectRestResponse.succ(baseBiz.selectList(vehicleModel));
+    }
+
 }
\ No newline at end of file