fix: 加入铃声参数

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

@@ -59,6 +59,7 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
     private final IPushChatMessageService iPushChatMessageService;
     private final IPushConcernFanTypeService iPushConcernFanTypeService;
     private final IPushEnterpriseService iPushEnterpriseService;
+    private final IPushRingtoneService iPushRingtoneService;
 
     @Override
     public void enterpriseMessageSend(PushChatMessage pushChatMessage) {
@@ -121,7 +122,8 @@ public class PushApplicationServiceImpl extends ServiceImpl<PushApplicationMappe
                 pushChatMessage.setPlayVibrate(pushConcernFanType.getPlayVibrate());
                 pushChatMessage.setPlayToText(pushConcernFanType.getPlayToText());
                 pushChatMessage.setSound(pushConcernFanType.getOfflineRingtone());
-                pushChatMessage.setOnlineRingtone(pushConcernFanType.getOnlineRingtone());
+                pushChatMessage.setOnlineRingtone(Optional.ofNullable(iPushRingtoneService.getById(pushConcernFanType.getOnlineRingtone()))
+                        .orElse(null).getRingtone());
             }
 
             pushChatMessage.setType("customizedcast");

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

@@ -15,10 +15,7 @@ import com.cloud.kicc.commonbiz.api.entity.PushConcernFan;
 import com.cloud.kicc.commonbiz.api.entity.PushConcernFanType;
 import com.cloud.kicc.commonbiz.api.enums.PushAuditStatusEnum;
 import com.cloud.kicc.commonbiz.mapper.PushConcernFanMapper;
-import com.cloud.kicc.commonbiz.service.IPushBlacklistService;
-import com.cloud.kicc.commonbiz.service.IPushChatMessageService;
-import com.cloud.kicc.commonbiz.service.IPushConcernFanService;
-import com.cloud.kicc.commonbiz.service.IPushConcernFanTypeService;
+import com.cloud.kicc.commonbiz.service.*;
 import com.cloud.kicc.commonbiz.util.PushClientUtil;
 import lombok.RequiredArgsConstructor;
 import okhttp3.OkHttpClient;
@@ -48,6 +45,7 @@ public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper,
     private final IPushBlacklistService iPushBlacklistService;
     private final IPushChatMessageService iPushChatMessageService;
     private final IPushConcernFanTypeService iPushConcernFanTypeService;
+    private final IPushRingtoneService iPushRingtoneService;
 
     @Override
     public IPage<Map<String, Object>> selectPushConcernFanList(IPage<Map<String, Object>> page, Map<String, Object> map) {
@@ -131,7 +129,8 @@ public class PushConcernFanServiceImpl extends ServiceImpl<PushConcernFanMapper,
                 pushChatMessage.setPlayVibrate(pushConcernFanType.getPlayVibrate());
                 pushChatMessage.setPlayToText(pushConcernFanType.getPlayToText());
                 pushChatMessage.setSound(pushConcernFanType.getOfflineRingtone());
-                pushChatMessage.setOnlineRingtone(pushConcernFanType.getOnlineRingtone());
+                pushChatMessage.setOnlineRingtone(Optional.ofNullable(iPushRingtoneService.getById(pushConcernFanType.getOnlineRingtone()))
+                        .orElse(null).getRingtone());
             }
 
             pushChatMessage.setType("customizedcast");