营地

ace-auth/ace-auth-server/src/main/resources/bootstrap.yml

@@ -15,7 +15,7 @@ spring:
       config:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
-        shared-dataids: common-dev.yaml
+        #shared-dataids: common-dev.yaml
 ---
 spring:
   profiles: pro

ace-modules/ace-admin/src/main/resources/bootstrap.yml

@@ -17,7 +17,7 @@ spring:
       config:
         server-addr: 127.0.0.1:8848
         #共用配置，暂定一个
-        shared-dataids: common-dev.yaml
+        #shared-dataids: common-dev.yaml
 
 ---
 spring:

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteTagDTO.java

@@ -66,4 +66,6 @@ public class CampsiteTagDTO implements Serializable {
     @ApiModelProperty(value = "是否删除:0-正常；1-删除")
     private Integer isDel;
 
+    @ApiModelProperty(value = "标签底图")
+    private String tagUrl;
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/vo/CampsiteTagVo.java

@@ -24,12 +24,6 @@ public class CampsiteTagVo implements Serializable {
     @ApiModelProperty("主键id")
     private Integer id;
 
-    /**
-     * 父id
-     */
-    @ApiModelProperty(value = "父id")
-    private Integer parentId;
-
     /**
      * 名称
      */
@@ -54,16 +48,7 @@ public class CampsiteTagVo implements Serializable {
     @ApiModelProperty(value = "创建时间")
     private Long ctrTime;
 
-    /**
-     * 更新时间
-     */
-    @ApiModelProperty(value = "更新时间", hidden = true)
-    private Long updTime;
-
-    /**
-     * 是否删除:0-正常；1-删除
-     */
-    @ApiModelProperty(value = "是否删除:0-正常；1-删除")
-    private Integer isDel;
+    @ApiModelProperty(value = "标签底图")
+    private String tagUrl;
 
 }

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

@@ -194,6 +194,24 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
         return effectRows;
     }
 
+    /**
+     * 逻辑删除
+     * @param id
+     * @return
+     */
+    public int updateCampsiteSatus(int id) {
+        return mapper.updateCampsiteStatus(id,1);
+    }
+
+    /**
+     * 上下架
+     * @param id
+     * @param status
+     * @return
+     */
+    public int updateCampsiteSaleStatus(Integer id, Integer status) {
+        return mapper.updateCampsiteSaleStatus(id,status);
+    }
     /**
      * 根据经纬度，计算两点间的距离
      *
@@ -222,5 +240,4 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper,CampsiteShop> {
         return s;
     }
 
-
 }
\ No newline at end of file

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

@@ -2,8 +2,10 @@ package com.xxfc.platform.campsite.biz;
 
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.campsite.dto.CampsiteTagListDTO;
 import com.xxfc.platform.campsite.vo.CampsiteTagListVo;
+import com.xxfc.platform.campsite.vo.CampsiteTagVo;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 
@@ -44,4 +46,21 @@ public class CampsiteTagBiz extends BaseBiz<CampsiteTagMapper,CampsiteTag> {
     public int updateCampsiteTagStatus(Integer tagId) {
        return mapper.updateCampsiteTagStatus(tagId,1);
     }
+
+    /**
+     * 分页查询
+     * @param page
+     * @param limit
+     * @return
+     */
+    public PageDataVO<CampsiteTagVo> findCampsiteTagsPage(Integer page, Integer limit) {
+        PageDataVO<CampsiteTagVo> tagVoPageDataVO = new PageDataVO<>();
+        PageDataVO<CampsiteTag> pageDataVO = PageDataVO.pageInfo(page, limit, () -> mapper.finCampsiteTagsAll());
+        List<CampsiteTag> campsiteTags = pageDataVO.getData();
+        if (CollectionUtils.isEmpty(campsiteTags)){
+            return tagVoPageDataVO;
+        }
+        tagVoPageDataVO = JSONObject.parseObject(JSONObject.toJSONString(pageDataVO),new TypeReference<PageDataVO<CampsiteTagVo>>(){});
+        return tagVoPageDataVO;
+    }
 }
\ No newline at end of file

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

@@ -39,4 +39,20 @@ public interface CampsiteShopMapper extends Mapper<CampsiteShop> {
      * @return
      */
     List<CampsiteShopAdminPageDTO> findCampsiteShops(CampsiteShopAdminFindDTO campsiteShopAdminFindDTO);
+
+    /**
+     * 更新店铺的状态
+     * @param id
+     * @param status
+     * @return
+     */
+    int updateCampsiteStatus(@Param("id") int id,@Param("status") int status);
+
+    /**
+     * 更新店铺的上下架状态
+     * @param id
+     * @param status
+     * @return
+     */
+    int updateCampsiteSaleStatus(@Param("id") Integer id, @Param("status") Integer status);
 }

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

 package com.xxfc.platform.campsite.mapper;
 
+import com.xxfc.platform.campsite.dto.CampsiteTagDTO;
 import com.xxfc.platform.campsite.dto.CampsiteTagListDTO;
 import com.xxfc.platform.campsite.entity.CampsiteTag;
 import org.apache.ibatis.annotations.Param;
@@ -32,4 +33,7 @@ public interface CampsiteTagMapper extends Mapper<CampsiteTag> {
      */
     @Update("update `campsite_tag` set `is_del`=#{status} where `id`=#{tagId}")
     int updateCampsiteTagStatus(@Param("tagId") Integer tagId, @Param("status") int status);
+
+
+    List<CampsiteTagDTO> finCampsiteTagsAll();
 }

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

@@ -49,4 +49,33 @@ public class CampsiteShopAdminController extends BaseController<CampsiteShopBiz,
         return ObjectRestResponse.createDefaultFail();
     }
 
+    /**
+     * 营地逻辑删除
+     * @param id
+     * @return
+     */
+    @Override
+    public ObjectRestResponse<CampsiteShop> remove(@PathVariable(value = "id") int id) {
+        int effectRows = getBaseBiz().updateCampsiteSatus(id);
+        if (effectRows>0){
+            return ObjectRestResponse.succ();
+        }
+        return  ObjectRestResponse.createDefaultFail();
+    }
+
+    /**
+     * 营地上下架
+     * @param id
+     * @param status
+     * @return
+     */
+    @ApiOperation("营地上下架")
+    @PutMapping("/saleStatus")
+    public ObjectRestResponse<Void> updateSaleStatus(@RequestParam("id") Integer id,@RequestParam("status") Integer status){
+        int effectRows = getBaseBiz().updateCampsiteSaleStatus(id,status);
+        if (effectRows>0){
+            return ObjectRestResponse.succ();
+        }
+        return  ObjectRestResponse.createDefaultFail();
+    }
 }
\ No newline at end of file

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

@@ -2,12 +2,13 @@ package com.xxfc.platform.campsite.rest.admin;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.campsite.biz.CampsiteTagBiz;
 import com.xxfc.platform.campsite.entity.CampsiteTag;
+import com.xxfc.platform.campsite.vo.CampsiteTagVo;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 
 
 /**
@@ -35,4 +36,11 @@ public class CampsiteTagAdminController extends BaseController<CampsiteTagBiz,Ca
         return ObjectRestResponse.createDefaultFail();
     }
 
+    @ApiOperation("营地类型的分页")
+    @GetMapping("/pages")
+    public ObjectRestResponse<CampsiteTagVo> pages(@RequestParam("page") Integer page,@RequestParam("limit") Integer limit){
+        PageDataVO<CampsiteTagVo> tagVoPageDataVO = getBaseBiz().findCampsiteTagsPage(page,limit);
+        return ObjectRestResponse.succ(tagVoPageDataVO);
+    }
+
 }
\ No newline at end of file

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

@@ -75,4 +75,12 @@
         </where>
 
     </select>
+
+    <update id="updateCampsiteStatus">
+        update `campsite_shop` set `is_del`=#{status} where `id`=#{id}
+    </update>
+
+    <update id="updateCampsiteSaleStatus">
+        update `campsite_shop` set `sale_state`=#{status} where `id`=#{id}
+    </update>
 </mapper>
\ No newline at end of file

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

@@ -13,9 +13,26 @@
         <result property="crtTime" column="crt_time"/>
         <result property="updTime" column="upd_time"/>
         <result property="isDel" column="is_del"/>
+        <result property="tagUrl" column="tag_url"/>
+    </resultMap>
+
+    <resultMap type="com.xxfc.platform.campsite.dto.CampsiteTagDTO" id="campsiteTagDTOMap">
+        <result property="id" column="id"/>
+        <result property="parentId" column="parent_id"/>
+        <result property="name" column="name"/>
+        <result property="isSearch" column="is_search"/>
+        <result property="rank" column="rank"/>
+        <result property="ctrTime" column="crt_time"/>
+        <result property="updTime" column="upd_time"/>
+        <result property="isDel" column="is_del"/>
+        <result property="tagUrl" column="tag_url"/>
     </resultMap>
 
     <select id="findCampsiteTags" resultType="com.xxfc.platform.campsite.dto.CampsiteTagListDTO">
         select `id`,`name` from `campsite_tag` where `is_del`=0 and `is_search`=1;
     </select>
+
+    <select id="finCampsiteTagsAll" resultMap="campsiteTagDTOMap">
+        select * from `campsite_tag` where `is_del`=0
+    </select>
 </mapper>
\ No newline at end of file