修改车型标签

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourUserController.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.tour.rest;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 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.xxfc.platform.tour.biz.TourUserBiz;
 import com.xxfc.platform.tour.common.TourBaseController;
 import com.xxfc.platform.tour.entity.TourUser;
@@ -50,7 +51,11 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
     }
 
 
-
+    /**
+     * 添加和更新
+     * @param tourUser
+     * @return
+     */
 
     @ApiOperation("插入和更新")
     @PostMapping(value = "/app/addAndUpdate")
@@ -74,14 +79,15 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
             return new ObjectRestResponse<TourUser>();
         } catch (Exception e) {
             e.printStackTrace();
-            throw new BaseException("失败");
+            throw new BaseException(ResultCode.FAILED_CODE);
         }
 
 
     }
 
+
     @ApiOperation("通过id查询")
-    @PostMapping(value = "/app/findById/{id}")
+    @GetMapping(value = "/app/findById/{id}")
     public ObjectRestResponse<TourUser> findById(@PathVariable Integer id){
 
         AppUserDTO userInfo = getUserInfo();
@@ -106,6 +112,9 @@ public class TourUserController extends TourBaseController<TourUserBiz> {
     @GetMapping("/app/unauth/getTourUserList")
     public ObjectRestResponse getTourUser(){
         AppUserDTO userInfo = getUserInfo();
+        if (userInfo==null||userInfo.getUserid()==null||userInfo.getUserid()==0) {
+            ObjectRestResponse.createDefaultFail();
+        }
         Integer id = userInfo.getId();
         List<TourUser> tourUsers= baseBiz.getTourUser(id);
         return ObjectRestResponse.succ(tourUsers);

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/RedisKey.java

@@ -98,4 +98,15 @@ public class RedisKey {
      */
     public static final String MILEAGE_LAST_DAY_PREFIX ="mileage:last_day:";
 
+
+    /**
+     * 标签列表缓存key
+     */
+    public static final String BRANCH_COMPANY_CATA_PAGE = BRANCH_CATA_CACHE + ":page";
+    /**
+     * 增加车型列表key
+     */
+    public static final String BRANCH_COMPANY_CATA_LIST = BRANCH_CATA_CACHE + ":list";
+
+
 }

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

@@ -71,9 +71,9 @@ public class VehiclePlatCata implements Serializable {
     private Long updTime;
 
     //是否多选
-	@Column(name = "ismore")
+	@Column(name = "isMore")
 	@ApiModelProperty(value = "多选 0:单选 1:多选" )
-	private Integer ismore;
+	private Integer isMore;
 	
 
 }

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

@@ -5,7 +5,13 @@ import lombok.Data;
 import java.util.List;
 @Data
 public class  Cascade <v> {
+    /**
+     * 一级标签
+     */
     v  parent;
+    /**
+     * 二级子标签
+     */
     List<v>  children;
 
     public Cascade(v parent, List<v> children) {

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

@@ -9,5 +9,5 @@ import java.util.List;
 
 public interface VehiclePlatCataMapper extends Mapper<VehiclePlatCata> {
 
-    int addPlatCataList(@Param("list") List<VehiclePlatCata> list);
+    int addPlatCataList(@Param("vpclist") List<VehiclePlatCata> vpclist);
 }
\ No newline at end of file

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

@@ -107,25 +107,50 @@ public class VehicleCataController extends VehicleBaseController<VehiclePlatCata
     @PostMapping(value = "/add/addCascade/")
     public ObjectRestResponse addCascade(@RequestBody Cascade<VehiclePlatCata> cascade){
 
-        return baseBiz.addCascades(cascade);
+        try {
+            return baseBiz.addCascade(cascade);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ObjectRestResponse.createDefaultFail();
+        }
 
     }
 
 
     /**
      * 修改和增加一二级标签
-     * @param uc
+     * @param cas
      * @return
      */
-    @PutMapping("/add/uc")
-    public ObjectRestResponse updateCascade(@RequestBody Cascade<VehiclePlatCata> uc){
-        baseBiz.updateCascade(uc);
-        return null;
+    @PostMapping("/add/updateAndAdd")
+    public ObjectRestResponse updateAndAdd(@RequestBody Cascade<VehiclePlatCata> cas){
+
+        return  baseBiz.updateAndAdd(cas);
     }
 
 
+    /**
+     * 修改标签排序
+     * @param id
+     * @param rank
+     * @return
+     */
+    @PutMapping("/add/updateParentRank/{id}/{rank}")
+    public ObjectRestResponse updateParentRank(@PathVariable  Integer id,@PathVariable Integer rank){
+
+        return  baseBiz.updateParentRank(id,rank);
+    }
 
 
+    /**
+     * 查询当前车型拥有的标签
+     * @param ids
+     * @return
+     */
+    @GetMapping("/add/getCatasByIds/{ids}")
+    public ObjectRestResponse getCatasByIds(@PathVariable String ids){
+        return  baseBiz.getCatasByIds(ids);
+    }
 
    /* @RequestMapping(value = "/{id}", method = RequestMethod.GET)
     public RestResponse<Vehicle> get(@PathVariable String id) {

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

@@ -6,13 +6,13 @@
 
 
     <insert id="addPlatCataList" parameterType="java.util.List">
-        insert into vehicle_cata (
-        parent_id,name,icon,depict,rank,level,state,crt_time,upd_time,ismore
+        insert into vehicle_plat_cata (
+        parent_id,name,icon,depict,rank,level,state,crt_time,upd_time,isMore
         ) VALUES
-        <foreach collection ="list" item="item" index="index" separator =",">
-            (#{item.parentId},#{item.name},#{item.icon},#{item.depict}
-            ,#{item.rank},#{item.level},#{item.state},#{item.crtTime}
-            ,#{item.updTime},#{item.ismore})
+        <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})
         </foreach>
     </insert>