|
|
@@ -105,7 +105,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
query.setAppKey(EAppKey.GYM);
|
|
|
query.setSendMode(getMessageSendMode(queryInfo.getType()));
|
|
|
query.setTitle(queryInfo.getTitle());
|
|
|
- query.setClientId(getClientType(queryInfo.getJpushType()));
|
|
|
+ query.setClientType(getClientType(queryInfo.getJpushType()));
|
|
|
query.setReadStatus(queryInfo.getReadStatus() == null?null:queryInfo.getReadStatus()==1);
|
|
|
return messageFeignClientService.sysMessagePage(query);
|
|
|
}
|
|
|
@@ -154,6 +154,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
messageParam.setUserId(user.getUserId().longValue());
|
|
|
messageParam.setAppKey(EAppKey.GYM);
|
|
|
messageParam.setClientType(EClientType.BACKEND);
|
|
|
+ messageParam.setClientId(messageParam.getClientType());
|
|
|
messageParam.setType(messageType.getCode());
|
|
|
Map<Long, String> params = new HashMap<>(1);
|
|
|
params.put(user.getUserId().longValue(), user.getPhone());
|
|
|
@@ -452,6 +453,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
messageParam.setUserId(user.getUserId().longValue());
|
|
|
messageParam.setAppKey(EAppKey.GYM);
|
|
|
messageParam.setClientType(getClientType(jpushType));
|
|
|
+ messageParam.setClientId(messageParam.getClientType());
|
|
|
messageParam.setType(type.getCode());
|
|
|
messageParam.setUrl(url);
|
|
|
Map<Long, String> params = new HashMap<>();
|
|
|
@@ -523,6 +525,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
|
|
|
messageParam.setUserId(user.getUserId().longValue());
|
|
|
messageParam.setAppKey(EAppKey.GYM);
|
|
|
messageParam.setClientType(EClientType.STUDENT);
|
|
|
+ messageParam.setClientId(messageParam.getClientType());
|
|
|
messageParam.setType(type.getCode());
|
|
|
messageParam.setUrl(url);
|
|
|
Map<Long, String> params = new HashMap<>();
|
