From 7b99cd8c2bf7cb4429a2b4ded6eae277b1c02cb5 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Fri, 20 Dec 2024 14:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basic/controller/BmMessageController.java | 19 ++++++++++++++++---
 .../basic/service/IBmMessageService.java      |  2 ++
 .../service/impl/BmMessageServiceImpl.java    | 15 ++++++++++++---
 3 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmMessageController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmMessageController.java
index a41dbf5..d659962 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmMessageController.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/controller/BmMessageController.java
@@ -41,10 +41,23 @@ public class BmMessageController extends BaseController {
     @ApiOperation(value = "查询消息列表")
     @RequiresPermissions("basic:message:list")
     @GetMapping("/list")
-    public TableDataInfo list(BmMessage bmMessage) {
-        startPage();
+    public AjaxResult list(BmMessage bmMessage) {
+        //TODO get from cache
+
+        //TODO if no content from cache, then read from db?
         List<BmMessage> list = bmMessageService.selectBmMessageList(bmMessage);
-        return getDataTable(list);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 查询消息列表
+     */
+    @ApiOperation(value = "查询消息列表")
+    @RequiresPermissions("basic:message:list")
+    @GetMapping("/listFromDB")
+    public AjaxResult listFromDB(BmMessage bmMessage) {
+        List<BmMessage> list = bmMessageService.selectBmMessageList(bmMessage);
+        return AjaxResult.success(list);
     }
 
     /**
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/IBmMessageService.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/IBmMessageService.java
index f4c8268..c55dce3 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/IBmMessageService.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/IBmMessageService.java
@@ -26,6 +26,8 @@ public interface IBmMessageService {
      */
     public List<BmMessage> selectBmMessageList(BmMessage bmMessage);
 
+    public List<BmMessage> selectBmMessageListFromCache(BmMessage bmMessage);
+
     /**
      * 新增【请填写功能名称】
      * 
diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java
index 07f7cfb..e824168 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/BmMessageServiceImpl.java
@@ -4,9 +4,11 @@ import java.util.List;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.bonus.common.biz.constant.MaterialConstants;
 import com.bonus.common.core.constant.CacheConstants;
 import com.bonus.common.core.exception.ServiceException;
+import com.bonus.common.core.text.Convert;
 import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.utils.StringUtils;
 import com.bonus.common.redis.service.RedisService;
@@ -58,6 +60,12 @@ public class BmMessageServiceImpl implements IBmMessageService {
         return bmMessageMapper.selectBmMessageList(bmMessage);
     }
 
+    @Override
+    public List<BmMessage> selectBmMessageListFromCache(BmMessage bmMessage) {
+        List<BmMessage> bmMessages = redisService.getCacheList(MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_CODE);
+        return bmMessages;
+    }
+
     /**
      * 新增【请填写功能名称】
      * 
@@ -68,9 +76,10 @@ public class BmMessageServiceImpl implements IBmMessageService {
     public int insertBmMessage(BmMessage bmMessage) {
         bmMessage.setCreateTime(DateUtils.getNowDate());
         try {
-            String uuid = String.valueOf(UUID.randomUUID());
-            String verifyKey = MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_CODE + StringUtils.nvl(uuid + "_" + bmMessage.getMessageTopic(), "");
-            redisService.setCacheObject(verifyKey, uuid, verificationCodeConfig.getTime(), TimeUnit.MINUTES);
+            bmMessage.setUuid(String.valueOf(UUID.randomUUID()));
+            String msgKey = MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_CODE;
+            String msgContent = JSONObject.toJSONString(bmMessage);
+            redisService.setCacheObject(msgKey, msgContent, verificationCodeConfig.getTime(), TimeUnit.MINUTES);
             return bmMessageMapper.insertBmMessage(bmMessage);
         } catch (Exception e) {
             throw new ServiceException("错误信息描述");