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

2
schoolNewsServ/system/src/main/java/org/xyzh/system/controller/UserController.java
View File

@@ -83,7 +83,7 @@ public class UserController {
*/
@DeleteMapping("/user")
public ResultDomain<TbSysUser> deleteUser(@RequestBody TbSysUser user) {
return userService.deleteUser(user.getID());
return userService.deleteUser(user.getId());
}
/**

2
schoolNewsServ/system/src/main/java/org/xyzh/system/log/LogEventHandler.java
View File

@@ -48,7 +48,7 @@ public class LogEventHandler {
LogEvent event = context.getLogEvent();
TbSysOperationLog log = new TbSysOperationLog();
log.setID(IDUtils.generateID());
log.setId(IDUtils.generateID());
// 使用从主线程提取的用户信息
log.setUserID(context.getUserId());

4
schoolNewsServ/system/src/main/java/org/xyzh/system/service/config/impl/SysConfigServiceImpl.java
View File

@@ -278,8 +278,8 @@ public class SysConfigServiceImpl implements SysConfigService {
return resultDomain;
}
if (config.getID() == null || config.getID().isEmpty()) {
config.setID(UUID.randomUUID().toString());
if (config.getId() == null || config.getId().isEmpty()) {
config.setId(UUID.randomUUID().toString());
}
int result = sysConfigMapper.insertSysConfig(config);

10
schoolNewsServ/system/src/main/java/org/xyzh/system/service/department/service/impl/SysDepartmentServiceImpl.java
View File

@@ -194,10 +194,10 @@ public class SysDepartmentServiceImpl implements SysDepartmentService {
}
// 设置基础信息
department.setID(IDUtils.generateID());
department.setId(IDUtils.generateID());
String deptId = IDUtils.generateID();
department.setDeptID(deptId);
department.setCreator(currentUser.getID());
department.setCreator(currentUser.getId());
department.setCreateTime(new Date());
department.setDeleted(false);
@@ -268,7 +268,7 @@ public class SysDepartmentServiceImpl implements SysDepartmentService {
}
// 检查部门名称是否已存在（排除自身）
ResultDomain<Boolean> checkResult = checkDepartmentNameExists(department.getName(), department.getID());
ResultDomain<Boolean> checkResult = checkDepartmentNameExists(department.getName(), department.getId());
if (!checkResult.isSuccess()) {
resultDomain.fail(checkResult.getMessage());
return resultDomain;
@@ -406,12 +406,12 @@ public class SysDepartmentServiceImpl implements SysDepartmentService {
for (String deptID : deptIDs) {
for (String roleID : roleIDs) {
TbSysDeptRole deptRole = new TbSysDeptRole();
deptRole.setID(IDUtils.generateID());
deptRole.setId(IDUtils.generateID());
deptRole.setDeptID(deptID);
deptRole.setRoleID(roleID);
deptRole.setCreateTime(now);
deptRole.setDeleted(false);
deptRole.setCreator(user.getID());
deptRole.setCreator(user.getId());
deptRoles.add(deptRole);
}
}

4
schoolNewsServ/system/src/main/java/org/xyzh/system/service/menu/service/impl/SysMenuServiceImpl.java
View File

@@ -215,7 +215,7 @@ public class SysMenuServiceImpl implements SysMenuService {
}
// 设置基础信息
menu.setID(IDUtils.generateID());
menu.setId(IDUtils.generateID());
menu.setMenuID(IDUtils.generateID());
menu.setCreateTime(new Date());
menu.setDeleted(false);
@@ -265,7 +265,7 @@ public class SysMenuServiceImpl implements SysMenuService {
}
// 检查菜单名称是否已存在（排除自身）
// ResultDomain<Boolean> checkResult = checkMenuNameExists(menu.getName(), menu.getID());
// ResultDomain<Boolean> checkResult = checkMenuNameExists(menu.getName(), menu.getId());
// if (!checkResult.isSuccess()) {
// resultDomain.fail(checkResult.getMessage());
// return resultDomain;

10
schoolNewsServ/system/src/main/java/org/xyzh/system/service/module/impl/ModuleServiceImpl.java
View File

@@ -110,7 +110,7 @@ public class ModuleServiceImpl implements ModuleService {
}
// 设置ID和创建时间
module.setID(IDUtils.generateID());
module.setId(IDUtils.generateID());
module.setModuleID(IDUtils.generateID());
module.setCreateTime(new Date());
module.setUpdateTime(new Date());
@@ -146,7 +146,7 @@ public class ModuleServiceImpl implements ModuleService {
}
// 检查模块代码是否已存在（排除自身）
int count = moduleMapper.countByCode(module.getCode(), existingModule.getID());
int count = moduleMapper.countByCode(module.getCode(), existingModule.getId());
if (count > 0) {
ResultDomain<TbSysModule> result = new ResultDomain<>();
result.fail("模块代码已存在");
@@ -154,7 +154,7 @@ public class ModuleServiceImpl implements ModuleService {
}
// 设置更新时间和ID
module.setID(existingModule.getID());
module.setId(existingModule.getId());
module.setUpdateTime(new Date());
int result = moduleMapper.updateModule(module);
@@ -326,7 +326,7 @@ public class ModuleServiceImpl implements ModuleService {
}
// 设置基础信息
permission.setID(IDUtils.generateID());
permission.setId(IDUtils.generateID());
permission.setPermissionID(IDUtils.generateID());
permission.setCreateTime(new Date());
permission.setUpdateTime(new Date());
@@ -368,7 +368,7 @@ public class ModuleServiceImpl implements ModuleService {
return result;
}
permission.setID(existingPermission.getID());
permission.setId(existingPermission.getId());
permission.setUpdateTime(new Date());
int result = permissionMapper.updatePermission(permission);

32
schoolNewsServ/system/src/main/java/org/xyzh/system/service/permission/service/impl/SysPermissionServiceImpl.java
View File

@@ -121,7 +121,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
}
// 设置基础信息
permission.setID(IDUtils.generateID());
permission.setId(IDUtils.generateID());
permission.setPermissionID(IDUtils.generateID());
permission.setCreateTime(new Date());
@@ -187,7 +187,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
}
// 检查权限名称是否已存在（排除自身）
ResultDomain<Boolean> nameCheckResult = checkPermissionNameExists(permission.getName(), permission.getID());
ResultDomain<Boolean> nameCheckResult = checkPermissionNameExists(permission.getName(), permission.getId());
if (!nameCheckResult.isSuccess()) {
resultDomain.fail(nameCheckResult.getMessage());
return resultDomain;
@@ -198,7 +198,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
}
// 检查权限编码是否已存在（排除自身）
ResultDomain<Boolean> codeCheckResult = checkPermissionCodeExists(permission.getCode(), permission.getID());
ResultDomain<Boolean> codeCheckResult = checkPermissionCodeExists(permission.getCode(), permission.getId());
if (!codeCheckResult.isSuccess()) {
resultDomain.fail(codeCheckResult.getMessage());
return resultDomain;
@@ -262,7 +262,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
Date now = new Date();
permission.setDeleted(true);
permission.setDeleteTime(now);
permission.setUpdater(user.getID());
permission.setUpdater(user.getId());
permission.setUpdateTime(now);
int result = permissionMapper.deletePermission(permission);
@@ -344,10 +344,10 @@ public class SysPermissionServiceImpl implements SysPermissionService {
// 绑定角色权限
TbSysRolePermission rolePermission = new TbSysRolePermission();
rolePermission.setID(IDUtils.generateID());
rolePermission.setId(IDUtils.generateID());
rolePermission.setRoleID(roleId);
rolePermission.setPermissionID(permissionId);
rolePermission.setCreator(user.getID());
rolePermission.setCreator(user.getId());
rolePermission.setCreateTime(new Date());
int result = rolePermissionMapper.batchBindRolePermission(Arrays.asList(rolePermission));
@@ -394,10 +394,10 @@ public class SysPermissionServiceImpl implements SysPermissionService {
for (String roleId : roleIds) {
for (String permissionId : permissionIds) {
TbSysRolePermission rolePermission = new TbSysRolePermission();
rolePermission.setID(IDUtils.generateID());
rolePermission.setId(IDUtils.generateID());
rolePermission.setRoleID(roleId);
rolePermission.setPermissionID(permissionId);
rolePermission.setCreator(user.getID());
rolePermission.setCreator(user.getId());
rolePermission.setCreateTime(new Date());
rolePermissions.add(rolePermission);
}
@@ -442,7 +442,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
TbSysRolePermission rolePermission = new TbSysRolePermission();
rolePermission.setRoleID(roleId);
rolePermission.setPermissionID(permissionId);
rolePermission.setUpdater(user.getID());
rolePermission.setUpdater(user.getId());
rolePermission.setUpdateTime(new Date());
int result = rolePermissionMapper.batchUnbindRolePermission(Arrays.asList(rolePermission));
if (result > 0) {
@@ -487,7 +487,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
TbSysRolePermission rolePermission = new TbSysRolePermission();
rolePermission.setRoleID(roleId);
rolePermission.setPermissionID(permissionId);
rolePermission.setUpdater(user.getID());
rolePermission.setUpdater(user.getId());
rolePermission.setUpdateTime(new Date());
rolePermissions.add(rolePermission);
}
@@ -531,10 +531,10 @@ public class SysPermissionServiceImpl implements SysPermissionService {
}
// 绑定菜单权限
TbSysMenuPermission menuPermission = new TbSysMenuPermission();
menuPermission.setID(IDUtils.generateID());
menuPermission.setId(IDUtils.generateID());
menuPermission.setMenuID(menuId);
menuPermission.setPermissionID(permissionId);
menuPermission.setCreator(user.getID());
menuPermission.setCreator(user.getId());
menuPermission.setCreateTime(new Date());
int result = menuPermissionMapper.batchBindMenuPermission(Arrays.asList(menuPermission));
if (result > 0) {
@@ -577,10 +577,10 @@ public class SysPermissionServiceImpl implements SysPermissionService {
for (String menuId : menuIds) {
for (String permissionId : permissionIds) {
TbSysMenuPermission menuPermission = new TbSysMenuPermission();
menuPermission.setID(IDUtils.generateID());
menuPermission.setId(IDUtils.generateID());
menuPermission.setMenuID(menuId);
menuPermission.setPermissionID(permissionId);
menuPermission.setCreator(user.getID());
menuPermission.setCreator(user.getId());
menuPermission.setCreateTime(new Date());
menuPermissions.add(menuPermission);
}
@@ -625,7 +625,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
TbSysMenuPermission menuPermission = new TbSysMenuPermission();
menuPermission.setMenuID(menuId);
menuPermission.setPermissionID(permissionId);
menuPermission.setUpdater(user.getID());
menuPermission.setUpdater(user.getId());
menuPermission.setUpdateTime(new Date());
int result = menuPermissionMapper.batchUnbindMenuPermission(Arrays.asList(menuPermission));
if (result > 0) {
@@ -670,7 +670,7 @@ public class SysPermissionServiceImpl implements SysPermissionService {
TbSysMenuPermission menuPermission = new TbSysMenuPermission();
menuPermission.setMenuID(menuId);
menuPermission.setPermissionID(permissionId);
menuPermission.setUpdater(user.getID());
menuPermission.setUpdater(user.getId());
menuPermission.setUpdateTime(new Date());
menuPermissions.add(menuPermission);
}

12
schoolNewsServ/system/src/main/java/org/xyzh/system/service/role/service/impl/SysRoleServiceImpl.java
View File

@@ -51,7 +51,7 @@ public class SysRoleServiceImpl implements SysRoleService {
// 获取当前用户的部门角色信息
TbSysUser currentUser = LoginUtil.getCurrentUser();
List<UserDeptRoleVO> userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getID());
List<UserDeptRoleVO> userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getId());
logger.info("当前用户拥有 {} 个部门角色", userDeptRoles.size());
// 查询有权限的角色列表
@@ -76,7 +76,7 @@ public class SysRoleServiceImpl implements SysRoleService {
// 获取当前用户的部门角色信息
TbSysUser currentUser = LoginUtil.getCurrentUser();
List<UserDeptRoleVO> userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getID());
List<UserDeptRoleVO> userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getId());
logger.info("当前用户拥有 {} 个部门角色", userDeptRoles.size());
// 查询有权限的角色列表
@@ -118,7 +118,7 @@ public class SysRoleServiceImpl implements SysRoleService {
}
// 设置基础信息
role.setID(IDUtils.generateID());
role.setId(IDUtils.generateID());
role.setRoleID(IDUtils.generateID());
role.setCreateTime(new Date());
role.setDeleted(false);
@@ -167,7 +167,7 @@ public class SysRoleServiceImpl implements SysRoleService {
}
// 检查角色名称是否已存在（排除自身）
ResultDomain<Boolean> nameCheckResult = checkRoleNameExists(role.getName(), role.getID());
ResultDomain<Boolean> nameCheckResult = checkRoleNameExists(role.getName(), role.getId());
if (!nameCheckResult.isSuccess()) {
resultDomain.fail(nameCheckResult.getMessage());
return resultDomain;
@@ -254,7 +254,7 @@ public class SysRoleServiceImpl implements SysRoleService {
filter.setDeleted(false);
// 获取当前用户的部门角色信息
TbSysUser currentUser = LoginUtil.getCurrentUser();
List<UserDeptRoleVO> userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getID());
List<UserDeptRoleVO> userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getId());
List<PermissionVO> roleVOs = roleMapper.selectRole(filter, userDeptRoles);
if (roleVOs.isEmpty()) {
@@ -318,7 +318,7 @@ public class SysRoleServiceImpl implements SysRoleService {
// 获取当前用户的部门角色信息（用于权限过滤）
TbSysUser currentUser = LoginUtil.getCurrentUser();
List<UserDeptRoleVO> userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getID());
List<UserDeptRoleVO> userDeptRoles = roleMapper.selectDeptRolesByUserId(currentUser.getId());
int count = roleMapper.countByRoleName(roleName, excludeId, userDeptRoles);
boolean exists = count > 0;

42
schoolNewsServ/system/src/main/java/org/xyzh/system/service/user/service/impl/SysUserServiceImpl.java
View File

@@ -64,18 +64,18 @@ public class SysUserServiceImpl implements SysUserService {
return resultDomain;
}
Date now = new Date();
user.setID(IDUtils.generateID());
user.setId(IDUtils.generateID());
user.setCreateTime(now);
user.setDeleted(false);
// 创建用户信息
TbSysUserInfo userInfo = new TbSysUserInfo();
userInfo.setUserID(user.getID());
userInfo.setUserID(user.getId());
userInfo.setCreateTime(now);
userInfo.setAvatar("default");
TbSysUserDeptRole userDeptRole = new TbSysUserDeptRole();
userDeptRole.setID(IDUtils.generateID()); // 设置ID
userDeptRole.setUserID(user.getID());
userDeptRole.setId(IDUtils.generateID()); // 设置ID
userDeptRole.setUserID(user.getId());
userDeptRole.setDeptID("default_department");
userDeptRole.setRoleID("freedom");
userDeptRole.setCreateTime(now);
@@ -142,7 +142,7 @@ public class SysUserServiceImpl implements SysUserService {
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
TbSysUser filter = new TbSysUser();
filter.setID(userId);
filter.setId(userId);
filter.setDeleted(false);
List<TbSysUser> users = userMapper.selectByFilter(filter, userDeptRoles);
@@ -206,7 +206,7 @@ public class SysUserServiceImpl implements SysUserService {
}
// 检查至少有一个查询条件
// boolean hasFilter = StringUtils.hasText(filter.getID()) ||
// boolean hasFilter = StringUtils.hasText(filter.getId()) ||
// StringUtils.hasText(filter.getUsername()) ||
// StringUtils.hasText(filter.getEmail()) ||
// StringUtils.hasText(filter.getPhone());
@@ -347,7 +347,7 @@ public class SysUserServiceImpl implements SysUserService {
}
// 设置基础信息
user.setID(IDUtils.generateID());
user.setId(IDUtils.generateID());
user.setCreateTime(new Date());
user.setDeleted(false);
if (user.getStatus() == null) {
@@ -377,16 +377,16 @@ public class SysUserServiceImpl implements SysUserService {
public ResultDomain<TbSysUser> updateUser(TbSysUser user) {
ResultDomain<TbSysUser> resultDomain = new ResultDomain<>();
logger.info("开始更新用户：{}", user.getID());
logger.info("开始更新用户：{}", user.getId());
// 参数校验
if (!StringUtils.hasText(user.getID())) {
if (!StringUtils.hasText(user.getId())) {
resultDomain.fail("用户ID不能为空");
return resultDomain;
}
// 检查用户是否存在
ResultDomain<TbSysUser> existResult = getUserById(user.getID());
ResultDomain<TbSysUser> existResult = getUserById(user.getId());
if (!existResult.isSuccess()) {
resultDomain.fail(existResult.getMessage());
return resultDomain;
@@ -394,7 +394,7 @@ public class SysUserServiceImpl implements SysUserService {
// 检查邮箱是否已存在（排除自身）
if (StringUtils.hasText(user.getEmail())) {
ResultDomain<Boolean> emailCheckResult = checkEmailExists(user.getEmail(), user.getID());
ResultDomain<Boolean> emailCheckResult = checkEmailExists(user.getEmail(), user.getId());
if (!emailCheckResult.isSuccess()) {
resultDomain.fail(emailCheckResult.getMessage());
return resultDomain;
@@ -412,11 +412,11 @@ public class SysUserServiceImpl implements SysUserService {
int result = userMapper.updateUser(user);
if (result > 0) {
logger.info("更新用户成功：{}", user.getID());
logger.info("更新用户成功：{}", user.getId());
resultDomain.success("更新用户成功", user);
return resultDomain;
} else {
logger.warn("更新用户失败：{}", user.getID());
logger.warn("更新用户失败：{}", user.getId());
resultDomain.fail("更新用户失败");
return resultDomain;
}
@@ -494,7 +494,7 @@ public class SysUserServiceImpl implements SysUserService {
// 收集所有用户ID
List<String> userIds = new ArrayList<>();
for (TbSysUser user : userDeptRoleVO.getUsers()) {
userIds.add(user.getID());
userIds.add(user.getId());
}
logger.info("准备为 {} 个用户绑定部门角色（每个用户一个部门-角色）", userIds.size());
@@ -510,12 +510,12 @@ public class SysUserServiceImpl implements SysUserService {
for (TbSysUser user : userDeptRoleVO.getUsers()) {
TbSysUserDeptRole newUserDeptRole = new TbSysUserDeptRole();
newUserDeptRole.setID(IDUtils.generateID());
newUserDeptRole.setUserID(user.getID());
newUserDeptRole.setId(IDUtils.generateID());
newUserDeptRole.setUserID(user.getId());
newUserDeptRole.setDeptID(templateDeptRole.getDeptID());
newUserDeptRole.setRoleID(templateDeptRole.getRoleID());
newUserDeptRole.setCreateTime(now);
newUserDeptRole.setCreator(currentUser.getID());
newUserDeptRole.setCreator(currentUser.getId());
userDeptRoles.add(newUserDeptRole);
}
@@ -546,7 +546,7 @@ public class SysUserServiceImpl implements SysUserService {
Date now = new Date();
for (TbSysUser user : userDeptRoleVO.getUsers()) {
for (TbSysUserDeptRole userDeptRole : userDeptRoleVO.getUserDeptRoles()) {
userDeptRole.setUserID(user.getID());
userDeptRole.setUserID(user.getId());
userDeptRoles.add(userDeptRole);
}
}
@@ -576,7 +576,7 @@ public class SysUserServiceImpl implements SysUserService {
List<UserDeptRoleVO> userDeptRoles = LoginUtil.getCurrentDeptRole();
TbSysUser filter = new TbSysUser();
if (StringUtils.hasText(excludeId)) {
filter.setID(excludeId);
filter.setId(excludeId);
}
filter.setUsername(username);
filter.setDeleted(false);
@@ -612,11 +612,11 @@ public class SysUserServiceImpl implements SysUserService {
filter.setDeleted(false);
// if (StringUtils.hasText(excludeId)) {
// filter.setID(excludeId);
// filter.setId(excludeId);
// }
List<TbSysUser> userList = userMapper.selectByFilter(filter, userDeptRoles);
boolean exists = userList.size() >1 && (userList.size() == 1 && !userList.get(0).getID().equals(excludeId));
boolean exists = userList.size() >1 && (userList.size() == 1 && !userList.get(0).getId().equals(excludeId));
logger.info("邮箱存在性检查完成：{}，存在：{}", email, exists);
resultDomain.success("检查完成", exists);

4
schoolNewsServ/system/src/main/java/org/xyzh/system/utils/LoginUtil.java
View File

@@ -87,7 +87,7 @@ public class LoginUtil {
// UserDeptRoleVO应该在登录时就已经扁平化填充好了
// 这里只需要确保userID被设置（如果还没设置的话）
String userId = loginDomain.getUser().getID();
String userId = loginDomain.getUser().getId();
return roles.stream().map(item -> {
if (item.getUserID() == null) {
item.setUserID(userId);
@@ -126,7 +126,7 @@ public class LoginUtil {
*/
public static String getCurrentUserId() {
TbSysUser user = getCurrentUser();
return user != null ? user.getID() : null;
return user != null ? user.getId() : null;
}
/**

6
schoolNewsServ/system/src/main/resources/mapper/SysConfigMapper.xml
View File

@@ -4,7 +4,7 @@
<!-- 结果映射 -->
<resultMap id="BaseResultMap" type="org.xyzh.common.dto.system.TbSysConfig">
<id column="id" property="ID" />
<id column="id" property="id" />
<result column="config_key" property="configKey" />
<result column="config_name" property="configName" />
<result column="config_value" property="configValue" />
@@ -62,7 +62,7 @@
description, placeholder, remark, `rows`, min_value, max_value, unit, `options`, order_num,
is_system, creator, create_time
) VALUES (
#{config.ID}, #{config.configKey}, #{config.configName}, #{config.configValue},
#{config.id}, #{config.configKey}, #{config.configName}, #{config.configValue},
#{config.configType}, #{config.renderType}, #{config.configGroup}, #{config.description},
#{config.placeholder}, #{config.remark}, #{config.rows}, #{config.minValue},
#{config.maxValue}, #{config.unit}, #{config.options}, #{config.orderNum},
@@ -90,7 +90,7 @@
is_system = #{config.isSystem},
updater = #{config.updater},
update_time = NOW()
WHERE id = #{config.ID}
WHERE id = #{config.id}
AND deleted = 0
</update>