Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteTagBiz.java

@@ -42,8 +42,7 @@ public class CampsiteTagBiz extends BaseBiz<CampsiteTagMapper,CampsiteTag> {
      * @param tagId
      * @return
      */
-    public int updateCampsiteTagStatus(int tagId) {
-     //  return mapper.updateCampsiteTagStatus(tagId,1);
-        return 0;
+    public int updateCampsiteTagStatus(Integer tagId) {
+       return mapper.updateCampsiteTagStatus(tagId,1);
     }
 }
\ No newline at end of file

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/mapper/CampsiteTagMapper.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.campsite.mapper;
 
 import com.xxfc.platform.campsite.dto.CampsiteTagListDTO;
 import com.xxfc.platform.campsite.entity.CampsiteTag;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -23,5 +24,12 @@ public interface CampsiteTagMapper extends Mapper<CampsiteTag> {
      */
     List<CampsiteTagListDTO> findCampsiteTags();
 
-    //@Update("update `campsite_tag` set `is_del`=#{status} where ")
+    /**
+     * 更新类型的删除状态
+     * @param tagId
+     * @param status
+     * @return
+     */
+    @Update("update `campsite_tag` set `is_del`=#{status} where `id`=#{tagId}")
+    int updateCampsiteTagStatus(@Param("tagId") Integer tagId, @Param("status") int status);
 }

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/rest/CampsiteTagController.java

@@ -6,6 +6,8 @@ import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.campsite.biz.CampsiteTagBiz;
 import com.xxfc.platform.campsite.entity.CampsiteTag;
 import com.xxfc.platform.campsite.vo.CampsiteTagListVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -16,11 +18,12 @@ import java.util.List;
 /**
  * @author libin
  * @version 1.0
- * @description 店铺类型
+ * @description 营地类型
  * @data 2019/6/17 13:36
  */
 @RestController
 @RequestMapping("campsiteTag")
+@Api(tags = "营地类型")
 public class CampsiteTagController extends BaseController<CampsiteTagBiz,CampsiteTag> {
 
     /**
@@ -29,13 +32,14 @@ public class CampsiteTagController extends BaseController<CampsiteTagBiz,Campsit
      */
      @GetMapping("/app/unauth/tags")
      @IgnoreClientToken
+     @ApiOperation(value = "营地列表")
     public ObjectRestResponse<CampsiteTagListVo> findCampstieTags(){
          List<CampsiteTagListVo> campsiteTagListVolist = getBaseBiz().findCampsiteTags();
          return ObjectRestResponse.succ(campsiteTagListVolist);
      }
 
     /**
-     * 根据id删除
+     * 根据id逻辑删除
      * @param id
      * @return
      */

xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteTagMapper.xml

@@ -10,7 +10,7 @@
         <result property="name" column="name"/>
         <result property="isSearch" column="is_search"/>
         <result property="rank" column="rank"/>
-        <result property="ctrTime" column="ctr_time"/>
+        <result property="crtTime" column="crt_time"/>
         <result property="updTime" column="upd_time"/>
         <result property="isDel" column="is_del"/>
     </resultMap>