feat(*): 重构消息中心

- 重构消息中心

feat(*): 重构消息中心
- 重构消息中心
张志伟
1 parent a1a63535
Showing 3 changed files with 13 additions and 22 deletions
fw-hestia-server/src/main/java/cn/fw/hestia/server/task/SendMessageTask.kt
fw-hestia-service/src/main/java/cn/fw/hestia/component/SendMsgProducer.kt
fw-hestia-service/src/main/java/cn/fw/hestia/service/buz/MessageCenterBizService.kt
@@ -6,7 +6,6 @@ import cn.fw.hestia.domain.db.MessageHistory
 import cn.fw.hestia.domain.enums.MessageStateEnum
 import cn.fw.hestia.service.buz.MessageCenterBizService
 import cn.fw.hestia.service.data.MessageHistoryService
-import com.baomidou.mybatisplus.core.toolkit.Wrappers
 import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
@@ -14,14 +13,9 @@ import org.springframework.data.redis.core.StringRedisTemplate
 import org.springframework.scheduling.annotation.Scheduled
 import org.springframework.stereotype.Component
 import org.springframework.util.CollectionUtils
-import java.lang.Boolean
 import java.time.LocalDateTime
 import java.util.*
 import java.util.concurrent.CompletableFuture
-import kotlin.Long
-import kotlin.String
-import kotlin.also
-import kotlin.let
  
 /**
  * @author : kurisu
@@ -34,10 +28,9 @@ import kotlin.let
 class SendMessageTask(
     private val messageCenterBizService: MessageCenterBizService,
     private val messageHistoryService: MessageHistoryService,
-    private val stringRedisTemplate: StringRedisTemplate
+    private val stringRedisTemplate: StringRedisTemplate,
+    @Value("\${spring.cache.custom.global-prefix}:data:clear") private val dataClearKey: String
 ) {
-    @Value("\${spring.cache.custom.global-prefix}:data:clear")
-    private var dataClearKey: String? = null
  
     /**
      * 发送模板消息
@@ -47,7 +40,7 @@ class SendMessageTask(
         val list = messageHistoryService.list(
             KtQueryWrapper(MessageHistory::class.java)
                 .eq(MessageHistory::state, MessageStateEnum.MADA)
-                .eq(MessageHistory::yn, Boolean.TRUE)
+                .eq(MessageHistory::yn, true)
                 .lt(MessageHistory::frequency, MessageConstant.MAX_FREQUENCY)
                 .lt(MessageHistory::sendTime, Date())
                 .last("limit 1000")
@@ -65,7 +58,7 @@ class SendMessageTask(
      */
     @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 10)
     fun cacheOldData() {
-        val key: String = dataClearKey ?: "hestia:global:data:clear"
+        val key: String = dataClearKey
         val setOps = stringRedisTemplate.boundSetOps(key)
         val list = messageHistoryService.list(
             KtQueryWrapper(MessageHistory::class.java)
@@ -83,7 +76,7 @@ class SendMessageTask(
      */
     @Scheduled(initialDelay = 1000 * 10, fixedRate = 1000 * 15)
     fun clearOldData() {
-        val key: String = dataClearKey ?: "hestia:global:data:clear"
+        val key: String = dataClearKey
         val setOps = stringRedisTemplate.boundSetOps(key)
         var idStr: String?
         while ((setOps.pop().also { idStr = it }) != null) {
@@ -22,7 +22,7 @@ class SendMsgProducer(private val rocketMQTemplate: RocketMQTemplate) {
             log.info("模板消息发送成功mq: body:[{}]", messageSendMq)
             rocketMQTemplate.syncSend(MessageSendMq.TOPIC + ":*", messageSendMq)
         } catch (e: Exception) {
-            e.printStackTrace()
+            log.error("模板消息发送成功mq生成失败", e)
         }
     }
 }
 \ No newline at end of file
@@ -24,7 +24,6 @@ import com.alibaba.fastjson.JSON
 import com.alibaba.fastjson.JSONArray
 import com.baomidou.mybatisplus.core.toolkit.Wrappers
 import com.baomidou.mybatisplus.extension.kotlin.KtQueryWrapper
-import lombok.Getter
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.cache.annotation.Cacheable
 import org.springframework.data.redis.core.StringRedisTemplate
@@ -50,17 +49,16 @@ class MessageCenterBizService(
     private val sendLogService: SendLogService,
     private val sendMsgProducer: SendMsgProducer,
     private val redisTemplate: StringRedisTemplate,
-    private val settingProperty: SettingProperty
+    private val settingProperty: SettingProperty,
+    @Value("\${spring.cache.custom.global-prefix}:template:code") private val keyPrefix: String,
+    @Value("\${spring.cache.custom.global-prefix}:template:send:scene:")
+    private val prefix: String
 ) {
-    @Value("\${spring.cache.custom.global-prefix}:template:code")
-    @Getter
-    private val keyPrefix: String? = null
  
-    @Value("\${spring.cache.custom.global-prefix}:template:send:scene:")
-    private val sendDataPrefix: String? = null
+    private val sendDataPrefix: String
         get() {
             val today = LocalDate.now().toString()
-            return field + today
+            return prefix + today
         }
  
     /**
@@ -101,7 +99,7 @@ class MessageCenterBizService(
      */
     @Transactional(rollbackFor = [Exception::class])
     fun sendMessage(history: MessageHistory) {
-        val key = sendDataPrefix ?: return
+        val key = sendDataPrefix
         val setOps = redisTemplate.boundSetOps(key)
         val seanceToken = history.id.toString()
         if (java.lang.Boolean.TRUE == setOps.isMember(seanceToken)) {