营地

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserCollectController.java

@@ -106,5 +106,4 @@ public class AppUserCollectController extends CommonBaseController {
         return collectBiz.upUserCollect(collectDTO);
     }
 
-
 }

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

 package com.xxfc.platform.campsite.biz;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.xxfc.platform.campsite.dto.CampsiteTagListDTO;

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

@@ -23,7 +23,7 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("campsiteTag")
-@Api(tags = "营地类型")
+@Api(tags = "App营地类型")
 public class CampsiteTagController extends BaseController<CampsiteTagBiz,CampsiteTag> {
 
     /**
@@ -37,18 +37,4 @@ public class CampsiteTagController extends BaseController<CampsiteTagBiz,Campsit
          List<CampsiteTagListVo> campsiteTagListVolist = getBaseBiz().findCampsiteTags();
          return ObjectRestResponse.succ(campsiteTagListVolist);
      }
-
-    /**
-     * 根据id逻辑删除
-     * @param id
-     * @return
-     */
-    @Override
-    public ObjectRestResponse<CampsiteTag> remove(@PathVariable("id") int id) {
-        int effectRows = getBaseBiz().updateCampsiteTagStatus(id);
-        if (effectRows>0){
-            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

 package com.xxfc.platform.campsite.rest.admin;
 
-import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 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;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.List;
 
 /**
  * @author libin
@@ -23,7 +18,21 @@ import java.util.List;
  */
 @RestController
 @RequestMapping("/admin/campsiteTag")
-@Api(tags = "营地类型")
+@Api(tags = "后台*营地类型")
 public class CampsiteTagAdminController extends BaseController<CampsiteTagBiz,CampsiteTag> {
 
+    /**
+     * 根据id逻辑删除
+     * @param id
+     * @return
+     */
+    @Override
+    public ObjectRestResponse<CampsiteTag> remove(@PathVariable("id") int id) {
+        int effectRows = getBaseBiz().updateCampsiteTagStatus(id);
+        if (effectRows>0){
+            ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
+
 }
\ No newline at end of file

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

@@ -16,6 +16,6 @@
     </resultMap>
 
     <select id="findCampsiteTags" resultType="com.xxfc.platform.campsite.dto.CampsiteTagListDTO">
-        select `id`,`name` from `campsite_tag` where `is_del`=0;
+        select `id`,`name` from `campsite_tag` where `is_del`=0 and `is_search`=1;
     </select>
 </mapper>
\ No newline at end of file