Merge remote-tracking branch 'origin/test'

张志伟
2 parents 1cfff285 c85971ed
Showing 3 changed files with 12 additions and 5 deletions
fw-hermes-sdk/src/main/java/cn/fw/hermes/sdk/api/para/MsgParamCondition.java
fw-hermes-server/src/main/java/cn/fw/hermes/task/SendMessageTask.java
fw-hermes-service/src/main/java/cn/fw/hermes/service/biz/MessageBizService.java
 package cn.fw.hermes.sdk.api.para;
+import lombok.Data;
+import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
-import lombok.Data;
-import org.springframework.util.CollectionUtils;
 /**
  * @author 张志伟
@@ -64,7 +64,7 @@ public class MsgParamCondition {
     /**
      * 消息接收人是否为业务人员
      */
-    private Boolean isStaff;
+    private Boolean isStaff = true;
     /**
      * 消息唯一ID
@@ -216,6 +216,7 @@ public class MsgParamCondition {
         title = title == null ? "" : title;
         customContent.setData(title);
         customContent.setDesc(desc);
+        customContent.setExt(ext);
         lifeTime = lifeTime == null ? 604800 : lifeTime;
         if (lifeTime / 604800 > 0) {
             lifeTime = 604800;
@@ -237,6 +238,7 @@ public class MsgParamCondition {
         return builder;
     }
+
     public static Builder newBuilder() {
         return new Builder();
     }
@@ -254,6 +256,7 @@ public class MsgParamCondition {
         private Integer msgLifeTime;
         private Long userId;
         private BusinessType businessType;
+        private Boolean isStaff;
         public Builder setMsgType(MsgTypeEnum msgType) {
@@ -316,6 +319,10 @@ public class MsgParamCondition {
             return this;
         }
+        public Builder setIsStaff(Boolean isStaff) {
+            this.isStaff = isStaff;
+            return this;
+        }
         public MsgParamCondition build() {
             if (CollectionUtils.isEmpty(contentList)) {
                 unitMsg = false;
@@ -106,8 +106,7 @@ public class SendMessageTask {
         if (!StringUtils.isEmpty(sysMsgStr)) {
             SysMsg sysMsg = JSON.parseObject(sysMsgStr, SysMsg.class);
             if (sysMsg.getRetriesNum() < 3) {
-                log.info("{}  失败 进行第 {} 次重试,messageId[{}]", msg, sysMsg.getRetriesNum() + 1,
-                        sysMsg.getMessageId());
+                log.info("{}  失败 进行第 {} 次重试,messageId[{}]", msg, sysMsg.getRetriesNum() + 1, sysMsg.getMessageId());
                 sysMsg.setRetriesNum(sysMsg.getRetriesNum() + 1);
                 messageBizService.saveMsg(sysMsg);
             } else {
@@ -172,6 +172,7 @@ public class MessageBizService {
         BV.isTrue(msgBodyDto.getMsgBody() != null, "消息内容不合法");
         //如果消息是自定义消息，则检查对应的消息业务类型是否存在
         if (msgBodyDto.getMsgTypeEnum().getCode().equals(MsgTypeEnum.CUSTOM.getCode())) {
+            BV.notNull(msgPara.getCustomContent().getExt(),"扩展字段参数不能为空");
             this.checkExt(msgPara);
         }
         //获取发送方用户识别码