扩展信息

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

@@ -30,6 +30,11 @@ public class VehicleCata implements Serializable {
 	@ApiModelProperty(value = "车型id")
 	private Integer vehicleModelId;
 
+	    //车辆id
+    @Column(name = "vehicle_id")
+	@ApiModelProperty(value = "车辆id")
+    private Integer vehicleId;
+	
 	    //分类id
     @Column(name = "cata_id")
 	@ApiModelProperty(value = "分类id")

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

@@ -71,7 +71,7 @@ public class VehiclePlatCata implements Serializable {
     private Long updTime;
 
     //是否多选
-	@Column(name = "isMore")
+	@Column(name = "is_more")
 	@ApiModelProperty(value = "多选 0:单选 1:多选" )
 	private Integer isMore;
 
@@ -81,4 +81,8 @@ public class VehiclePlatCata implements Serializable {
 	@ApiModelProperty(value = "是否作为客户端查询条件:0-否,1-是" )
 	private Integer startUsing;
 
+	//商家录入是否多选 0--否；1--是
+	@Column(name = "is_input_more")
+	@ApiModelProperty(value = "商家录入是否多选 0--否；1--是" )
+	private Integer isInputMore;
 }

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

@@ -8,6 +8,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.EnableAspectJAutoProxy;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication(scanBasePackages = {
@@ -23,6 +24,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableFeignClients(value = {"com.github.wxiaoqi.security","com.xxfc.platform.*.feign"},defaultConfiguration = HeaderConfig.class)
 @EnableAceCache
 @AddBasicConfiguration
+@EnableAspectJAutoProxy(proxyTargetClass = true, exposeProxy = true)
 @tk.mybatis.spring.annotation.MapperScan(basePackages = "com.xxfc.platform.vehicle.mapper")
 public class VehicleApplication {
 

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

@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Arrays;
+import org.springframework.aop.framework.AopContext;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -178,7 +179,7 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
      * @param parentId
      * @return
      */
-    public ObjectRestResponse fingCatasByParentId(Integer parentId) {
+    public ObjectRestResponse<List<VehiclePlatCata>> fingCatasByParentId(Integer parentId) {
 
         Example example = Example.builder(VehiclePlatCata.class)
                 .where(WeekendSqls.<VehiclePlatCata>custom()
@@ -511,4 +512,8 @@ public class VehiclePlatCataBiz extends BaseBiz<VehiclePlatCataMapper, VehiclePl
         });
         return cataVos;
     }
+
+    private VehiclePlatCataBiz getMyBiz() {
+        return AopContext.currentProxy() != null ? (VehiclePlatCataBiz) AopContext.currentProxy() : this;
+    }
 }

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

+package com.xxfc.platform.vehicle.rest.admin;
+
+import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
+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.vo.PageParam;
+import com.xxfc.platform.vehicle.biz.VehicleCataBiz;
+import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
+import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.common.VehicleBaseController;
+import com.xxfc.platform.vehicle.entity.VehiclePlatCata;
+import com.xxfc.platform.vehicle.pojo.Cascade;
+import com.xxfc.platform.vehicle.pojo.CataVo;
+import com.xxfc.platform.vehicle.pojo.vo.VehiclePlatCataVo;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+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("/backstage/cata")
+@Slf4j
+@IgnoreClientToken
+
+public class BgVehicleCataController extends VehicleBaseController<VehiclePlatCataBiz> {
+
+    @Autowired
+    VehicleCataBiz vehicleCataBiz;
+
+
+    @RequestMapping(value = "/update", method = RequestMethod.POST)
+    public RestResponse update(@RequestBody CataVo cataVo) throws Exception {
+        return baseBiz.update(cataVo);
+    }
+    @RequestMapping(value = "/app/all", method = RequestMethod.POST)
+    public RestResponse test() throws Exception {
+        AppUserDTO userDTO =getUserInfo();
+
+        return RestResponse.data(userDTO);
+    }
+
+    @RequestMapping(value = "/app/unauth/all", method = RequestMethod.POST)
+    @IgnoreUserToken
+    public RestResponse all() throws Exception {
+        return RestResponse.data(baseBiz.findTypeTree());
+    }
+
+    @RequestMapping(value = "/bind", method = RequestMethod.POST)
+    public RestResponse bind(
+            @RequestParam(value = "ids",defaultValue = "") String  ids,
+            @RequestParam(value = "modelId",defaultValue = "0") Integer  modelId
+    ) throws Exception {
+        return vehicleCataBiz.updateCataByModel(ids,modelId);
+    }
+
+
+
+
+    /**
+     * 根据父类id获取子标签
+     * @param parentId
+     * @return
+     */
+    @GetMapping(value = "/add/fingCatasByParentId/{parentId}")
+    public ObjectRestResponse<List<VehiclePlatCata>> fingCatasByParentId(@PathVariable("parentId") Integer parentId ){
+        return   baseBiz.fingCatasByParentId(parentId);
+
+    }
+
+    /**
+     * 查询一个一级标签及其子标签
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/add/findCascade/{id}")
+    public ObjectRestResponse findCascade(@PathVariable("id") Integer id){
+        return baseBiz.findCascade(id);
+
+    }
+
+
+    /**
+     * 分页或不分页,获取一级标签及其子标签
+     * #@param dto.page 当前页
+     * #@param dto.limit 每页条数
+     * #@param dto.sort 分类 0-增加车型页面,1-标签管理页面
+     * @return
+     */
+    @GetMapping(value = "/getCascades")
+    public ObjectRestResponse getCascades(PageDTO dto){
+        return baseBiz.getCascades(dto.getPage(), dto.getLimit(), dto.getSort());
+    }
+
+    @Data
+    public static class PageDTO extends PageParam {
+        Integer sort;
+    }
+
+
+    /**
+     * 级联添加
+     * @param cascade
+     * @return
+     */
+    @PostMapping(value = "/add/addCascade/")
+    @Transactional
+    public ObjectRestResponse addCascade(@RequestBody Cascade<VehiclePlatCata> cascade){
+
+            return baseBiz.addCascade(cascade);
+
+
+    }
+
+
+    /**
+     * 修改和增加一二级标签
+     * @param cas
+     * @return
+     */
+    @PostMapping("/add/updateAndAdd")
+    public ObjectRestResponse save(@RequestBody Cascade<VehiclePlatCata> cas){
+
+        return  baseBiz.updateAndAdd(cas);
+    }
+
+
+    /**
+     * 修改标签排序
+     * @param id
+     * @param rank
+     * @return
+     */
+    @PutMapping("/add/updateParentRank/{id}/{rank}")
+    public ObjectRestResponse updateParentRank(@PathVariable("id")  Integer id,@PathVariable("rank") Integer rank){
+
+        return  baseBiz.updateParentRank(id,rank);
+    }
+
+
+    /**
+     * 查询当前车型拥有的标签
+     * @param ids
+     * @return
+     */
+    @GetMapping("/add/getCatasByIds/{ids}")
+    public ObjectRestResponse<List<VehiclePlatCata>> getCatasByIds(@PathVariable String ids){
+        return  baseBiz.getCatasByIds(ids);
+    }
+
+    /**
+     * 删除一级标签及其子标签
+     * @param id 标签id
+     * @return
+     */
+    @DeleteMapping("/add/deleteCascadeById/{id}")
+    public ObjectRestResponse deleteCascadeById(@PathVariable("id") Integer id){
+        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);
+    }
+
+    /**
+     * 根据类型id查询分类
+     * @param type
+     * @return
+     */
+    @GetMapping("/app/unauth/types")
+    public ObjectRestResponse<List<VehiclePlatCataVo>> findVehiclePlatCate(@RequestParam(value = "type",required = false,defaultValue = "7") Integer type){
+        List<VehiclePlatCataVo> category = baseBiz.findVehicleCategoryByParentId(type);
+        return ObjectRestResponse.succ(category);
+    }
+
+
+}

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

@@ -7,6 +7,7 @@
     <resultMap type="com.xxfc.platform.vehicle.entity.VehicleCata" id="vehicleCataMap">
         <result property="id" column="id"/>
         <result property="vehicleModelId" column="vehicle_model_id"/>
+        <result property="vehicleId" column="vehicle_id"/>
         <result property="cataId" column="cata_id"/>
         <result property="isdel" column="isdel"/>
         <result property="crtTime" column="crt_time"/>