This commit is contained in:
@jyuhsin
2025-07-28 13:40:05 +08:00
parent 9501b015b9
commit 72546696fa
211 changed files with 24954 additions and 3665 deletions
@@ -78,17 +78,17 @@ public class SysMsgServiceImpl extends BaseServiceImpl<Sys_msg> implements SysMs
List<View_user> viewUsers = Daos.ext(dao(), fieldFilter).query(View_user.class, cnd);
List<Sys_msg_user> list = new CopyOnWriteArrayList<>();
for (View_user viewUser : viewUsers) {
Sys_msg_user sys_msg_user = new Sys_msg_user();
sys_msg_user.setId(R.UU32());
sys_msg_user.setMsgId(sysMsg.getId());
sys_msg_user.setStatus(0);
sys_msg_user.setLoginname(viewUser.getLoginname());
sys_msg_user.setUserName(viewUser.getUsername());
sys_msg_user.setUnitId(viewUser.getUnitId());
sys_msg_user.setUnitName(viewUser.getUnitName());
sys_msg_user.setUnionId(viewUser.getUnionId());
sys_msg_user.setUnionName(viewUser.getUnionName());
list.add(sys_msg_user);
Sys_msg_user sysMsgUser = new Sys_msg_user();
sysMsgUser.setId(R.UU32());
sysMsgUser.setMsgId(sysMsg.getId());
sysMsgUser.setStatus(0);
sysMsgUser.setLoginname(viewUser.getLoginname());
sysMsgUser.setUserName(viewUser.getUsername());
sysMsgUser.setUnitId(viewUser.getUnitId());
sysMsgUser.setUnitName(viewUser.getUnitName());
sysMsgUser.setUnionId(viewUser.getUnionId());
sysMsgUser.setUnionName(viewUser.getUnionName());
list.add(sysMsgUser);
}
dao().fastInsert(list);
sysMsgUserService.clearCache();
@@ -106,12 +106,13 @@ public class SysMsgServiceImpl extends BaseServiceImpl<Sys_msg> implements SysMs
// smsService.send(loginName, sysMsg.getTitle(), sysMsg.getNote());
// }
ThreadUtil.execute(() -> {
smsService.massSend(loginNames, sysMsg.getTitle(), HtmlUtil.cleanHtmlTag(StrUtil.blankToDefault(sysMsg.getNote(),"")), sysMsg.getUrl());
//smsService.massSend(loginNames, sysMsg.getTitle(), HtmlUtil.cleanHtmlTag(StrUtil.blankToDefault(sysMsg.getNote(),"")), sysMsg.getUrl());
});
return sysMsg;
}
@Override
@Aop(TransAop.READ_COMMITTED)
public void deleteMsg(String id) {
this.delete(id);
@@ -208,8 +209,10 @@ public class SysMsgServiceImpl extends BaseServiceImpl<Sys_msg> implements SysMs
public void innerMsg(String room, int size, List<NutMap> list) {
NutMap map = new NutMap();
map.put("action", "innerMsg");
map.put("size", size);//未读消息数
map.put("list", list);//最新5条消息列表 type--系统消息/用户消息 title--标题 time--时间戳
//未读消息数
map.put("size", size);
//最新5条消息列表 type--系统消息/用户消息 title--标题 time--时间戳
map.put("list", list);
String msg = Json.toJson(map, JsonFormat.compact());
log.debug("msg::::" + msg);
if (jedisAgent.isClusterMode()) {