feature(*): 对数据加上缓存

- 对数据加上缓存 - 发送消息异步去操作

feature(*): 对数据加上缓存
- 对数据加上缓存 - 发送消息异步去操作
张志伟
1 parent c7e9e1ef
Showing 6 changed files with 40 additions and 11 deletions
fw-hestia-server/src/main/java/cn/fw/hestia/server/task/SendMessageTask.java
fw-hestia-server/src/main/resources/application-gray.yml
fw-hestia-server/src/main/resources/application-prd.yml
fw-hestia-server/src/main/resources/application-test.yml
fw-hestia-server/src/main/resources/application.yml
fw-hestia-service/src/main/java/cn/fw/hestia/service/buz/MessageCenterBizService.java
@@ -9,11 +9,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
  
 import static cn.fw.hestia.common.constant.MessageConstant.MAX_FREQUENCY;
  
@@ -39,8 +39,7 @@ public class SendMessageTask {
     /**
      * 发送模板消息
      */
-    @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 10)
-    @Transactional(rollbackFor = Exception.class)
+    @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 5)
     public void sendNotice() {
         List<MessageHistory> list = messageHistoryService.list(Wrappers.<MessageHistory>lambdaQuery()
                 .eq(MessageHistory::getState, MessageStateEnum.MADA)
@@ -53,7 +52,7 @@ public class SendMessageTask {
             return;
         }
         for (MessageHistory history : list) {
-            messageCenterBizService.sendMessage(history);
+            CompletableFuture.runAsync(() -> messageCenterBizService.sendMessage(history));
         }
     }
 }
@@ -8,7 +8,7 @@ spring:
           version: 1.0
         server-addr: 192.168.0.91:8848
   datasource:
-    url: jdbc:mysql://192.168.0.102:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.0.102:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
     username: root
     password: Feewee_Data2_Root123
   redis:
@@ -8,7 +8,7 @@ spring:
           version: 1.0
         server-addr: 192.168.0.91:8848
   datasource:
-    url: jdbc:mysql://192.168.0.102:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.0.102:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
     username: root
     password: Feewee_Data2_Root123
   redis:
@@ -9,7 +9,7 @@ spring:
         namespace: 0ba6d5d6-2a49-4086-b6c3-dbeec01c61a4
   datasource:
     password: mysql@pwd123
-    url: jdbc:mysql://192.168.0.9:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.0.9:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
     username: test
   redis:
     host: 192.168.0.9
@@ -7,7 +7,10 @@ spring:
     locker:
       key-prefix: 'hestia:locker'
     custom:
-      global-prefix: 'hestia'
+      global-prefix: 'hestia:global'
+      global:
+        ttl: 30000
+        key-prefix: 'hestia:spring-cache'
  
   cloud:
     nacos:
@@ -19,8 +22,9 @@ spring:
       connection-test-query: SELECT 1 FROM DUAL
       maximum-pool-size: 100
     password: mysql@pwd123
-    url: jdbc:mysql://192.168.0.234:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false
+    url: jdbc:mysql://192.168.0.234:3306/fw_hestia?characterEncoding=UTF-8&useSSL=false&rewriteBatchedStatements=true
     username: root
+
   jackson:
     default-property-inclusion: non_null
     serialization:
@@ -26,14 +26,18 @@ import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.BoundValueOperations;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
  
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
  
@@ -60,6 +64,9 @@ public class MessageCenterBizService {
     @Getter
     private String keyPrefix;
  
+    @Value("${spring.cache.custom.global-prefix}:template:send:scene:")
+    private String sendDataPrefix;
+
     /**
      * 发送
      *
@@ -98,7 +105,18 @@ public class MessageCenterBizService {
      */
     @Transactional(rollbackFor = Exception.class)
     public void sendMessage(MessageHistory history) {
-        String result = saveLog(createTmParam(history), history.getId(), r -> r.setManual(Boolean.FALSE));
+        String key = getSendDataPrefix();
+        final BoundSetOperations<String, String> setOps = redisTemplate.boundSetOps(key);
+        final String seanceToken = String.valueOf(history.getId());
+        if (Boolean.TRUE.equals(setOps.isMember(seanceToken))) {
+            return;
+        }
+        String result = saveLog(createTmParam(history), history.getId(), r -> {
+            r.setManual(Boolean.FALSE);
+            if (Boolean.TRUE.equals(r.getSucceed())) {
+                setOps.add(seanceToken);
+            }
+        });
         boolean succeed = MessageConstant.SUCCEED_STR.equals(result);
         final int frequency = history.getFrequency() + 1;
         history.setFrequency(frequency);
@@ -106,6 +124,7 @@ public class MessageCenterBizService {
             history.setState(MessageStateEnum.SUMI);
             //发送成功发送mq
             sendMsgProducer.send(new MessageSendMq(history.getId(), history.getMemberId(), new Date()));
+            redisTemplate.expire(key, 24L, TimeUnit.HOURS);
         } else {
             history.setSendTime(DateUtil.getExpired(history.getSendTime(), 1 << frequency, Calendar.MINUTE));
         }
@@ -134,6 +153,7 @@ public class MessageCenterBizService {
      * @param memberId
      * @return
      */
+    @Cacheable(cacheNames = "UnreadCount", key = "':unread-count:' + #memberId", condition = "#result != 0")
     public int unreadCount(Long memberId) {
         return messageHistoryService.count(Wrappers.<MessageHistory>lambdaQuery()
                 .eq(MessageHistory::getMemberId, memberId)
@@ -149,6 +169,7 @@ public class MessageCenterBizService {
      * @param sceneToken
      * @return
      */
+    @Cacheable(cacheNames = "ExchangePageParam", key = "':Exchange-Page-Param:' + #sceneToken", condition = "#result != null")
     public Map<String, String> queryPageParams(Long sceneToken) {
         MessageHistory history = messageHistoryService.getById(sceneToken);
         BV.notNull(history, () -> "消息不存在或者已经被撤销");
@@ -170,7 +191,7 @@ public class MessageCenterBizService {
         PageData<MessageHistory> pageData = messageHistoryService.page(new PageData<>(query), Wrappers.<MessageHistory>lambdaQuery()
                 .eq(MessageHistory::getMemberId, query.getMemberId())
                 .eq(MessageHistory::getYn, Boolean.TRUE)
-                .ge(MessageHistory::getSendTime, DateUtil.localDateTime2Date(LocalDateTime.now().minusMonths(3L)))
+                .ge(MessageHistory::getSendTime, DateUtil.localDateTime2Date(LocalDate.now().minusMonths(3L).atStartOfDay()))
                 .orderByDesc(MessageHistory::getCreateTime)
         );
         AppPage<MessageHistoryVO> page = AppPage.empty(query);
@@ -318,4 +339,9 @@ public class MessageCenterBizService {
         }
         return templateCode;
     }
+
+    private String getSendDataPrefix() {
+        String today = LocalDate.now().toString();
+        return this.sendDataPrefix + today;
+    }
 }