feat: support mgs type

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/entity/PushChatMessage.java

@@ -39,6 +39,9 @@ public class PushChatMessage extends CommonEntity {
     @ApiModelProperty("消息类型")
     private String type;
 
+    @ApiModelProperty("推送消息类型")
+    private String pushType;
+
     @ApiModelProperty("审核状态")
     private Integer status;
 

kicc-platform/kicc-platform-api/kicc-common-api/src/main/java/com/cloud/kicc/commonbiz/api/enums/MessageTypeEnum.java

@@ -0,0 +1,36 @@
+package com.cloud.kicc.commonbiz.api.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ *<p>
+ * 消息类型
+ *</p>
+ *
+ * @Author: wangxiang4
+ * @Since: 2024/1/3
+ */
+@Getter
+@RequiredArgsConstructor
+public enum MessageTypeEnum {
+
+
+    SYSTEM("0","系统"),
+
+    ENTERPRISE_NOTIFICATION("1","第三方通知"),
+
+    COMMON("2","普通");
+
+
+    /**
+     * 值
+     */
+    private final String value;
+
+    /**
+     * 描述
+     */
+    private final String description;
+
+}

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java

@@ -13,6 +13,7 @@ import com.cloud.kicc.common.core.exception.CheckedException;
 import com.cloud.kicc.common.data.entity.KiccUser;
 import com.cloud.kicc.common.security.util.SecurityUtils;
 import com.cloud.kicc.commonbiz.api.entity.*;
+import com.cloud.kicc.commonbiz.api.enums.MessageTypeEnum;
 import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum;
 import com.cloud.kicc.commonbiz.api.vo.ConcernFanEnhancedVO;
 import com.cloud.kicc.commonbiz.mapper.PushApplicationMapper;
@@ -131,7 +132,8 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
                         .orElse(new PushRingtone()).getRingtone());
             }
 
-            pushChatMessage.setType("customizedcast");
+            pushChatMessage.setType(MessageTypeEnum.ENTERPRISE_NOTIFICATION.getValue());
+            pushChatMessage.setPushType("customizedcast");
             pushChatMessage.setDisplayType("notification");
             pushChatMessage.setAliasType(PushClientUtil.uPushUserAliasType);
             pushChatMessage.setAlias(alias);
@@ -143,10 +145,11 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
             custom.put("playSound", BooleanUtil.toBoolean(pushChatMessage.getPlaySound()));
             custom.put("playVibrate", BooleanUtil.toBoolean(pushChatMessage.getPlayVibrate()));
             custom.put("playLights", BooleanUtil.toBoolean(pushChatMessage.getPlayLights()));
+            custom.put("type", pushChatMessage.getType());
             pushChatMessage.setCustom(custom.toString());
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("production_mode", PushClientUtil.PRODUCTION_MODE);
-            jsonObject.put("type", pushChatMessage.getType());
+            jsonObject.put("type", pushChatMessage.getPushType());
             jsonObject.put("description", pushChatMessage.getRemarks());
             jsonObject.put("alias_type", pushChatMessage.getAliasType());
             jsonObject.put("alias", pushChatMessage.getAlias());

kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java

@@ -10,6 +10,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.cloud.kicc.common.core.exception.CheckedException;
 import com.cloud.kicc.commonbiz.api.entity.*;
+import com.cloud.kicc.commonbiz.api.enums.MessageTypeEnum;
 import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum;
 import com.cloud.kicc.commonbiz.mapper.PushConcernFanMapper;
 import com.cloud.kicc.commonbiz.service.*;
@@ -124,7 +125,8 @@ public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper,
                         .orElse(new PushRingtone()).getRingtone());
             }
 
-            pushChatMessage.setType("customizedcast");
+            pushChatMessage.setType(MessageTypeEnum.COMMON.getValue());
+            pushChatMessage.setPushType("customizedcast");
             pushChatMessage.setDisplayType("notification");
             pushChatMessage.setAliasType(PushClientUtil.uPushUserAliasType);
             pushChatMessage.setAlias(alias);
@@ -136,10 +138,11 @@ public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper,
             custom.put("playSound", BooleanUtil.toBoolean(pushChatMessage.getPlaySound()));
             custom.put("playVibrate", BooleanUtil.toBoolean(pushChatMessage.getPlayVibrate()));
             custom.put("playLights", BooleanUtil.toBoolean(pushChatMessage.getPlayLights()));
+            custom.put("type", pushChatMessage.getType());
             pushChatMessage.setCustom(custom.toString());
             JSONObject jsonObject = new JSONObject();
             jsonObject.put("production_mode", PushClientUtil.PRODUCTION_MODE);
-            jsonObject.put("type", pushChatMessage.getType());
+            jsonObject.put("type", pushChatMessage.getPushType());
             jsonObject.put("description", pushChatMessage.getRemarks());
             jsonObject.put("alias_type", pushChatMessage.getAliasType());
             jsonObject.put("alias", pushChatMessage.getAlias());