wangys/schoolNews
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

前端和json优化

Browse Source
This commit is contained in:
wangys
2025-11-28 17:16:17 +08:00
parent 34e69c7f62
commit dfb11c85f1
135 changed files with 930 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
schoolNewsServ/message/src/main/java/org/xyzh/message/service/impl/MessageSendService.java
View File

@@ -103,7 +103,7 @@ public class MessageSendService {
TbSysUser user = userMapper.selectUserById(userMessage.getUserID());
if (user == null || user.getDeleted()) {
logger.warn("用户不存在：{}", userMessage.getUserID());
updateUserMessageStatus(userMessage.getID(), "failed", "用户不存在");
updateUserMessageStatus(userMessage.getId(), "failed", "用户不存在");
failedCount++;
continue;
}
@@ -144,16 +144,16 @@ public class MessageSendService {
// 更新用户消息发送状态
if (sent) {
updateUserMessageStatus(userMessage.getID(), "success", null);
updateUserMessageStatus(userMessage.getId(), "success", null);
successCount++;
} else {
updateUserMessageStatus(userMessage.getID(), "failed", "所有发送方式均失败");
updateUserMessageStatus(userMessage.getId(), "failed", "所有发送方式均失败");
failedCount++;
}
} catch (Exception e) {
logger.error("处理用户消息失败：{}", userMessage.getID(), e);
updateUserMessageStatus(userMessage.getID(), "failed", e.getMessage());
logger.error("处理用户消息失败：{}", userMessage.getId(), e);
updateUserMessageStatus(userMessage.getId(), "failed", e.getMessage());
failedCount++;
}
}

40
schoolNewsServ/message/src/main/java/org/xyzh/message/service/impl/MessageServiceImpl.java
View File

@@ -68,12 +68,12 @@ public class MessageServiceImpl implements MessageService {
try {
// 1. 获取当前用户信息（从Session或SecurityContext获取）
LoginDomain currentUser = LoginUtil.getCurrentLoginDomain();
String currentUserID = currentUser.getUser().getID();
String currentUserID = currentUser.getUser().getId();
String currentDeptID = currentUser.getRoles().get(0).getDeptID();
// 2. 设置消息主体基本信息
if (message.getID() == null) {
message.setID(IDUtils.generateID());
if (message.getId() == null) {
message.setId(IDUtils.generateID());
}
if (message.getMessageID() == null) {
message.setMessageID(IDUtils.generateID());
@@ -119,8 +119,8 @@ public class MessageServiceImpl implements MessageService {
// return rt;
// }
if (target.getID() == null) {
target.setID(IDUtils.generateID());
if (target.getId() == null) {
target.setId(IDUtils.generateID());
}
target.setMessageID(message.getMessageID());
target.setCreator(currentUserID);
@@ -180,7 +180,7 @@ public class MessageServiceImpl implements MessageService {
message.setUpdateTime(new Date());
LoginDomain currentUser = LoginUtil.getCurrentLoginDomain();
message.setUpdater(currentUser.getUser().getID());
message.setUpdater(currentUser.getUser().getId());
messageMapper.updateMessage(message);
rt.success("更新成功", message);
return rt;
@@ -489,7 +489,7 @@ public class MessageServiceImpl implements MessageService {
}
LoginDomain currentUser = LoginUtil.getCurrentLoginDomain();
String currentUserID = currentUser.getUser().getID();
String currentUserID = currentUser.getUser().getId();
// 使用新的动态查询方法
List<MessageUserVO> list = messageUserMapper.selectMyMessagesWithDynamicTargets(currentUserID, filter);
@@ -515,7 +515,7 @@ public class MessageServiceImpl implements MessageService {
ResultDomain<MessageUserVO> rt = new ResultDomain<>();
try {
LoginDomain currentUser = LoginUtil.getCurrentLoginDomain();
String currentUserID = currentUser.getUser().getID();
String currentUserID = currentUser.getUser().getId();
MessageUserVO messageUserVO = messageUserMapper.selectOrCreateUserMessage(currentUserID, messageID);
if (messageUserVO == null) {
@@ -528,7 +528,7 @@ public class MessageServiceImpl implements MessageService {
logger.info("用户首次查看消息，创建用户消息记录：userID={}, messageID={}", currentUserID, messageID);
TbSysMessageUser userMessage = new TbSysMessageUser();
userMessage.setID(IDUtils.generateID());
userMessage.setId(IDUtils.generateID());
userMessage.setMessageID(messageID);
userMessage.setUserID(currentUserID);
userMessage.setSendMethod("system"); // 默认发送方式
@@ -562,7 +562,7 @@ public class MessageServiceImpl implements MessageService {
ResultDomain<TbSysMessageUser> rt = new ResultDomain<>();
try {
LoginDomain currentUser = LoginUtil.getCurrentLoginDomain();
String currentUserID = currentUser.getUser().getID();
String currentUserID = currentUser.getUser().getId();
// 先尝试更新已有记录
int result = messageUserMapper.markAsRead(currentUserID, messageID);
@@ -572,7 +572,7 @@ public class MessageServiceImpl implements MessageService {
logger.info("用户消息记录不存在，创建新记录：userID={}, messageID={}", currentUserID, messageID);
TbSysMessageUser userMessage = new TbSysMessageUser();
userMessage.setID(IDUtils.generateID());
userMessage.setId(IDUtils.generateID());
userMessage.setMessageID(messageID);
userMessage.setUserID(currentUserID);
userMessage.setSendMethod("system"); // 默认发送方式
@@ -616,7 +616,7 @@ public class MessageServiceImpl implements MessageService {
ResultDomain<Integer> rt = new ResultDomain<>();
try {
LoginDomain currentUser = LoginUtil.getCurrentLoginDomain();
String currentUserID = currentUser.getUser().getID();
String currentUserID = currentUser.getUser().getId();
int count = messageUserMapper.batchMarkAsRead(currentUserID, messageIDs);
// 更新每条消息的已读数量
@@ -639,7 +639,7 @@ public class MessageServiceImpl implements MessageService {
ResultDomain<Integer> rt = new ResultDomain<>();
try {
LoginDomain currentUser = LoginUtil.getCurrentLoginDomain();
String currentUserID = currentUser.getUser().getID();
String currentUserID = currentUser.getUser().getId();
// 使用动态计算方法，统计用户应该看到的所有未读消息
Integer count = messageUserMapper.countUnreadWithDynamicTargets(currentUserID);
rt.success("查询成功", count != null ? count : 0);
@@ -671,21 +671,21 @@ public class MessageServiceImpl implements MessageService {
switch (target.getTargetType()) {
case "dept":
// 查询该部门及所有子部门的用户
userIDs = userMapper.selectUserIdsByDeptId(target.getTargetID());
logger.info("部门 {} 解析到 {} 个用户", target.getTargetID(), userIDs.size());
userIDs = userMapper.selectUserIdsByDeptId(target.getTargetId());
logger.info("部门 {} 解析到 {} 个用户", target.getTargetId(), userIDs.size());
break;
case "role":
// 查询scopeDeptID及子部门中该角色的用户
String scopeDeptID = target.getScopeDeptID();
if (scopeDeptID == null || scopeDeptID.isEmpty()) {
logger.warn("角色目标缺少 scopeDeptID，跳过：{}", target.getTargetID());
logger.warn("角色目标缺少 scopeDeptID，跳过：{}", target.getTargetId());
break;
}
userIDs = userMapper.selectUserIdsByDeptRole(scopeDeptID, target.getTargetID());
logger.info("部门 {} 中角色 {} 解析到 {} 个用户", scopeDeptID, target.getTargetID(), userIDs.size());
userIDs = userMapper.selectUserIdsByDeptRole(scopeDeptID, target.getTargetId());
logger.info("部门 {} 中角色 {} 解析到 {} 个用户", scopeDeptID, target.getTargetId(), userIDs.size());
break;
case "user":
userIDs.add(target.getTargetID());
userIDs.add(target.getTargetId());
break;
}
@@ -699,7 +699,7 @@ public class MessageServiceImpl implements MessageService {
List<TbSysMessageUser> userMessages = new ArrayList<>();
for (String userID : userIDSet) {
TbSysMessageUser userMessage = new TbSysMessageUser();
userMessage.setID(IDUtils.generateID());
userMessage.setId(IDUtils.generateID());
userMessage.setMessageID(messageID);
userMessage.setUserID(userID);
userMessage.setSendMethod(userMethodMap.get(userID));