From a65993f8aa31968e11f2186c5e8deba2f76321cd Mon Sep 17 00:00:00 2001
From: "aoli.qu" <408346101@qq.com>
Date: Thu, 26 Oct 2023 17:12:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BD=AE=E9=A1=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/org/web/data/mapper/DataMapper.java   |  2 +-
 .../controller/BcHonorShowController.java     | 13 +++++++++++++
 .../com/org/web/honor/domain/BcHonorShow.java |  5 +++++
 .../web/honor/mapper/BcHonorShowMapper.java   | 15 ++++++++++++++-
 .../web/honor/service/BcHonorShowService.java | 19 +++++++++++++++++++
 5 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/org/web/data/mapper/DataMapper.java b/src/main/java/com/org/web/data/mapper/DataMapper.java
index 0f7eb54..477b362 100644
--- a/src/main/java/com/org/web/data/mapper/DataMapper.java
+++ b/src/main/java/com/org/web/data/mapper/DataMapper.java
@@ -77,7 +77,7 @@ public interface DataMapper extends BaseMapper<BcPersonSupport> {
             "    SELECT '50岁以下' AS age_group, 0 AS min_age, 49 AS max_age, 1 AS id " +
             "    UNION SELECT '50-59岁', 50, 59, 2 " +
             "    UNION SELECT '60-69岁', 60, 69, 3 " +
-            "    UNION SELECT '70-79岁', 70, 79, 4 " +
+            "    UNION SELECT '70-79岁 ', 70, 79, 4 " +
             "    UNION SELECT '80-89岁', 80, 89, 5 " +
             "    UNION SELECT '90岁以上', 90, 999, 6 " +
             ") AS age_ranges " +
diff --git a/src/main/java/com/org/web/honor/controller/BcHonorShowController.java b/src/main/java/com/org/web/honor/controller/BcHonorShowController.java
index 574bc38..f666a54 100644
--- a/src/main/java/com/org/web/honor/controller/BcHonorShowController.java
+++ b/src/main/java/com/org/web/honor/controller/BcHonorShowController.java
@@ -80,4 +80,17 @@ public class BcHonorShowController extends BaseController {
 	}
 
 
+	/**
+	 * 设置置顶
+	 */
+	@PostMapping("/setTop")
+	@PreAuthorize("@ss.hasPermi('honor:show:add')")
+	@Log(title = "荣誉橱窗展示置顶", businessType = BusinessType.UPDATE)
+	public AjaxResult setTop(@Validated @RequestBody IdParams params) {
+		log.info("BcHonorShowController - setTop params:{}", params);
+
+		bcHonorShowService.setTop(params.getId());
+		return AjaxResult.success();
+	}
+
 }
diff --git a/src/main/java/com/org/web/honor/domain/BcHonorShow.java b/src/main/java/com/org/web/honor/domain/BcHonorShow.java
index f094020..ee6aa1b 100644
--- a/src/main/java/com/org/web/honor/domain/BcHonorShow.java
+++ b/src/main/java/com/org/web/honor/domain/BcHonorShow.java
@@ -40,5 +40,10 @@ public class BcHonorShow extends BaseEntity {
      */
     private String files;
 
+    /**
+     * 是否置顶 1-是 0-否
+     */
+    private Integer ifTop;
+
     public BcHonorShow() {}
 }
diff --git a/src/main/java/com/org/web/honor/mapper/BcHonorShowMapper.java b/src/main/java/com/org/web/honor/mapper/BcHonorShowMapper.java
index 90c24cd..424fdfe 100644
--- a/src/main/java/com/org/web/honor/mapper/BcHonorShowMapper.java
+++ b/src/main/java/com/org/web/honor/mapper/BcHonorShowMapper.java
@@ -3,7 +3,9 @@ package com.org.web.honor.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.org.web.honor.domain.BcHonorShow;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
 
@@ -19,8 +21,19 @@ public interface BcHonorShowMapper extends BaseMapper<BcHonorShow> {
             "  and title like concat('%', #{title}, '%') " +
             " </if> " +
 
-            " order by create_time desc " +
+            " order by if_top desc,create_time desc " +
             "</script>")
     List<BcHonorShow> queryList(BcHonorShow params);
 
+    // 置顶
+    @Update("<script>" +
+            "update bc_honor_show " +
+            "set if_top = #{ifTop} " +
+            "where 1 = 1 " +
+            "  <if test = \"id != null \"> " +
+            "    AND id = #{id}  " +
+            "  </if>"  +
+            "</script>")
+    void setTop(@Param("id") Long id, @Param("ifTop") Integer ifTop);
+
 }
diff --git a/src/main/java/com/org/web/honor/service/BcHonorShowService.java b/src/main/java/com/org/web/honor/service/BcHonorShowService.java
index 94e197b..355b2b2 100644
--- a/src/main/java/com/org/web/honor/service/BcHonorShowService.java
+++ b/src/main/java/com/org/web/honor/service/BcHonorShowService.java
@@ -57,5 +57,24 @@ public class BcHonorShowService extends ServiceImpl<BcHonorShowMapper, BcHonorSh
     public List<BcHonorShow> listShow(BcHonorShow params) {
         return baseMapper.queryList(params);
     }
+
+    /**
+     * 置顶操作
+     */
+    public void setTop(Long id) {
+        log.info("BcHonorShowService - setTop id:{}", id);
+
+        BcHonorShow bcHonorShow = getById(id);
+        if (ObjectUtil.isEmpty(bcHonorShow)) {
+            throw new CustomException("数据不存在");
+        }
+
+        // 取消 其他数据的 置顶状态
+        baseMapper.setTop(null, 0);
+
+        // 设置当前数据 为置顶
+        baseMapper.setTop(id, 1);
+
+    }
     
 }