wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1138' into pre

Browse Source
This commit is contained in:
金海洋 2023-10-13 18:55:05 +08:00
commit 26cd240052
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/IYouMengMessageServiceImpl.java
View File

@ -39,9 +39,9 @@ public class IYouMengMessageServiceImpl implements IYouMengMessageService {
msg.setMsgId(extraData.getLong("msgId"));
msg.setType(extraData.getInteger("type"));
try {
upushService.sendAndroidCustomizedcast(msg, msgFromClient);
upushService.sendAndroidCustomizedcast(msg, msgFromClient, extraData);
msg.setRouter(extraData.getString("ir"));
upushService.sendIOSCustomizedcast(msg, msgFromClient);
upushService.sendIOSCustomizedcast(msg, msgFromClient, extraData);
} catch (Exception e) {
log.error("推送消息发送失败:{}", e.getMessage());
}

5
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java
View File

@ -309,6 +309,7 @@ public class MessageRecordServiceImpl implements MessageRecordService {
}
});
}
extra.put("terminalId", message.getTerminalId());
extra.put("msgId", message.getId());
extra.put("p", message.getRouterParams());
extra.put("t", message.getTitle());
@ -485,8 +486,8 @@ public class MessageRecordServiceImpl implements MessageRecordService {
);
calcCount(constructionList, res);
List<MsgStatisticsDTO> tradeList = messageRecordDao.statisticsMsg4Trade(personId);
calcCount(tradeList, res);
// List<MsgStatisticsDTO> tradeList = messageRecordDao.statisticsMsg4Trade(personId);
// calcCount(tradeList, res);
return res;
}

6
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/umeng/UpushService.java
View File

@ -163,7 +163,7 @@ public class UpushService {
client.send(groupcast);
}
public void sendAndroidCustomizedcast(Message message, MsgBody4Guest msgFromClient)
public void sendAndroidCustomizedcast(Message message, MsgBody4Guest msgFromClient, com.alibaba.fastjson.JSONObject extraData)
throws Exception {
AndroidCustomizedcast customizedcast;
@ -214,6 +214,7 @@ public class UpushService {
customizedcast.setExtraField("fromGrade", message.getFromGrade());
customizedcast.setExtraField("router", message.getRouter());
customizedcast.setExtraField("msgId", String.valueOf(message.getMsgId()));
customizedcast.setExtraField("terminalId", extraData.getString("terminalId"));
String audio = message.getAudio();
if (audio != null) {
customizedcast.setExtraField("audio", message.getAudio());
@ -227,7 +228,7 @@ public class UpushService {
}
public void sendIOSCustomizedcast(Message message, MsgBody4Guest msgFromClient)
public void sendIOSCustomizedcast(Message message, MsgBody4Guest msgFromClient, com.alibaba.fastjson.JSONObject extraData)
throws Exception {
IOSCustomizedcast customizedcast;
if (Objects.nonNull(msgFromClient.getAppClient()) && "cmp".equals(msgFromClient.getAppClient())) {
@ -272,6 +273,7 @@ public class UpushService {
.setCustomizedField("conversationId", String.valueOf(message.getConversationId()));
customizedcast.setCustomizedField("params", message.getParams());
customizedcast.setCustomizedField("msgId", String.valueOf(message.getMsgId()));
customizedcast.setCustomizedField("terminalId", extraData.getString("terminalId"));
// TODO Set your alias and alias_type here, and use comma to split them if there are multiple alias.
// And if you have many alias, you can also upload a file containing these alias, then
// use file_id to send customized notification.

4
msg-center-api/src/main/java/cn/axzo/msg/center/api/response/PendingMessageBriefRes.java
View File

@ -47,6 +47,10 @@ public class PendingMessageBriefRes implements Serializable {
* 消息关联的终端名称：企业名/项目名
*/
private String terminalName;
/**
* 消息所属标识Id 用于跳转
*/
private Long terminalId;
/**
* 消息时间戳
*/

6
msg-center-dal/src/main/resources/mapper/MessageRecordMapper.xml
View File

@ -55,9 +55,9 @@
and record.is_delete = 0
and (
(record.to_id = #{identityId} and record.receive_type = #{receiveType})
<if test="personId != null">
or (record.to_id = 0 and record.receive_type = 9 and record.person_id = #{personId} )
</if>
<!-- <if test="personId != null">-->
<!-- or (record.to_id = 0 and record.receive_type = 9 and record.person_id = #{personId} )-->
<!-- </if>-->
)
<if test="states != null and states.size > 0">
and record.state in