添加商户端-订单聊天室的从库查询和redis缓存的修改

src/main/java/com/sqx/modules/gameChat/service/impl/ChatContentTcwmServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.sqx.common.utils.PageUtils;
 import com.sqx.common.utils.Result;
+import com.sqx.datasource.annotation.DataSource;
 import com.sqx.modules.gameChat.dao.ChatContentTcwmDao;
 import com.sqx.modules.gameChat.entity.ChatContentTcwm;
 import com.sqx.modules.gameChat.service.ChatContentTcwmService;
@@ -34,6 +35,7 @@ public class ChatContentTcwmServiceImpl extends ServiceImpl<ChatContentTcwmDao,
     }
 
     @Override
+    @DataSource("dynamic")
     public Result selectOrdersChatPage(Integer page, Integer limit, Long userId, Long riderId, Long shopId) {
         Page<ChatContentTcwm> pages = new Page(page, limit);
         IPage<ChatContentTcwm> chatContentTcwmIPage = chatContentTcwmDao.selectOrdersChatPage(pages, userId, riderId, shopId);
@@ -56,6 +58,7 @@ public class ChatContentTcwmServiceImpl extends ServiceImpl<ChatContentTcwmDao,
     }
 
     @Override
+    @DataSource("dynamic")
     public Result selectOrdersChatList(Integer page, Integer limit, String userName) {
         Page<ChatContentTcwm> pages = new Page(page, limit);
         IPage<ChatContentTcwm> chatContentTcwmIPage = chatContentTcwmDao.selectOrdersChatList(pages,userName);
@@ -73,6 +76,7 @@ public class ChatContentTcwmServiceImpl extends ServiceImpl<ChatContentTcwmDao,
     }
 
     @Override
+    @DataSource("dynamic")
     public Result selectGameChatList(Integer page, Integer limit,String userName,String content,Long ordersId){
         Page<ChatContentTcwm> pages = new Page<>(page, limit);
         IPage<ChatContentTcwm> chatContentTcwmIPage = chatContentTcwmDao.selectGameChatList(pages, userName,content,ordersId);
@@ -81,12 +85,14 @@ public class ChatContentTcwmServiceImpl extends ServiceImpl<ChatContentTcwmDao,
     }
 
     @Override
+    @DataSource("dynamic")
     public Result selectUnreadMessage(Long ordersId, Integer type) {
         int i = chatContentTcwmDao.selectUnreadMessage(ordersId, type);
         return Result.success().put("data", i);
     }
 
     @Override
+    @DataSource("dynamic")
     public Result selectAllUnreadCount(Long userId, Long riderUserId, Long shopId) {
         int i = chatContentTcwmDao.selectAllUnreadCount(userId, riderUserId, shopId);
         return Result.success().put("data", i);

src/main/java/com/sqx/modules/goods/service/impl/GoodsServiceImpl.java

@@ -518,13 +518,14 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsDao, Goods> implements Go
         }
 
         // 构建缓存键
-//        String cacheKey = buildShopCacheKey(queryDTO, lat, lng);
+        String cacheKey = buildShopCacheKey(queryDTO, lat, lng);
 
         // 尝试从缓存获取数据
-//        PageUtils cachedResult = (PageUtils) redisUtils.get(cacheKey);
-//        if (cachedResult != null) {
-//            return Result.success().put("data", cachedResult);
-//        }
+        IPage<GoodsShop> cachedResult = (IPage<GoodsShop>) redisUtils.get(cacheKey);
+        if (cachedResult != null) {
+            PageUtils pageUtils = new PageUtils(cachedResult);
+            return Result.success().put("data", pageUtils);
+        }
 
         Page<GoodsShop> pages = new Page<>(queryDTO.getPage(), queryDTO.getLimit());
 
@@ -572,10 +573,10 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsDao, Goods> implements Go
             }
         }
 
-        PageUtils pageUtils = new PageUtils(goodsShopIPage);
-
         // 存入缓存，过期时间为1分钟（60秒）
-//        redisUtils.set(cacheKey, pageUtils, 60);
+        redisUtils.set(cacheKey, goodsShopIPage, 60);
+
+        PageUtils pageUtils = new PageUtils(goodsShopIPage);
 
         return Result.success().put("data", pageUtils);
     }