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

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBannerBiz.java

@@ -39,4 +39,15 @@ public class TourTagBannerBiz extends BaseBiz<TourTagBannerMapper,TourTagBanner>
 
         return  PageDataVO.pageInfo(pageNo,pageSize,()->mapper.findAllByState(0));
     }
+
+    /**
+     * 根据id更改banner状态
+     * @param id
+     * @param status
+     * @return
+     */
+    public int updateTourTagBannerStatusById(int id, int status) {
+
+        return mapper.updateTourTagBannerStatusById(id,status);
+    }
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourTagBiz.java

@@ -82,4 +82,15 @@ public class TourTagBiz extends BaseBiz<TourTagMapper,TourTag> {
          tourTag.setUpdTime(Instant.now().toEpochMilli());
         return mapper.save(tourTag);
     }
+
+    /**
+     * 根据主键修改标签状态
+     * @param id
+     * @param status
+     * @return
+     */
+    public int updateTourTagStateById(Integer id,int status) {
+
+        return  mapper.updateTourTagStatusById(id,status);
+    }
 }
\ No newline at end of file

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourTagBannerMapper.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.tour.mapper;
 import com.xxfc.platform.tour.entity.TourTagBanner;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -20,6 +21,16 @@ public interface TourTagBannerMapper extends Mapper<TourTagBanner> {
      * 根据是否删除状态来查询数据
      * @param isDel
      */
-    @Select("select * from tour_tag_banner where id=#{isDel}")
+    @Select("select * from tour_tag_banner where `is_del`=#{isDel}")
     List<TourTagBanner> findAllByState(@Param("isDel") int isDel);
+
+    /**
+     * 根据主键id更新banner状态
+     * @param id
+     * @param status
+     * @return
+     */
+    @Update("update tour_tag_banner set `is_del`=#{status} where `id`=#{id}")
+    int updateTourTagBannerStatusById(@Param("id") int id, @Param("status") int status);
+
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourTagMapper.java

@@ -40,4 +40,13 @@ public interface TourTagMapper extends Mapper<TourTag> {
     @Insert("insert tour_tag(`name`,`img`,`describe`,`link`,`is_hot`,`count`,`rank`,`ctr_time`,`upd_time`,`is_del`)" +
             "values(#{name},#{img},#{describe},#{link},#{isHot},#{count},#{rank},#{ctrTime},#{updTime},#{isDel})")
     int save(TourTag tourTag);
+
+    /**
+     * 更新旅游标签的 删除状态
+     * @param id
+     * @param status
+     * @return
+     */
+    @Update("update tour_tag set `is_del`=#{status} where `id`=#{id}")
+    int updateTourTagStatusById(@Param("id") Integer id, @Param("status") int status);
 }

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

@@ -48,7 +48,7 @@ public class TourTagAdminController extends BaseController<TourTagBiz, TourTag>
      * @return
      */
     @Override
-    public ObjectRestResponse<TourTag> get(int id) {
+    public ObjectRestResponse<TourTag> get(@PathVariable int id) {
      TourTag tourTag = getBaseBiz().findTourTagById(id);
      return ObjectRestResponse.succ(tourTag);
     }
@@ -65,6 +65,21 @@ public class TourTagAdminController extends BaseController<TourTagBiz, TourTag>
             return  ObjectRestResponse.succ();
         }
         return ObjectRestResponse.createDefaultFail();
+    }
+
+    /**
+     * 逻辑删除
+     * @param id
+     * @return
+     */
+    @Override
+    public ObjectRestResponse<TourTag> remove(@PathVariable int id) {
+        int effRow = getBaseBiz().updateTourTagStateById(id,1);
+
+        if (effRow>0){
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
 
     }
 }
\ No newline at end of file

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

@@ -39,4 +39,19 @@ public class TourTagBannerAdminController extends BaseController<TourTagBannerBi
          PageDataVO<TourTagBanner> tagBannerPageDataVO = getBaseBiz().findTourTagBannerWithPage(pageNo, pageSize);
          return ObjectRestResponse.succ(tagBannerPageDataVO);
     }
+
+    /**
+     * 根据主键id逻辑删除
+     * @param id
+     * @return
+     */
+    @Override
+    public ObjectRestResponse<TourTagBanner> remove(@PathVariable int id) {
+        int effRows = getBaseBiz().updateTourTagBannerStatusById(id,1);
+
+        if (effRows>0){
+            return ObjectRestResponse.succ();
+        }
+        return ObjectRestResponse.createDefaultFail();
+    }
 }
\ No newline at end of file