From 64f7ccb9ef8b5a0618e65cddc14b981c1f108ba3 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 04 十一月 2024 09:01:59 +0800
Subject: [PATCH] 代码提交

---
 xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HotWordsController.java |   26 +++++++++++++++++---------
 1 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HotWordsController.java b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HotWordsController.java
index 7a8ba07..443642c 100644
--- a/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HotWordsController.java
+++ b/xinquan-modules/xinquan-system/src/main/java/com/xinquan/system/controller/HotWordsController.java
@@ -5,13 +5,16 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.xinquan.common.core.domain.R;
 import com.xinquan.common.core.utils.page.PageDTO;
+import com.xinquan.common.security.service.TokenService;
 import com.xinquan.common.security.utils.SecurityUtils;
+import com.xinquan.system.api.model.LoginUser;
 import com.xinquan.system.domain.CommonQuestion;
 import com.xinquan.system.domain.HotWords;
 import com.xinquan.system.service.HotWordsService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -29,20 +32,25 @@
 public class HotWordsController {
     @Resource
     private HotWordsService hotWordsService;
-    @PostMapping("/list")
+    @Autowired
+    private TokenService tokenService;
+    @GetMapping("/list")
     @ApiOperation(value = "热词管理-列表查询", tags = {"运营中心"})
     @ApiImplicitParams({
             @ApiImplicitParam(value = "分页参数,当前页码", name = "pageCurr", required = true, dataType = "Integer"),
             @ApiImplicitParam(value = "分页参数,每页数量", name = "pageSize", required = true, dataType = "Integer")
     })
     public R<PageDTO<HotWords>> list(
-            @RequestParam(value = "pageCurr", defaultValue = "1") Integer pageCurr,
-            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
-        Long userId = SecurityUtils.getUserId();
-        if (userId == 0)return R.tokenError("登录失效");
+            Integer pageCurr,
+             Integer pageSize) {
+        LoginUser loginUser = tokenService.getLoginUser();
+        if (loginUser==null){
+            return R.tokenError("登录失效");
+        }
+        Page<HotWords> page1 = new Page<>(pageCurr, pageSize);
         Page<HotWords> page = hotWordsService.lambdaQuery()
                 .orderByDesc(HotWords::getSortNum)
-                .page(new Page<>(pageCurr, pageSize));
+                .page(page1);
         if (page.getRecords().isEmpty()){
             return R.ok(PageDTO.empty(page));
         }
@@ -71,13 +79,13 @@
         hotWordsService.update(hotWordsLambdaUpdateWrapper);
         return R.ok();
     }
-    @DeleteMapping("/add")
+    @PostMapping("/delete")
     @ApiOperation(value = "热词管理-删除热词", tags = {"管理后台-运营中心"})
     public R add(String id) {
-        hotWordsService.removeById(id);
+        hotWordsService.removeById(Long.valueOf(id));
         return R.ok();
     }
-    @DeleteMapping("/queryAddCount")
+    @GetMapping("/queryAddCount")
     @ApiOperation(value = "热词管理-查询还可以上传多少个热词", tags = {"管理后台-运营中心"})
     public R queryAddCount() {
         int i = 20 - hotWordsService.lambdaQuery().list().size();

--
Gitblit v1.7.1