kanglai
/
kicc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix: 加入铃声参数

master
wangxiang 2 years ago
parent
7b77fcffd8
commit
88dec86f1b
2 changed files with 7 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushApplicationServiceImpl.java
  2. 9
      kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/service/impl/PushConcernFanServiceImpl.java

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

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

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

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

Write Preview
Loading…
Cancel
Save