Răsfoiți Sursa

refactor: some changes

linwenhua 3 ani în urmă
părinte
comite
b950cc19e5

+ 2 - 0
smsb-customer-manager-adapter/src/main/java/com/inspur/customer/web/controller/InformTestController.java

@@ -3,6 +3,7 @@ package com.inspur.customer.web.controller;
 import com.inspur.customer.client.inform.CommonInformService;
 import com.inspur.customer.context.inform.InformTypeEnum;
 import com.inspur.customer.object.inform.CommonInformCO;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -12,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
  * @author linwenhua
  * @date 2022-07-04 14:37
  **/
+@Slf4j
 @RestController
 public class InformTestController {
 

+ 1 - 1
smsb-customer-manager-app/src/main/java/com/inspur/customer/service/inform/handler/NoteMessageHandler.java

@@ -2,7 +2,7 @@ package com.inspur.customer.service.inform.handler;
 
 import com.inspur.customer.object.inform.CommonMessageCO;
 import com.inspur.inform.object.message.SmsMessage;
-import com.inspur.inform.object.message.sms.SmsbSmsTemplateType;
+import com.inspur.inform.constants.SmsbSmsTemplateType;
 import org.springframework.stereotype.Component;
 
 import java.util.List;

+ 6 - 2
smsb-customer-manager-app/src/main/java/com/inspur/customer/service/inform/handler/WeChatAppletMessageHandler.java

@@ -5,6 +5,7 @@ import com.inspur.inform.client.wechat.applet.IWxAppletUserMessageService;
 import com.inspur.inform.constants.UserMsgType;
 import com.inspur.inform.constants.applet.WxAppletMessageTemplate;
 import com.inspur.inform.object.applet.message.WxAppletUserMessageDto;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.stereotype.Component;
 
@@ -15,15 +16,18 @@ import java.util.Iterator;
  * @author linwenhua
  * @date 2022-07-01 10:58
  **/
+@Slf4j
 @Component
 public class WeChatAppletMessageHandler extends AbstractMessageHandler {
 
-    @DubboReference
+    @DubboReference(timeout = 10000, retries = 0)
     private IWxAppletUserMessageService wxAppletUserMessageService;
 
     public WxAppletUserMessageDto makeWeChatAppletMessage(CommonMessageCO commonMessageCo, String fileName) {
         // get content
-        String content = wxAppletUserMessageService.getTemplate(WxAppletMessageTemplate.getTemplateByFilePath(fileName));
+        WxAppletMessageTemplate messageTemplateEnum = WxAppletMessageTemplate.getTemplateByFilePath(fileName);
+        log.info("template: {}", messageTemplateEnum);
+        String content = wxAppletUserMessageService.getTemplate(messageTemplateEnum);
         Iterator<String> integer = commonMessageCo.getMessageMap().keySet().iterator();
         String key;
         while (integer.hasNext()) {

+ 5 - 1
smsb-customer-manager-client/src/main/java/com/inspur/customer/context/inform/InformTypeEnum.java

@@ -23,7 +23,11 @@ public enum InformTypeEnum {
     /**
      * ai 审核不通过预警
      */
-    AI_MEDIA_WARN("ai 审核不通过预警", InformLevelEnum.HINT, MessageTemplateEnum.AI_AUDIT_NON_COMPLIANCE)
+    AI_MEDIA_WARN("ai 审核不通过预警", InformLevelEnum.HINT, MessageTemplateEnum.AI_AUDIT_NON_COMPLIANCE),
+    /**
+     * 设备视频回采次数库存预警
+     */
+    DEVICE_PIC_AUDIT_CREDIT_WARN("设备视频回采次数库存预警", InformLevelEnum.HINT, MessageTemplateEnum.AI_AUDIT_NON_COMPLIANCE)
     ;
 
     /**

+ 8 - 4
smsb-customer-manager-client/src/main/java/com/inspur/customer/context/inform/MessageTemplateEnum.java

@@ -12,19 +12,23 @@ public enum MessageTemplateEnum {
     /**
      * phone verify template
      */
-    PHONE_VERIFY_TEMPLATE("todo", 1, "wechat",  ""),
+    PHONE_VERIFY_TEMPLATE("todo", 7, "wechat",  ""),
     /**
      * email verify template
      */
-    EMAIL_VERIFY_TEMPLATE("todo", 1, "wechat",  ""),
+    EMAIL_VERIFY_TEMPLATE("todo", -1, "wechat",  ""),
     /**
      * AI 审核库存
      */
-    AI_AUDIT_CREDIT_INSUFFICIENT_WARN("AiAuditCreditInsufficientWarn", 1, "AiAuditCreditInsufficientWarn",  "appletMessage/AiAuditCreditInsufficientWarn.RTF"),
+    AI_AUDIT_CREDIT_INSUFFICIENT_WARN("AiAuditCreditInsufficientWarn", 5, "AiAuditCreditInsufficientWarn",  "appletMessage/AiAuditCreditInsufficientWarn.RTF"),
     /**
      * 媒资 AI 不通过异常
      */
-    AI_AUDIT_NON_COMPLIANCE("EmailVerifyTemplate", 1, "wechat",  "appletMessage/AiAuditMediaWarn.RTF"),
+    AI_AUDIT_NON_COMPLIANCE("AiAuditMediaWarn", 4, "AiAuditMediaWarn",  "appletMessage/AiAuditMediaWarn.RTF"),
+    /**
+     * 设备视频回传次数不足
+     */
+    DEVICE_PIC_AUDIT_CREDIT_WARN("DevicePicAuditCreditWarn", 6, "DevicePicAuditCreditWarn", "appletMessage/DevicePicAuditCreditWarn.RTF")
     ;
 
     @Getter