feature(*): 对接新版模板消息

- 对接新版模板消息

feature(*): 对接新版模板消息
- 对接新版模板消息
张志伟
1 parent 04d4da77
Showing 9 changed files with 58 additions and 37 deletions
fw-hestia-domain/src/main/java/cn/fw/hestia/domain/db/MessageHistory.java
fw-hestia-rpc/src/main/java/cn/fw/hestia/rpc/passport/TemplateMessageService.java
fw-hestia-rpc/src/main/java/cn/fw/hestia/rpc/passport/dto/TMParam.java
fw-hestia-sdk/src/main/java/cn/fw/hestia/sdk/params/TemplateMessageParam.java
fw-hestia-server/src/main/java/cn/fw/hestia/server/Application.java
fw-hestia-server/src/main/java/cn/fw/hestia/server/controller/common/CommonController.java
fw-hestia-server/src/main/resources/application.yml
fw-hestia-service/src/main/java/cn/fw/hestia/component/SettingProperty.java
fw-hestia-service/src/main/java/cn/fw/hestia/service/buz/MessageCenterBizService.java
@@ -28,6 +28,7 @@ public class MessageHistory extends Model&lt;MessageHistory&gt; {
     private Long memberId;
     /**
      * 模板code
+     * 新版对应模板id
      */
     private String templateCode;
     /**
@@ -40,11 +40,7 @@ public class TemplateMessageService {
         try {
             WxMpTempMessageParam param = new WxMpTempMessageParam();
             param.setCusId(messageParam.getMemberId());
-            param.setTempCode(messageParam.getTemplateCode());
-            WxMpTempMessageData remark = new WxMpTempMessageData();
-            remark.setValue(messageParam.getRemark());
-            param.setRemark(remark);
-            param.setTitle(new WxMpTempMessageData(messageParam.getTitle()));
+            param.setTempId(messageParam.getTemplateCode());
             if (StringUtils.isValid(messageParam.getKeywords())) {
                 List<WxMpTempMessageData> keywords = JSONArray.parseArray(messageParam.getKeywords(), WxMpTempMessageData.class);
                 param.setKeyWordList(keywords);
@@ -42,6 +42,9 @@ public class TMParam {
  
  
     private Long sceneToken;
-
+    /**
+     * 模板code
+     * 新版对应模板id
+     */
     private String templateCode;
 }
@@ -41,6 +41,10 @@ public class TemplateMessageParam {
     @NotBlank(message = "消息内容不能为空")
     private String content;
     /**
+     * 门店名称
+     */
+    private String shopName;
+    /**
      * 额外展示内容
      */
     @Size(max = 5, message = "最多展示5条额外信息")
 package cn.fw.hestia.server;
  
+import cn.fw.hestia.component.SettingProperty;
 import cn.fw.security.auth.client.EnableAuthClient;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -26,6 +28,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @EnableAutoConfiguration
 @Configuration
 @EnableRedisRepositories
+@EnableConfigurationProperties({SettingProperty.class})
 @MapperScan("cn.fw.hestia.**.dao")
 @ComponentScan({"cn.fw.hestia.*"})
 @EnableFeignClients({"cn.fw.**.sdk"})
@@ -42,17 +42,9 @@ public class CommonController {
         return success(messageCenterBizService.manualSend(sceneToken));
     }
  
-    @GetMapping("/change/code")
-    @ControllerMethod("修改模板码")
-    public Message<Void> changeCode(@NotEmpty(message = "模板码不能为空") final String code) {
-        messageCenterBizService.changeRdsTemplateCode(code);
-        return success();
-    }
-
     @GetMapping("/query/code")
     @ControllerMethod("查询模板码")
     public Message<String> getCode() {
         return success(messageCenterBizService.getRdsTemplateCode());
     }
-
 }
@@ -132,4 +132,9 @@ management:
  
 task:
   switch: 'on'
-  max-size: 1000
 \ No newline at end of file
+  max-size: 1000
+
+mptemplate:
+  tempId: CH-nLDVe5bHggBTXQJJWudqn1UnaBQNDmp5GEeYXSMM
+  typeSort1: thing3
+  typeSort2: thing13
 \ No newline at end of file
+package cn.fw.hestia.component;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * 模板配置信息
+ *
+ * @author : kurisu
+ * @version : 2.0
+ * @desc : 模板配置信息
+ * @date : 2023-07-20 18:03
+ */
+@Getter
+@Setter
+@ConfigurationProperties(prefix = "mptemplate")
+public class SettingProperty {
+    private String tempId;
+    private String thing3;
+    private String thing13;
+
+    @Override
+    public String toString() {
+        return "SettingProperty{" +
+                "tempId='" + tempId + '\'' +
+                ", thing3='" + thing3 + '\'' +
+                ", thing13='" + thing13 + '\'' +
+                '}';
+    }
+}
@@ -6,6 +6,7 @@ import cn.fw.hestia.common.constant.MessageConstant;
 import cn.fw.hestia.common.utils.DateUtil;
 import cn.fw.hestia.common.utils.StringUtils;
 import cn.fw.hestia.component.SendMsgProducer;
+import cn.fw.hestia.component.SettingProperty;
 import cn.fw.hestia.domain.db.MessageHistory;
 import cn.fw.hestia.domain.db.SendLog;
 import cn.fw.hestia.domain.enums.MessageStateEnum;
@@ -28,7 +29,6 @@ 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;
@@ -59,6 +59,7 @@ public class MessageCenterBizService {
     private final TemplateMessageService templateMessageService;
     private final SendMsgProducer sendMsgProducer;
     private final StringRedisTemplate redisTemplate;
+    private final SettingProperty settingProperty;
  
     @Value("${spring.cache.custom.global-prefix}:template:code")
     @Getter
@@ -183,6 +184,7 @@ public class MessageCenterBizService {
      * @param sceneToken
      * @return
      */
+    @Transactional(rollbackFor = Exception.class)
     @Cacheable(cacheNames = "ExchangePageParam", key = "':Exchange-Page-Param:' + #sceneToken", condition = "#result != null")
     public Map<String, String> queryPageParams(Long sceneToken) {
         MessageHistory history = messageHistoryService.getById(sceneToken);
@@ -247,8 +249,7 @@ public class MessageCenterBizService {
         messageHistoryService.updateBatchById(list);
     }
  
-    @Transactional(rollbackFor = Exception.class)
-    protected void readMessage(MessageHistory history) {
+    public void readMessage(MessageHistory history) {
         if (Boolean.FALSE.equals(history.getReadz())) {
             history.setReadz(Boolean.TRUE);
             history.setState(MessageStateEnum.SUMI);
@@ -268,14 +269,8 @@ public class MessageCenterBizService {
         return result;
     }
  
-    public void changeRdsTemplateCode(String code) {
-        BoundValueOperations<String, String> boundValueOps = redisTemplate.boundValueOps(getKeyPrefix());
-        boundValueOps.set(code);
-    }
-
     public String getRdsTemplateCode() {
-        BoundValueOperations<String, String> boundValueOps = redisTemplate.boundValueOps(getKeyPrefix());
-        return boundValueOps.get();
+        return settingProperty.getTempId();
     }
  
     private String saveLog(TMParam tmParam, Long messageId, Consumer<SendLog> cons) {
@@ -302,7 +297,7 @@ public class MessageCenterBizService {
     private MessageHistory createBeans(TemplateMessageParam param) {
         MessageHistory messageHistory = new MessageHistory();
         messageHistory.setMemberId(param.getMemberId());
-        messageHistory.setTemplateCode(getTemplateCode());
+        messageHistory.setTemplateCode(settingProperty.getTempId());
         messageHistory.setTitle(param.getTitle());
         StringBuilder content = new StringBuilder(param.getContent());
         if (!CollectionUtils.isEmpty(param.getExtraMap())) {
@@ -323,8 +318,8 @@ public class MessageCenterBizService {
         messageHistory.setSendTime(new Date());
         messageHistory.setState(MessageStateEnum.MADA);
         List<WxMpTempMessageData> keywords = Arrays.asList(
-                new WxMpTempMessageData(param.getTitle()),
-                new WxMpTempMessageData("无")
+                new WxMpTempMessageData(settingProperty.getThing3(), param.getTitle()),
+                new WxMpTempMessageData(settingProperty.getThing13(), StringUtils.isEmpty(param.getShopName()) ? "无" : param.getShopName())
         );
         messageHistory.setKeywords(JSONArray.toJSONString(keywords));
         if (!CollectionUtils.isEmpty(param.getParamMap())) {
@@ -345,15 +340,6 @@ public class MessageCenterBizService {
         return tmParam;
     }
  
-    private String getTemplateCode() {
-        BoundValueOperations<String, String> operations = redisTemplate.boundValueOps(getKeyPrefix());
-        String templateCode = operations.get();
-        if (StringUtils.isEmpty(templateCode)) {
-            return "OPENTM412432053";
-        }
-        return templateCode;
-    }
-
     private String getSendDataPrefix() {
         String today = LocalDate.now().toString();
         return this.sendDataPrefix + today;