diff --git a/urbanLifelineServ/.vscode/mybatis-xml.code-snippets b/urbanLifelineServ/.vscode/mybatis-xml.code-snippets index d01f0f7..206f38e 100644 --- a/urbanLifelineServ/.vscode/mybatis-xml.code-snippets +++ b/urbanLifelineServ/.vscode/mybatis-xml.code-snippets @@ -17,7 +17,7 @@ " ", " ", " ", - " ", + " ", " ", "", " ", @@ -116,7 +116,7 @@ " ", "", " ", - " ", " SELECT COUNT(1)", " FROM ${10:tb_entity_name}", " ", @@ -154,7 +154,7 @@ " ", " ", " ", - " ", + " ", " " ], "description": "MyBatis ResultMap 映射" @@ -282,7 +282,7 @@ "prefix": "mybatis-select-count", "body": [ " ", - " ", " SELECT COUNT(1)", " FROM ${4:tb_entity_name}", " ", diff --git a/urbanLifelineServ/apis/api-auth/src/main/java/org/xyzh/api/auth/service/AuthService.java b/urbanLifelineServ/apis/api-auth/src/main/java/org/xyzh/api/auth/service/AuthService.java index 51dccf2..87a2bec 100644 --- a/urbanLifelineServ/apis/api-auth/src/main/java/org/xyzh/api/auth/service/AuthService.java +++ b/urbanLifelineServ/apis/api-auth/src/main/java/org/xyzh/api/auth/service/AuthService.java @@ -64,11 +64,11 @@ public interface AuthService { /** * @description 简单校验 token 是否有效（用于快速判断是否已登录） * @param token 鉴权 token - * @return ResultDomain true 表示有效/已登录，false 表示无效/未登录 + * @return ResultDomain true 表示有效/已登录，false 表示无效/未登录 * @author yslg * @since 2025-11-03 */ - ResultDomain isTokenValid(String token); + ResultDomain isTokenValid(String token); } diff --git a/urbanLifelineServ/apis/api-file/src/main/java/org/xyzh/api/file/service/FileService.java b/urbanLifelineServ/apis/api-file/src/main/java/org/xyzh/api/file/service/FileService.java index c1f5425..e806bd6 100644 --- a/urbanLifelineServ/apis/api-file/src/main/java/org/xyzh/api/file/service/FileService.java +++ b/urbanLifelineServ/apis/api-file/src/main/java/org/xyzh/api/file/service/FileService.java @@ -43,7 +43,7 @@ public interface FileService { * @author yslg * @since 2025-11-03 */ - ResultDomain deleteFile(String fileId); + ResultDomain deleteFile(String fileId); /** * @description 批量删除文件（逻辑删除） diff --git a/urbanLifelineServ/apis/api-log/src/main/java/org/xyzh/api/log/dto/TbSysLogDTO.java b/urbanLifelineServ/apis/api-log/src/main/java/org/xyzh/api/log/dto/TbSysLogDTO.java index 49e7581..30f2514 100644 --- a/urbanLifelineServ/apis/api-log/src/main/java/org/xyzh/api/log/dto/TbSysLogDTO.java +++ b/urbanLifelineServ/apis/api-log/src/main/java/org/xyzh/api/log/dto/TbSysLogDTO.java @@ -23,7 +23,7 @@ public class TbSysLogDTO extends BaseDTO { private String logId; @Schema(description = "日志类型") - private INTEGER type; + private Integer type; @Schema(description = "日志级别") private String level; diff --git a/urbanLifelineServ/apis/api-log/src/main/java/org/xyzh/api/log/dto/TbSysLoginLogDTO.java b/urbanLifelineServ/apis/api-log/src/main/java/org/xyzh/api/log/dto/TbSysLoginLogDTO.java index 466daa1..c6d4818 100644 --- a/urbanLifelineServ/apis/api-log/src/main/java/org/xyzh/api/log/dto/TbSysLoginLogDTO.java +++ b/urbanLifelineServ/apis/api-log/src/main/java/org/xyzh/api/log/dto/TbSysLoginLogDTO.java @@ -46,10 +46,10 @@ public class TbSysLoginLogDTO extends BaseDTO { private Date loginTime; @Schema(description = "状态") - private INTEGER status; + private Integer status; @Schema(description = "错误次数") - private INTEGER errorCount; + private Integer errorCount; @Schema(description = "消息") private String message; diff --git a/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/dto/TbMessageChannelDTO.java b/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/dto/TbMessageChannelDTO.java index a940c91..73974a4 100644 --- a/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/dto/TbMessageChannelDTO.java +++ b/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/dto/TbMessageChannelDTO.java @@ -38,6 +38,6 @@ public class TbMessageChannelDTO extends BaseDTO { private String status; @Schema(description = "优先级（数字越大优先级越高）") - private INTEGER priority; + private Integer priority; } diff --git a/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/service/MessageService.java b/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/service/MessageService.java index 80bee83..180128e 100644 --- a/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/service/MessageService.java +++ b/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/service/MessageService.java @@ -113,7 +113,7 @@ public interface MessageService { * @author yslg * @since 2025-11-05 */ - ResultDomain deleteMessage(String messageId); + ResultDomain deleteMessage(String messageId); /** * @description 发送消息 diff --git a/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/vo/MessageRangeChannelVO.java b/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/vo/MessageRangeChannelVO.java index 9d4a148..f38780d 100644 --- a/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/vo/MessageRangeChannelVO.java +++ b/urbanLifelineServ/apis/api-message/src/main/java/org/xyzh/api/message/vo/MessageRangeChannelVO.java @@ -44,5 +44,5 @@ public class MessageRangeChannelVO extends BaseVO { private String channelStatus; @Schema(description = "渠道优先级（数字越大优先级越高）") - private INTEGER channelPriority; + private Integer channelPriority; } diff --git a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/DeptRoleService.java b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/DeptRoleService.java index 9bc8b70..7d4a5ff 100644 --- a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/DeptRoleService.java +++ b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/DeptRoleService.java @@ -39,11 +39,11 @@ public interface DeptRoleService { /** * @description 根据ID删除部门 * @param deptDTO 部门DTO - * @return ResultDomain 删除结果 + * @return ResultDomain 删除结果 * @author yslg * @since 2025-11-05 */ - ResultDomain deleteDept(TbSysDeptDTO deptDTO); + ResultDomain deleteDept(TbSysDeptDTO deptDTO); /** * @description 根据ID查询部门 @@ -103,11 +103,11 @@ public interface DeptRoleService { /** * @description 根据ID删除角色 * @param roleDTO 角色DTO - * @return ResultDomain 删除结果 + * @return ResultDomain 删除结果 * @author yslg * @since 2025-11-05 */ - ResultDomain deleteRole(TbSysRoleDTO roleDTO); + ResultDomain deleteRole(TbSysRoleDTO roleDTO); /** * @description 根据ID查询角色 @@ -176,11 +176,11 @@ public interface DeptRoleService { /** * @description 根据ID删除部门角色关联 * @param deptRoleDTO 部门角色DTO - * @return ResultDomain 删除结果 + * @return ResultDomain 删除结果 * @author yslg * @since 2025-11-05 */ - ResultDomain deleteDeptRole(TbSysDeptRoleDTO deptRoleDTO); + ResultDomain deleteDeptRole(TbSysDeptRoleDTO deptRoleDTO); /** * @description 根据ID查询部门角色关联 diff --git a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/ModulePermissionService.java b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/ModulePermissionService.java index a9bdc2a..d3181b5 100644 --- a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/ModulePermissionService.java +++ b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/ModulePermissionService.java @@ -38,11 +38,11 @@ public interface ModulePermissionService { /** * @description 根据ID删除模块 * @param moduleDTO 模块DTO - * @return ResultDomain 删除结果 + * @return ResultDomain 删除结果 * @author yslg * @since 2025-11-05 */ - ResultDomain deleteModule(TbSysModuleDTO moduleDTO); + ResultDomain deleteModule(TbSysModuleDTO moduleDTO); /** * @description 获取模块分页数据 @@ -84,11 +84,11 @@ public interface ModulePermissionService { /** * @description 根据ID删除权限 * @param permissionDTO 权限DTO - * @return ResultDomain 删除结果 + * @return ResultDomain 删除结果 * @author yslg * @since 2025-11-05 */ - ResultDomain deletePermission(TbSysPermissionDTO permissionDTO); + ResultDomain deletePermission(TbSysPermissionDTO permissionDTO); /** * @description 根据模块ID获取权限列表 diff --git a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/SysConfigService.java b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/SysConfigService.java index 7a3d6f2..8f12f8a 100644 --- a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/SysConfigService.java +++ b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/SysConfigService.java @@ -35,11 +35,11 @@ public interface SysConfigService { /** * @description 根据ID删除系统配置 * @param configDTO 系统配置DTO - * @return ResultDomain 删除结果 + * @return ResultDomain 删除结果 * @author yslg * @since 2025-11-05 */ - ResultDomain deleteConfig(TbSysConfigDTO configDTO); + ResultDomain deleteConfig(TbSysConfigDTO configDTO); /** * @description 根据ID查询系统配置 diff --git a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/SysUserService.java b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/SysUserService.java index 97da39d..7b8df7f 100644 --- a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/SysUserService.java +++ b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/SysUserService.java @@ -39,11 +39,11 @@ public interface SysUserService { /** * @description 根据ID删除用户 * @param TbSysUserDTO userDTO 用户DTO - * @return ResultDomain 删除结果 + * @return ResultDomain 删除结果 * @author yslg * @since 2025-11-05 */ - ResultDomain deleteUser(TbSysUserDTO userDTO); + ResultDomain deleteUser(TbSysUserDTO userDTO); /** * @description 根据ID查询用户 @@ -95,11 +95,11 @@ public interface SysUserService { * @param userId 用户ID * @param oldPassword 旧密码 * @param newPassword 新密码 - * @return ResultDomain 更新结果 + * @return ResultDomain 更新结果 * @author yslg * @since 2025-11-05 */ - ResultDomain updateUserPassword(String userId, String oldPassword, String newPassword); + ResultDomain updateUserPassword(String userId, String oldPassword, String newPassword); /** * @description 重置用户密码 @@ -114,11 +114,11 @@ public interface SysUserService { * @description 更新用户状态 * @param userId 用户ID * @param status 状态 - * @return ResultDomain 更新结果 + * @return ResultDomain 更新结果 * @author yslg * @since 2025-11-05 */ - ResultDomain updateUserStatus(String userId, String status); + ResultDomain updateUserStatus(String userId, String status); // ================= 用户详细信息管理 ================= /** @@ -152,21 +152,21 @@ public interface SysUserService { /** * @description 删除用户角色关联 * @param userRoleDTO 用户角色DTO - * @return ResultDomain 删除结果 + * @return ResultDomain 删除结果 * @author yslg * @since 2025-11-05 */ - ResultDomain removeUserRole(TbSysUserRoleDTO userRoleDTO); + ResultDomain removeUserRole(TbSysUserRoleDTO userRoleDTO); /** * @description 批量设置用户角色 * @param userId 用户ID * @param[] roleIds 角色ID数组 - * @return ResultDomain 设置结果 + * @return ResultDomain 设置结果 * @author yslg * @since 2025-11-05 */ - ResultDomain setUserRoles(String userId, String[] roleIds); + ResultDomain setUserRoles(String userId, String[] roleIds); // ================= 用户完整信息查询 ================= /** diff --git a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/ViewService.java b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/ViewService.java index 4fdd946..aae0176 100644 --- a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/ViewService.java +++ b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/service/ViewService.java @@ -36,11 +36,11 @@ public interface ViewService { /** * @description 根据ID删除视图 * @param viewDTO 视图DTO - * @return ResultDomain 删除结果 + * @return ResultDomain 删除结果 * @author yslg * @since 2025-11-05 */ - ResultDomain deleteView(TbSysViewDTO viewDTO); + ResultDomain deleteView(TbSysViewDTO viewDTO); /** * @description 根据ID查询视图 diff --git a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/AclVO.java b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/AclVO.java index fcc7677..eafceee 100644 --- a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/AclVO.java +++ b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/AclVO.java @@ -36,13 +36,13 @@ public class AclVO extends BaseVO { private String principalDeptId; @Schema(description = "权限位：1读 2写 4执行") - private INTEGER permission; + private Integer permission; @Schema(description = "允许或显式拒绝", defaultValue = "true") - private BOOLEAN allow = true; + private Boolean allow = true; @Schema(description = "是否包含子级（对dept/role生效）", defaultValue = "false") - private BOOLEAN includeDescendants = false; + private Boolean includeDescendants = false; // TbSysAclPolicyDTO对应字段 @Schema(description = "策略ID") @@ -61,11 +61,11 @@ public class AclVO extends BaseVO { private String viewHierarchyRule; @Schema(description = "默认权限（无显式ACL时应用）", defaultValue = "0") - private INTEGER defaultPermission = 0; + private Integer defaultPermission = 0; @Schema(description = "默认是否允许", defaultValue = "true") - private BOOLEAN defaultAllow = true; + private Boolean defaultAllow = true; @Schema(description = "是否默认应用到子级", defaultValue = "true") - private BOOLEAN applyToChildren = true; + private Boolean applyToChildren = true; } diff --git a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/PermissionVO.java b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/PermissionVO.java index 3ab0bc6..cb1a910 100644 --- a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/PermissionVO.java +++ b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/PermissionVO.java @@ -51,7 +51,7 @@ public class PermissionVO extends BaseVO { private String roleOwnerDeptId; @Schema(description = "角色状态") - private BOOLEAN roleStatus; + private Boolean roleStatus; // TbSysModuleDTO对应字段 @Schema(description = "模块ID") @@ -99,13 +99,13 @@ public class PermissionVO extends BaseVO { private String viewIcon; @Schema(description = "类型") - private INTEGER viewType; + private Integer viewType; @Schema(description = "布局") private String viewLayout; @Schema(description = "排序") - private INTEGER viewOrderNum; + private Integer viewOrderNum; @Schema(description = "视图描述") private String viewDescription; diff --git a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/SysConfigVO.java b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/SysConfigVO.java index 9371bb9..ed9fb8b 100644 --- a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/SysConfigVO.java +++ b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/SysConfigVO.java @@ -32,7 +32,7 @@ public class SysConfigVO extends BaseVO { @Schema(description = "配置值") private String value; - @Schema(description = "数据类型(String, INTEGER, BOOLEAN, Float, Double)") + @Schema(description = "数据类型(String, Integer, Boolean, Float, Double)") private String configType; @Schema(description = "配置渲染类型(select, input, textarea, checkbox, radio, switch)") @@ -60,10 +60,10 @@ public class SysConfigVO extends BaseVO { private String moduleDescription; @Schema(description = "配置顺序") - private INTEGER orderNum; + private Integer orderNum; @Schema(description = "状态") - private INTEGER status; + private Integer status; public static TbSysConfigDTO toDTO(SysConfigVO vo) { if (vo == null) { diff --git a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/SysUserVO.java b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/SysUserVO.java index fe5b81e..2e65361 100644 --- a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/SysUserVO.java +++ b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/SysUserVO.java @@ -51,7 +51,7 @@ public class SysUserVO extends BaseVO { private String avatar; @Schema(description = "性别") - private INTEGER gender; + private Integer gender; @Schema(description = "姓") private String familyName; @@ -63,7 +63,7 @@ public class SysUserVO extends BaseVO { private String fullName; @Schema(description = "等级") - private INTEGER level; + private Integer level; @Schema(description = "身份证号") private String idCard; diff --git a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/UserDeptRoleVO.java b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/UserDeptRoleVO.java index ffa1c7c..9ecacd0 100644 --- a/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/UserDeptRoleVO.java +++ b/urbanLifelineServ/apis/api-system/src/main/java/org/xyzh/api/system/vo/UserDeptRoleVO.java @@ -50,7 +50,7 @@ public class UserDeptRoleVO extends BaseVO { private String avatar; @Schema(description = "性别") - private INTEGER gender; + private Integer gender; @Schema(description = "姓") private String familyName; @@ -62,7 +62,7 @@ public class UserDeptRoleVO extends BaseVO { private String fullName; @Schema(description = "等级") - private INTEGER level; + private Integer level; @Schema(description = "身份证号") private String idCard; @@ -100,7 +100,7 @@ public class UserDeptRoleVO extends BaseVO { private String ownerDeptId; @Schema(description = "角色状态") - private BOOLEAN roleStatus; + private Boolean roleStatus; public static TbSysDeptDTO toDeptDTO(UserDeptRoleVO vo) { diff --git a/urbanLifelineServ/auth/src/main/java/org/xyzh/auth/service/impl/AuthServiceImpl.java b/urbanLifelineServ/auth/src/main/java/org/xyzh/auth/service/impl/AuthServiceImpl.java index 2d847d6..fed4332 100644 --- a/urbanLifelineServ/auth/src/main/java/org/xyzh/auth/service/impl/AuthServiceImpl.java +++ b/urbanLifelineServ/auth/src/main/java/org/xyzh/auth/service/impl/AuthServiceImpl.java @@ -34,7 +34,7 @@ public class AuthServiceImpl implements AuthService{ } @Override - public ResultDomain isTokenValid(String arg0) { + public ResultDomain isTokenValid(String arg0) { // TODO Auto-generated method stub return null; } diff --git a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/annotation/HttpLogin.java b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/annotation/HttpLogin.java index 5b78837..66acdaa 100644 --- a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/annotation/HttpLogin.java +++ b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/annotation/HttpLogin.java @@ -16,11 +16,11 @@ public @interface HttpLogin { /** * @description 是否必需，默认为true - * @return BOOLEAN + * @return boolean * @author yslg * @since 2025-11-02 */ - BOOLEAN required() default true; + boolean required() default true; /** * @description 当token无效时的错误消息 diff --git a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/annotation/resovler/HttpLoginArgumentResolver.java b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/annotation/resovler/HttpLoginArgumentResolver.java index 1a86738..e9b01c4 100644 --- a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/annotation/resovler/HttpLoginArgumentResolver.java +++ b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/annotation/resovler/HttpLoginArgumentResolver.java @@ -42,7 +42,7 @@ public class HttpLoginArgumentResolver implements HandlerMethodArgumentResolver private static final String REDIS_LOGIN_PREFIX = "login:token:"; @Override - public BOOLEAN supportsParameter(MethodParameter parameter) { + public boolean supportsParameter(MethodParameter parameter) { return parameter.hasParameterAnnotation(HttpLogin.class) && LoginDomain.class.isAssignableFrom(parameter.getParameterType()); } diff --git a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/config/AuthProperties.java b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/config/AuthProperties.java index 9fba57d..d4d7a57 100644 --- a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/config/AuthProperties.java +++ b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/config/AuthProperties.java @@ -21,7 +21,7 @@ public class AuthProperties { * 是否启用认证过滤器 * 默认启用 */ - private BOOLEAN enabled = true; + private Boolean enabled = true; /** * 登录接口路径 @@ -72,11 +72,11 @@ public class AuthProperties { whitelist.add("/error"); } - public BOOLEAN isEnabled() { + public Boolean isEnabled() { return enabled; } - public void setEnabled(BOOLEAN enabled) { + public void setEnabled(Boolean enabled) { this.enabled = enabled; } diff --git a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/filter/JwtAuthenticationFilter.java b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/filter/JwtAuthenticationFilter.java index 522875b..631c65d 100644 --- a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/filter/JwtAuthenticationFilter.java +++ b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/filter/JwtAuthenticationFilter.java @@ -178,7 +178,7 @@ public class JwtAuthenticationFilter extends OncePerRequestFilter { /** * 检查路径是否在白名单中 */ - private BOOLEAN isWhitelisted(@NonNull String path) { + private Boolean isWhitelisted(@NonNull String path) { // 1. 先检查认证相关接口（login / logout / captcha / refresh） if (authProperties.getAuthPaths() != null) { for (String pattern : authProperties.getAuthPaths()) { diff --git a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/token/JwtTokenParser.java b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/token/JwtTokenParser.java index 3426970..ac89ffa 100644 --- a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/token/JwtTokenParser.java +++ b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/token/JwtTokenParser.java @@ -34,12 +34,12 @@ public class JwtTokenParser implements TokenParser { } @Override - public BOOLEAN validateToken(String token, String userId) { + public Boolean validateToken(String token, String userId) { return jwtTokenUtil.validateToken(token, userId); } @Override - public BOOLEAN isTokenExpired(String token) { + public Boolean isTokenExpired(String token) { return jwtTokenUtil.isTokenExpired(token); } } diff --git a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/token/TokenParser.java b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/token/TokenParser.java index 9ee143f..c738452 100644 --- a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/token/TokenParser.java +++ b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/token/TokenParser.java @@ -33,19 +33,19 @@ public interface TokenParser { * @description 验证令牌 * @param token 令牌 * @param userId 用户ID - * @return BOOLEAN 是否有效 + * @return Boolean 是否有效 * @author yslg * @since 2025-11-02 */ - BOOLEAN validateToken(String token, String userId); + Boolean validateToken(String token, String userId); /** * @description 检查令牌是否过期 * @param token 令牌 - * @return BOOLEAN 是否过期 + * @return Boolean 是否过期 * @author yslg * @since 2025-11-02 */ - BOOLEAN isTokenExpired(String token); + Boolean isTokenExpired(String token); } diff --git a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/utils/JwtTokenUtil.java b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/utils/JwtTokenUtil.java index e3aeb04..7d3eb63 100644 --- a/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/utils/JwtTokenUtil.java +++ b/urbanLifelineServ/common/common-auth/src/main/java/org/xyzh/common/auth/utils/JwtTokenUtil.java @@ -114,11 +114,11 @@ public class JwtTokenUtil { * @description 验证令牌 * @param token JWT令牌 * @param userId 用户ID - * @return BOOLEAN 是否有效 + * @return Boolean 是否有效 * @author yslg * @since 2025-11-07 */ - public BOOLEAN validateToken(String token, String userId) { + public Boolean validateToken(String token, String userId) { try { final String tokenUserId = getUserIdFromToken(token); return (userId.equals(tokenUserId) && !isTokenExpired(token)); @@ -130,11 +130,11 @@ public class JwtTokenUtil { /** * @description 检查令牌是否过期 * @param token JWT令牌 - * @return BOOLEAN 是否过期 + * @return Boolean 是否过期 * @author yslg * @since 2025-11-07 */ - public BOOLEAN isTokenExpired(String token) { + public Boolean isTokenExpired(String token) { final Date expiration = getExpirationDateFromToken(token); return expiration.before(new Date()); } diff --git a/urbanLifelineServ/common/common-core/src/main/java/org/xyzh/common/core/domain/LoginParam.java b/urbanLifelineServ/common/common-core/src/main/java/org/xyzh/common/core/domain/LoginParam.java index 4ddad6f..ececa82 100644 --- a/urbanLifelineServ/common/common-core/src/main/java/org/xyzh/common/core/domain/LoginParam.java +++ b/urbanLifelineServ/common/common-core/src/main/java/org/xyzh/common/core/domain/LoginParam.java @@ -78,7 +78,7 @@ public class LoginParam implements Serializable { * @author yslg * @since 2025-11-02 */ - private BOOLEAN rememberMe; + private Boolean rememberMe; } diff --git a/urbanLifelineServ/common/common-core/src/main/java/org/xyzh/common/core/domain/ResultDomain.java b/urbanLifelineServ/common/common-core/src/main/java/org/xyzh/common/core/domain/ResultDomain.java index d43aa01..1655d2d 100644 --- a/urbanLifelineServ/common/common-core/src/main/java/org/xyzh/common/core/domain/ResultDomain.java +++ b/urbanLifelineServ/common/common-core/src/main/java/org/xyzh/common/core/domain/ResultDomain.java @@ -19,8 +19,8 @@ import lombok.Data; public class ResultDomain implements Serializable { private static final long serialVersionUID = 1L; - private INTEGER code; - private BOOLEAN success; + private Integer code; + private Boolean success; private String message; private T data; private List dataList; diff --git a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/BaseDTO.java b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/BaseDTO.java index 0d6c007..e825536 100644 --- a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/BaseDTO.java +++ b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/BaseDTO.java @@ -40,5 +40,5 @@ public class BaseDTO implements Serializable { private Date deleteTime; @Schema(description = "是否已删除", defaultValue = "false") - private BOOLEAN deleted = false; + private Boolean deleted = false; } \ No newline at end of file diff --git a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysAclDTO.java b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysAclDTO.java index 5a5b0d4..f1694bb 100644 --- a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysAclDTO.java +++ b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysAclDTO.java @@ -35,11 +35,11 @@ public class TbSysAclDTO extends BaseDTO { private String principalDeptId; @Schema(description = "权限位：1读 2写 4执行") - private INTEGER permission; + private Integer permission; @Schema(description = "允许或显式拒绝", defaultValue = "true") - private BOOLEAN allow = true; + private Boolean allow = true; @Schema(description = "是否包含子级（对dept/role生效）", defaultValue = "false") - private BOOLEAN includeDescendants = false; + private Boolean includeDescendants = false; } \ No newline at end of file diff --git a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysAclPolicyDTO.java b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysAclPolicyDTO.java index 1b77791..23a9720 100644 --- a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysAclPolicyDTO.java +++ b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysAclPolicyDTO.java @@ -33,11 +33,11 @@ public class TbSysAclPolicyDTO extends BaseDTO { private String viewHierarchyRule; @Schema(description = "默认权限（无显式ACL时应用）", defaultValue = "0") - private INTEGER defaultPermission=0; + private Integer defaultPermission=0; @Schema(description = "默认是否允许", defaultValue = "true") - private BOOLEAN defaultAllow=true; + private Boolean defaultAllow=true; @Schema(description = "是否默认应用到子级", defaultValue = "true") - private BOOLEAN applyToChildren=true; + private Boolean applyToChildren=true; } \ No newline at end of file diff --git a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysConfigDTO.java b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysConfigDTO.java index 8f9c4b6..3aa1624 100644 --- a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysConfigDTO.java +++ b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysConfigDTO.java @@ -31,7 +31,7 @@ public class TbSysConfigDTO extends BaseDTO { @Schema(description = "配置值") private String value; - @Schema(description = "数据类型(String, INTEGER, BOOLEAN, Float, Double)") + @Schema(description = "数据类型(String, Integer, Boolean, Float, Double)") private String configType; @Schema(description = "配置渲染类型(select, input, textarea, checkbox, radio, switch)") @@ -53,9 +53,9 @@ public class TbSysConfigDTO extends BaseDTO { private String moduleId; @Schema(description = "配置顺序") - private INTEGER orderNum; + private Integer orderNum; @Schema(description = "配置状态 0:启用 1:禁用", defaultValue = "0") - private INTEGER status = 0; + private Integer status = 0; } \ No newline at end of file diff --git a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysRoleDTO.java b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysRoleDTO.java index 86f41e2..4ea7e9a 100644 --- a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysRoleDTO.java +++ b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysRoleDTO.java @@ -33,5 +33,5 @@ public class TbSysRoleDTO extends BaseDTO { private String ownerDeptId; @Schema(description = "角色状态 true 有效, false 无效") - private BOOLEAN status; + private Boolean status; } \ No newline at end of file diff --git a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysUserInfoDTO.java b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysUserInfoDTO.java index 65f4a04..73a42d8 100644 --- a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysUserInfoDTO.java +++ b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysUserInfoDTO.java @@ -24,7 +24,7 @@ public class TbSysUserInfoDTO extends BaseDTO { private String avatar; @Schema(description = "性别") - private INTEGER gender; + private Integer gender; @Schema(description = "姓") private String familyName; @@ -36,7 +36,7 @@ public class TbSysUserInfoDTO extends BaseDTO { private String fullName; @Schema(description = "等级") - private INTEGER level; + private Integer level; @Schema(description = "身份证号") private String idCard; diff --git a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysViewDTO.java b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysViewDTO.java index 239c4f8..1991bcf 100644 --- a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysViewDTO.java +++ b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/dto/sys/TbSysViewDTO.java @@ -37,13 +37,13 @@ public class TbSysViewDTO extends BaseDTO { private String icon; @Schema(description = "类型") - private INTEGER type; + private Integer type; @Schema(description = "布局") private String layout; @Schema(description = "排序") - private INTEGER orderNum; + private Integer orderNum; @Schema(description = "描述") private String description; diff --git a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/vo/BaseVO.java b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/vo/BaseVO.java index e2ff1d6..73e1a4b 100644 --- a/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/vo/BaseVO.java +++ b/urbanLifelineServ/common/common-dto/src/main/java/org/xyzh/common/vo/BaseVO.java @@ -47,6 +47,6 @@ public class BaseVO implements Serializable { private Date deleteTime; @Schema(description = "是否已删除", defaultValue = "false") - private BOOLEAN deleted = false; + private Boolean deleted = false; } diff --git a/urbanLifelineServ/common/common-redis/src/main/java/org/xyzh/redis/service/RedisService.java b/urbanLifelineServ/common/common-redis/src/main/java/org/xyzh/redis/service/RedisService.java index 18b8361..cc25606 100644 --- a/urbanLifelineServ/common/common-redis/src/main/java/org/xyzh/redis/service/RedisService.java +++ b/urbanLifelineServ/common/common-redis/src/main/java/org/xyzh/redis/service/RedisService.java @@ -79,11 +79,11 @@ public class RedisService { /** * @description 判断key是否存在 * @param key String 键 - * @return BOOLEAN 是否存在 + * @return Boolean 是否存在 * @author yslg * @since 2025-11-02 */ - public BOOLEAN hasKey(String key) { + public Boolean hasKey(String key) { return redisTemplate.hasKey(key); } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/NonUtils.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/NonUtils.java index 08ab816..5136a7e 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/NonUtils.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/NonUtils.java @@ -25,7 +25,7 @@ public class NonUtils { * @param obj 待判断的对象 * @return true-对象为null，false-对象不为null */ - public static BOOLEAN isNull(Object obj) { + public static Boolean isNull(Object obj) { return obj == null; } @@ -35,7 +35,7 @@ public class NonUtils { * @param obj 待判断的对象 * @return true-对象不为null，false-对象为null */ - public static BOOLEAN isNotNull(Object obj) { + public static Boolean isNotNull(Object obj) { return obj != null; } @@ -45,7 +45,7 @@ public class NonUtils { * @param objects 待判断的对象数组 * @return true-所有对象都为null，false-至少有一个对象不为null */ - public static BOOLEAN isAllNull(Object... objects) { + public static Boolean isAllNull(Object... objects) { if (objects == null || objects.length == 0) { return true; } @@ -63,7 +63,7 @@ public class NonUtils { * @param objects 待判断的对象数组 * @return true-所有对象都不为null，false-至少有一个对象为null */ - public static BOOLEAN isAllNotNull(Object... objects) { + public static Boolean isAllNotNull(Object... objects) { if (objects == null || objects.length == 0) { return false; } @@ -81,7 +81,7 @@ public class NonUtils { * @param objects 待判断的对象数组 * @return true-存在null对象，false-不存在null对象 */ - public static BOOLEAN hasNull(Object... objects) { + public static Boolean hasNull(Object... objects) { if (objects == null || objects.length == 0) { return true; } @@ -106,7 +106,7 @@ public class NonUtils { * @param obj 待判断的对象 * @return true-对象为空，false-对象不为空 */ - public static BOOLEAN isEmpty(Object obj) { + public static Boolean isEmpty(Object obj) { if (isNull(obj)) { return true; } @@ -145,7 +145,7 @@ public class NonUtils { * @param obj 待判断的对象 * @return true-对象不为空，false-对象为空 */ - public static BOOLEAN isNotEmpty(Object obj) { + public static Boolean isNotEmpty(Object obj) { return !isEmpty(obj); } @@ -155,7 +155,7 @@ public class NonUtils { * @param objects 待判断的对象数组 * @return true-所有对象都为空，false-至少有一个对象不为空 */ - public static BOOLEAN isAllEmpty(Object... objects) { + public static Boolean isAllEmpty(Object... objects) { if (objects == null || objects.length == 0) { return true; } @@ -173,7 +173,7 @@ public class NonUtils { * @param objects 待判断的对象数组 * @return true-所有对象都不为空，false-至少有一个对象为空 */ - public static BOOLEAN isAllNotEmpty(Object... objects) { + public static Boolean isAllNotEmpty(Object... objects) { if (objects == null || objects.length == 0) { return false; } @@ -191,7 +191,7 @@ public class NonUtils { * @param objects 待判断的对象数组 * @return true-存在空值，false-不存在空值 */ - public static BOOLEAN hasEmpty(Object... objects) { + public static Boolean hasEmpty(Object... objects) { if (objects == null || objects.length == 0) { return true; } @@ -212,7 +212,7 @@ public class NonUtils { * @param obj 待判断的对象 * @return true-对象为空（包括递归检查），false-对象不为空 */ - public static BOOLEAN isDeepEmpty(Object obj) { + public static Boolean isDeepEmpty(Object obj) { return isDeepEmpty(obj, new HashSet<>()); } @@ -223,7 +223,7 @@ public class NonUtils { * @param visited 已访问对象集合，用于防止循环引用 * @return true-对象为空（包括递归检查），false-对象不为空 */ - private static BOOLEAN isDeepEmpty(Object obj, Set visited) { + private static Boolean isDeepEmpty(Object obj, Set visited) { if (isEmpty(obj)) { return true; } @@ -288,7 +288,7 @@ public class NonUtils { * @param obj 待判断的对象 * @return true-对象不为空（包括递归检查），false-对象为空 */ - public static BOOLEAN isDeepNotEmpty(Object obj) { + public static Boolean isDeepNotEmpty(Object obj) { return !isDeepEmpty(obj); } @@ -300,7 +300,7 @@ public class NonUtils { * @param collection 待判断的集合 * @return true-集合为null或空，false-集合不为空 */ - public static BOOLEAN isEmptyCollection(Collection collection) { + public static Boolean isEmptyCollection(Collection collection) { return collection == null || collection.isEmpty(); } @@ -310,7 +310,7 @@ public class NonUtils { * @param collection 待判断的集合 * @return true-集合不为null且不为空，false-集合为null或空 */ - public static BOOLEAN isNotEmptyCollection(Collection collection) { + public static Boolean isNotEmptyCollection(Collection collection) { return collection != null && !collection.isEmpty(); } @@ -320,7 +320,7 @@ public class NonUtils { * @param collection 待判断的集合 * @return true-集合包含有效元素，false-集合为空或只包含null/空元素 */ - public static BOOLEAN hasValidElements(Collection collection) { + public static Boolean hasValidElements(Collection collection) { if (isEmptyCollection(collection)) { return false; } @@ -338,7 +338,7 @@ public class NonUtils { * @param collection 待判断的集合 * @return true-集合所有元素都有效，false-集合为空或包含null/空元素 */ - public static BOOLEAN allValidElements(Collection collection) { + public static Boolean allValidElements(Collection collection) { if (isEmptyCollection(collection)) { return false; } @@ -378,7 +378,7 @@ public class NonUtils { * @param map 待判断的Map * @return true-Map为null或空，false-Map不为空 */ - public static BOOLEAN isEmptyMap(Map map) { + public static Boolean isEmptyMap(Map map) { return map == null || map.isEmpty(); } @@ -388,7 +388,7 @@ public class NonUtils { * @param map 待判断的Map * @return true-Map不为null且不为空，false-Map为null或空 */ - public static BOOLEAN isNotEmptyMap(Map map) { + public static Boolean isNotEmptyMap(Map map) { return map != null && !map.isEmpty(); } @@ -400,7 +400,7 @@ public class NonUtils { * @param array 待判断的数组 * @return true-数组为null或空，false-数组不为空 */ - public static BOOLEAN isEmptyArray(Object array) { + public static Boolean isEmptyArray(Object array) { return array == null || !array.getClass().isArray() || Array.getLength(array) == 0; } @@ -410,7 +410,7 @@ public class NonUtils { * @param array 待判断的数组 * @return true-数组不为null且不为空，false-数组为null或空 */ - public static BOOLEAN isNotEmptyArray(Object array) { + public static Boolean isNotEmptyArray(Object array) { return array != null && array.getClass().isArray() && Array.getLength(array) > 0; } @@ -422,7 +422,7 @@ public class NonUtils { * @param str 待判断的字符串 * @return true-字符串为null、空或只包含空白字符，false-字符串有有效内容 */ - public static BOOLEAN isEmptyString(String str) { + public static Boolean isEmptyString(String str) { return str == null || str.trim().isEmpty(); } @@ -432,7 +432,7 @@ public class NonUtils { * @param str 待判断的字符串 * @return true-字符串不为null且有有效内容，false-字符串为null、空或只包含空白字符 */ - public static BOOLEAN isNotEmptyString(String str) { + public static Boolean isNotEmptyString(String str) { return str != null && !str.trim().isEmpty(); } @@ -581,7 +581,7 @@ public class NonUtils { * @param 目标类型 * @return true-对象不为null且为指定类型，false-否则 */ - public static BOOLEAN isInstanceAndNotNull(Object obj, Class clazz) { + public static Boolean isInstanceAndNotNull(Object obj, Class clazz) { return isNotNull(obj) && clazz.isInstance(obj); } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/ServletUtils.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/ServletUtils.java index 306c3bd..e974bb7 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/ServletUtils.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/ServletUtils.java @@ -88,7 +88,7 @@ public class ServletUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isAjaxRequest(HttpServletRequest request) { + public static Boolean isAjaxRequest(HttpServletRequest request) { String header = request.getHeader("X-Requested-With"); return "XMLHttpRequest".equalsIgnoreCase(header); } @@ -153,7 +153,7 @@ public class ServletUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isGet(HttpServletRequest request) { + public static Boolean isGet(HttpServletRequest request) { return "GET".equalsIgnoreCase(request.getMethod()); } @@ -164,7 +164,7 @@ public class ServletUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isPost(HttpServletRequest request) { + public static Boolean isPost(HttpServletRequest request) { return "POST".equalsIgnoreCase(request.getMethod()); } @@ -175,7 +175,7 @@ public class ServletUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isPut(HttpServletRequest request) { + public static Boolean isPut(HttpServletRequest request) { return "PUT".equalsIgnoreCase(request.getMethod()); } @@ -186,7 +186,7 @@ public class ServletUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isDelete(HttpServletRequest request) { + public static Boolean isDelete(HttpServletRequest request) { return "DELETE".equalsIgnoreCase(request.getMethod()); } @@ -286,7 +286,7 @@ public class ServletUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isHttps(HttpServletRequest request) { + public static Boolean isHttps(HttpServletRequest request) { return "https".equals(request.getScheme()) || request.isSecure() || "443".equals(request.getHeader("X-Forwarded-Port")) || "https".equals(request.getHeader("X-Forwarded-Proto")); @@ -311,7 +311,7 @@ public class ServletUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN hasParameter(HttpServletRequest request, String paramName) { + public static Boolean hasParameter(HttpServletRequest request, String paramName) { return request.getParameter(paramName) != null; } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/StringUtils.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/StringUtils.java index dfe3620..bbdd110 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/StringUtils.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/StringUtils.java @@ -15,7 +15,7 @@ public class StringUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isEmpty(String str) { + public static Boolean isEmpty(String str) { return str == null || str.isEmpty(); } @@ -26,7 +26,7 @@ public class StringUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isNotEmpty(String str) { + public static Boolean isNotEmpty(String str) { return !isEmpty(str); } @@ -54,7 +54,7 @@ public class StringUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN equals(String a, String b) { + public static Boolean equals(String a, String b) { return a == null ? b == null : a.equals(b); } @@ -66,7 +66,7 @@ public class StringUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN contains(String str, String sub) { + public static Boolean contains(String str, String sub) { return str != null && sub != null && str.contains(sub); } @@ -116,7 +116,7 @@ public class StringUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN startsWith(String str, String prefix) { + public static Boolean startsWith(String str, String prefix) { return str != null && prefix != null && str.startsWith(prefix); } @@ -128,7 +128,7 @@ public class StringUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN endsWith(String str, String suffix) { + public static Boolean endsWith(String str, String suffix) { return str != null && suffix != null && str.endsWith(suffix); } @@ -203,7 +203,7 @@ public class StringUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isNumeric(String str) { + public static Boolean isNumeric(String str) { if (isEmpty(str)) return false; for (int i = 0; i < str.length(); i++) { if (!Character.isDigit(str.charAt(i))) return false; @@ -218,7 +218,7 @@ public class StringUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isBlank(String str) { + public static Boolean isBlank(String str) { return str == null || str.isBlank(); } /** @@ -228,7 +228,7 @@ public class StringUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isNotBlank(String str) { + public static Boolean isNotBlank(String str) { return !isBlank(str); } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/TimeUtils.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/TimeUtils.java index ef07411..0f2a6d2 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/TimeUtils.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/TimeUtils.java @@ -265,7 +265,7 @@ public class TimeUtils { * @author yslg * @since 2025-11-02 */ - public static BOOLEAN isNowBetween(String startTime, String endTime) { + public static Boolean isNowBetween(String startTime, String endTime) { LocalTime now = LocalTime.now(); LocalTime start = LocalTime.parse(startTime, DateTimeFormatter.ofPattern("HH:mm:ss")); LocalTime end = LocalTime.parse(endTime, DateTimeFormatter.ofPattern("HH:mm:ss")); diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelColumnMapping.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelColumnMapping.java index 531395f..ce42fd2 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelColumnMapping.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelColumnMapping.java @@ -22,7 +22,7 @@ public class ExcelColumnMapping { /** * @description Excel列索引（从0开始，优先级高于列名） */ - private INTEGER columnIndex; + private Integer columnIndex; /** * @description 对象字段名 @@ -37,7 +37,7 @@ public class ExcelColumnMapping { /** * @description 是否必填 */ - private BOOLEAN required = false; + private Boolean required = false; /** * @description 默认值 @@ -62,7 +62,7 @@ public class ExcelColumnMapping { return columnName; } - public INTEGER getColumnIndex() { + public Integer getColumnIndex() { return columnIndex; } @@ -74,7 +74,7 @@ public class ExcelColumnMapping { return fieldType; } - public BOOLEAN isRequired() { + public Boolean isRequired() { return required; } @@ -131,7 +131,7 @@ public class ExcelColumnMapping { /** * 设置是否必填 */ - public Builder required(BOOLEAN required) { + public Builder required(Boolean required) { mapping.required = required; return this; } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelReadResult.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelReadResult.java index 2864ce8..3e46fa4 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelReadResult.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelReadResult.java @@ -17,7 +17,7 @@ public class ExcelReadResult { /** * @description 是否成功 */ - private BOOLEAN success; + private Boolean success; /** * @description 成功读取的数据列表 @@ -27,7 +27,7 @@ public class ExcelReadResult { /** * @description 失败的行数据（行号 -> 错误信息） */ - private Map errorRowsMap; + private Map errorRowsMap; /** * @description 总行数（不包括表头） @@ -58,11 +58,11 @@ public class ExcelReadResult { this.errorRowsCount = 0; } - public BOOLEAN isSuccess() { + public Boolean isSuccess() { return success; } - public void setSuccess(BOOLEAN success) { + public void setSuccess(Boolean success) { this.success = success; } @@ -74,11 +74,11 @@ public class ExcelReadResult { this.dataList = dataList; } - public Map getErrorRows() { + public Map getErrorRows() { return errorRowsMap; } - public void setErrorRows(Map errorRowsMap) { + public void setErrorRows(Map errorRowsMap) { this.errorRowsMap = errorRowsMap; } @@ -124,7 +124,7 @@ public class ExcelReadResult { this.errorRowsCount++; } - public BOOLEAN hasErrors() { + public Boolean hasErrors() { return this.errorRowsCount > 0; } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelReaderUtils.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelReaderUtils.java index a16be44..0831112 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelReaderUtils.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelReaderUtils.java @@ -97,9 +97,9 @@ public class ExcelReaderUtils { int dataStartRowIndex = (int) options.getOrDefault("dataStartRowIndex", 1); int sheetIndex = (int) options.getOrDefault("sheetIndex", 0); String sheetName = (String) options.get("sheetName"); - BOOLEAN skipEmptyRow = (BOOLEAN) options.getOrDefault("skipEmptyRow", true); + Boolean skipEmptyRow = (Boolean) options.getOrDefault("skipEmptyRow", true); int maxRows = (int) options.getOrDefault("maxRows", 0); - BOOLEAN continueOnError = (BOOLEAN) options.getOrDefault("continueOnError", true); + Boolean continueOnError = (Boolean) options.getOrDefault("continueOnError", true); // 创建Workbook Workbook workbook = createWorkbook(inputStream, fileName); @@ -113,7 +113,7 @@ public class ExcelReaderUtils { } // 解析表头 - Map headerMap = parseHeader(sheet, headerRowIndex); + Map headerMap = parseHeader(sheet, headerRowIndex); // 读取数据 readData(sheet, headerMap, targetClass, columnMappings, dataStartRowIndex, @@ -156,8 +156,8 @@ public class ExcelReaderUtils { /** * @description 解析表头 */ - private static Map parseHeader(Sheet sheet, int headerRowIndex) { - Map headerMap = new HashMap<>(); + private static Map parseHeader(Sheet sheet, int headerRowIndex) { + Map headerMap = new HashMap<>(); Row headerRow = sheet.getRow(headerRowIndex); if (headerRow != null) { @@ -175,10 +175,10 @@ public class ExcelReaderUtils { /** * @description 读取数据 */ - private static void readData(Sheet sheet, Map headerMap, + private static void readData(Sheet sheet, Map headerMap, Class targetClass, List columnMappings, - int startRow, BOOLEAN skipEmptyRow, int maxRows, - BOOLEAN continueOnError, ExcelReadResult result) { + int startRow, Boolean skipEmptyRow, int maxRows, + Boolean continueOnError, ExcelReadResult result) { int lastRowNum = sheet.getLastRowNum(); int endRow = maxRows > 0 ? Math.min(startRow + maxRows, lastRowNum + 1) : lastRowNum + 1; @@ -229,7 +229,7 @@ public class ExcelReaderUtils { /** * @description 判断是否为空行 */ - private static BOOLEAN isEmptyRow(Row row) { + private static Boolean isEmptyRow(Row row) { if (row == null) { return true; } @@ -249,7 +249,7 @@ public class ExcelReaderUtils { /** * @description 将行数据转换为对象 */ - private static Object convertRowToObject(Row row, Map headerMap, + private static Object convertRowToObject(Row row, Map headerMap, Class targetClass, List columnMappings, int rowNum) throws Exception { Object obj = targetClass.getDeclaredConstructor().newInstance(); @@ -307,7 +307,7 @@ public class ExcelReaderUtils { /** * @description 获取单元格 */ - private static Cell getCell(Row row, ExcelColumnMapping mapping, Map headerMap) { + private static Cell getCell(Row row, ExcelColumnMapping mapping, Map headerMap) { if (row == null) { return null; } @@ -318,7 +318,7 @@ public class ExcelReaderUtils { } // 使用列名 - INTEGER columnIndex = headerMap.get(mapping.getColumnName()); + Integer columnIndex = headerMap.get(mapping.getColumnName()); if (columnIndex != null) { return row.getCell(columnIndex); } @@ -344,7 +344,7 @@ public class ExcelReaderUtils { return cell.getNumericCellValue(); } case BOOLEAN: - return cell.getBOOLEANCellValue(); + return cell.getBooleanCellValue(); case FORMULA: return cell.getCellFormula(); case BLANK: @@ -370,11 +370,11 @@ public class ExcelReaderUtils { } // INTEGER类型 - if (targetType == INTEGER.class || targetType == int.class) { + if (targetType == Integer.class || targetType == int.class) { if (value instanceof Number) { return ((Number) value).intValue(); } - return INTEGER.parseInt(strValue); + return Integer.parseInt(strValue); } // Long类型 @@ -402,11 +402,11 @@ public class ExcelReaderUtils { } // BOOLEAN类型 - if (targetType == BOOLEAN.class || targetType == BOOLEAN.class) { - if (value instanceof BOOLEAN) { + if (targetType == Boolean.class || targetType == boolean.class) { + if (value instanceof Boolean) { return value; } - return BOOLEAN.parseBOOLEAN(strValue) || "1".equals(strValue) || + return Boolean.parseBoolean(strValue) || "1".equals(strValue) || "是".equals(strValue) || "true".equalsIgnoreCase(strValue); } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelUtilsExample.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelUtilsExample.java index ac03b81..c5c946f 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelUtilsExample.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/ExcelUtilsExample.java @@ -20,19 +20,19 @@ public class ExcelUtilsExample { */ public static class UserInfo { private String name; - private INTEGER age; + private Integer age; private String phone; private String email; private String idCard; private Date joinDate; - private BOOLEAN active; + private Boolean active; // Getters and Setters public String getName() { return name; } public void setName(String name) { this.name = name; } - public INTEGER getAge() { return age; } - public void setAge(INTEGER age) { this.age = age; } + public Integer getAge() { return age; } + public void setAge(Integer age) { this.age = age; } public String getPhone() { return phone; } public void setPhone(String phone) { this.phone = phone; } @@ -46,8 +46,8 @@ public class ExcelUtilsExample { public Date getJoinDate() { return joinDate; } public void setJoinDate(Date joinDate) { this.joinDate = joinDate; } - public BOOLEAN getActive() { return active; } - public void setActive(BOOLEAN active) { this.active = active; } + public Boolean getActive() { return active; } + public void setActive(Boolean active) { this.active = active; } @Override public String toString() { @@ -81,7 +81,7 @@ public class ExcelUtilsExample { ExcelColumnMapping.builder() .columnName("年龄") .fieldName("age") - .fieldType(INTEGER.class) + .fieldType(Integer.class) .required() .build(), @@ -116,7 +116,7 @@ public class ExcelUtilsExample { ExcelColumnMapping.builder() .columnName("是否在职") .fieldName("active") - .fieldType(BOOLEAN.class) + .fieldType(Boolean.class) .defaultValue("true") .build() ); @@ -172,7 +172,7 @@ public class ExcelUtilsExample { ExcelColumnMapping.builder() .columnName("年龄") .fieldName("age") - .fieldType(INTEGER.class) + .fieldType(Integer.class) .required() .addValidation( ValidationParam.builder() @@ -180,7 +180,7 @@ public class ExcelUtilsExample { .fieldLabel("年龄") .required() .customValidator(value -> { - INTEGER age = (INTEGER) value; + Integer age = (Integer) value; return age >= 18 && age <= 65; }) .customErrorMessage("年龄必须在18-65岁之间") @@ -277,7 +277,7 @@ public class ExcelUtilsExample { ExcelColumnMapping.builder() .columnIndex(1) // 第2列 .fieldName("age") - .fieldType(INTEGER.class) + .fieldType(Integer.class) .required() .build(), @@ -316,7 +316,7 @@ public class ExcelUtilsExample { ExcelColumnMapping.builder() .columnName("年龄") .fieldName("age") - .fieldType(INTEGER.class) + .fieldType(Integer.class) .required() .build() ); diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/README.md b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/README.md index a2ef75b..6095dd9 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/README.md +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/excel/README.md @@ -37,11 +37,11 @@ ```java public class UserInfo { private String name; - private INTEGER age; + private Integer age; private String phone; private String email; private Date joinDate; - private BOOLEAN active; + private Boolean active; // Getters and Setters... } @@ -61,7 +61,7 @@ List columnMappings = Arrays.asList( ExcelColumnMapping.builder() .columnName("年龄") .fieldName("age") - .fieldType(INTEGER.class) + .fieldType(Integer.class) .required() .build(), @@ -88,7 +88,7 @@ List columnMappings = Arrays.asList( ExcelColumnMapping.builder() .columnName("是否在职") .fieldName("active") - .fieldType(BOOLEAN.class) + .fieldType(Boolean.class) .defaultValue("true") .build() ); @@ -140,7 +140,7 @@ List columnMappings = Arrays.asList( ExcelColumnMapping.builder() .columnName("年龄") .fieldName("age") - .fieldType(INTEGER.class) + .fieldType(Integer.class) .required() .addValidation( ValidationParam.builder() @@ -148,7 +148,7 @@ List columnMappings = Arrays.asList( .fieldLabel("年龄") .required() .customValidator(value -> { - INTEGER age = (INTEGER) value; + Integer age = (Integer) value; return age >= 18 && age <= 65; }) .customErrorMessage("年龄必须在18-65岁之间") @@ -227,7 +227,7 @@ List columnMappings = Arrays.asList( ExcelColumnMapping.builder() .columnIndex(1) // 第2列 .fieldName("age") - .fieldType(INTEGER.class) + .fieldType(Integer.class) .required() .build(), @@ -282,7 +282,7 @@ List validationParams = Arrays.asList( .fieldLabel("年龄") .required() .customValidator(value -> { - INTEGER age = (INTEGER) value; + Integer age = (Integer) value; return age >= 18 && age <= 65; }) .customErrorMessage("年龄必须在18-65岁之间") @@ -422,11 +422,11 @@ public ResultDomain importUsers(@RequestParam("file") MultipartFile file ## 支持的数据类型 - **String** - 字符串 -- **INTEGER/int** - 整数 +- **Integer/int** - 整数 - **Long/long** - 长整数 - **Double/double** - 双精度浮点数 - **Float/float** - 单精度浮点数 -- **BOOLEAN/BOOLEAN** - 布尔值（支持：true/false、1/0、是/否） +- **Boolean/Boolean** - 布尔值（支持：true/false、1/0、是/否） - **Date** - 日期（需指定dateFormat） ## 配置选项 @@ -439,7 +439,7 @@ public ResultDomain importUsers(@RequestParam("file") MultipartFile file | columnIndex(int) | 设置Excel列索引（从0开始，优先级高于columnName） | columnName和columnIndex至少一个 | | fieldName(String) | 设置对象字段名 | 是 | | fieldType(Class) | 设置字段类型 | 否（默认String.class） | -| required() / required(BOOLEAN) | 设置是否必填 | 否（默认false） | +| required() / required(Boolean) | 设置是否必填 | 否（默认false） | | defaultValue(String) | 设置默认值 | 否 | | dateFormat(String) | 设置日期格式 | 否（默认"yyyy-MM-dd"） | | addValidation(ValidationParam) | 添加校验参数 | 否 | @@ -455,9 +455,9 @@ public ResultDomain importUsers(@RequestParam("file") MultipartFile file | dataStartRowIndex | int | 数据起始行（从0开始） | 1 | | sheetIndex | int | Sheet索引（从0开始） | 0 | | sheetName | String | Sheet名称（优先级高于sheetIndex） | null | -| skipEmptyRow | BOOLEAN | 跳过空行 | true | +| skipEmptyRow | Boolean | 跳过空行 | true | | maxRows | int | 最大读取行数（0=不限制） | 0 | -| continueOnError | BOOLEAN | 遇到错误继续读取 | true | +| continueOnError | Boolean | 遇到错误继续读取 | true | ## 核心特性 @@ -480,7 +480,7 @@ public ResultDomain importUsers(@RequestParam("file") MultipartFile file 5. **布尔类型**：支持多种格式（true/false、1/0、是/否） 6. **错误处理**：根据continueOnError选项决定遇到错误时是否继续 7. **文件格式**：支持.xls和.xlsx两种格式 -8. **类型转换**：自动转换支持String、INTEGER、Long、Double、Float、BOOLEAN、Date +8. **类型转换**：自动转换支持String、Interge、Long、Double、Float、Boolean、Date ## 依赖 diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/README.md b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/README.md index 479dee3..63f9fc9 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/README.md +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/README.md @@ -177,7 +177,7 @@ ValidationParam param = ValidationParam.builder() .fieldLabel("年龄") .required() .customValidator(value -> { - INTEGER age = (INTEGER) value; + Integer age = (Integer) value; return age >= 18 && age <= 60; }) .customErrorMessage("年龄必须在18-60岁之间") @@ -342,7 +342,7 @@ public ResultDomain register(@RequestBody Map params) { public class CustomValidateMethod implements ValidateMethod { @Override - public BOOLEAN validate(Object value) { + public Boolean validate(Object value) { // 实现校验逻辑 return true; } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationParam.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationParam.java index 4923001..2af3117 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationParam.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationParam.java @@ -27,7 +27,7 @@ public class ValidationParam { /** * @description 是否必传 */ - private BOOLEAN required; + private Boolean required; /** * @description 字段类型 @@ -37,12 +37,12 @@ public class ValidationParam { /** * @description 最小长度（字符串） */ - private INTEGER minLength; + private Integer minLength; /** * @description 最大长度（字符串） */ - private INTEGER maxLength; + private Integer maxLength; /** * @description 最小值（数字） @@ -77,7 +77,7 @@ public class ValidationParam { /** * @description 是否允许为空字符串（默认不允许） */ - private BOOLEAN allowEmpty = false; + private Boolean allowEmpty = false; /** * @description 校验方法（使用预定义的校验方法） @@ -106,7 +106,7 @@ public class ValidationParam { return fieldLabel; } - public BOOLEAN isRequired() { + public Boolean isRequired() { return required; } @@ -114,11 +114,11 @@ public class ValidationParam { return fieldType; } - public INTEGER getMinLength() { + public Integer getMinLength() { return minLength; } - public INTEGER getMaxLength() { + public Integer getMaxLength() { return maxLength; } @@ -146,7 +146,7 @@ public class ValidationParam { return customErrorMessage; } - public BOOLEAN isAllowEmpty() { + public Boolean isAllowEmpty() { return allowEmpty; } @@ -178,7 +178,7 @@ public class ValidationParam { return this; } - public Builder required(BOOLEAN required) { + public Builder required(Boolean required) { param.required = required; return this; } @@ -193,12 +193,12 @@ public class ValidationParam { return this; } - public Builder minLength(INTEGER minLength) { + public Builder minLength(Integer minLength) { param.minLength = minLength; return this; } - public Builder maxLength(INTEGER maxLength) { + public Builder maxLength(Integer maxLength) { param.maxLength = maxLength; return this; } @@ -233,7 +233,7 @@ public class ValidationParam { return this; } - public Builder allowEmpty(BOOLEAN allowEmpty) { + public Builder allowEmpty(Boolean allowEmpty) { param.allowEmpty = allowEmpty; return this; } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationResult.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationResult.java index abb175e..37e0e5a 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationResult.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationResult.java @@ -15,7 +15,7 @@ public class ValidationResult { /** * @description 是否校验通过 */ - private BOOLEAN valid; + private Boolean valid; /** * @description 错误信息列表 @@ -32,11 +32,11 @@ public class ValidationResult { this.errors = new ArrayList<>(); } - public BOOLEAN isValid() { + public Boolean isValid() { return valid; } - public void setValid(BOOLEAN valid) { + public void setValid(Boolean valid) { this.valid = valid; } @@ -70,9 +70,9 @@ public class ValidationResult { /** * @description 是否有错误 - * @return BOOLEAN + * @return Boolean */ - public BOOLEAN hasErrors() { + public Boolean hasErrors() { return !valid; } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationUtils.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationUtils.java index 7debb4b..c467840 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationUtils.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/ValidationUtils.java @@ -289,7 +289,7 @@ public class ValidationUtils { * @param required 是否必填 * @return ValidationParam */ - public static ValidationParam email(String fieldName, String fieldLabel, BOOLEAN required) { + public static ValidationParam email(String fieldName, String fieldLabel, Boolean required) { return ValidationParam.builder() .fieldName(fieldName) .fieldLabel(fieldLabel) @@ -307,7 +307,7 @@ public class ValidationUtils { * @param required 是否必填 * @return ValidationParam */ - public static ValidationParam phone(String fieldName, String fieldLabel, BOOLEAN required) { + public static ValidationParam phone(String fieldName, String fieldLabel, Boolean required) { return ValidationParam.builder() .fieldName(fieldName) .fieldLabel(fieldLabel) diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/BankCardValidateMethod.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/BankCardValidateMethod.java index 5d418a2..5cff10f 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/BankCardValidateMethod.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/BankCardValidateMethod.java @@ -10,7 +10,7 @@ package org.xyzh.common.utils.validation.method; public class BankCardValidateMethod implements ValidateMethod { @Override - public BOOLEAN validate(Object value) { + public Boolean validate(Object value) { if (value == null || !(value instanceof String)) { return false; } @@ -34,11 +34,11 @@ public class BankCardValidateMethod implements ValidateMethod { /** * @description Luhn算法校验（银行卡校验算法） * @param cardNumber 银行卡号 - * @return BOOLEAN 是否通过校验 + * @return Boolean 是否通过校验 */ - private BOOLEAN luhnCheck(String cardNumber) { + private Boolean luhnCheck(String cardNumber) { int sum = 0; - BOOLEAN alternate = false; + Boolean alternate = false; // 从右向左遍历 for (int i = cardNumber.length() - 1; i >= 0; i--) { diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/ChineseValidateMethod.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/ChineseValidateMethod.java index 7ccad69..13bd89f 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/ChineseValidateMethod.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/ChineseValidateMethod.java @@ -14,18 +14,18 @@ public class ChineseValidateMethod implements ValidateMethod { // 中文字符正则（包括中文标点符号） private static final Pattern CHINESE_PATTERN = Pattern.compile("^[\u4e00-\u9fa5]+$"); - private final BOOLEAN allowPunctuation; // 是否允许中文标点符号 + private final Boolean allowPunctuation; // 是否允许中文标点符号 public ChineseValidateMethod() { this.allowPunctuation = false; } - public ChineseValidateMethod(BOOLEAN allowPunctuation) { + public ChineseValidateMethod(Boolean allowPunctuation) { this.allowPunctuation = allowPunctuation; } @Override - public BOOLEAN validate(Object value) { + public Boolean validate(Object value) { if (value == null || !(value instanceof String)) { return false; } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/EmailValidateMethod.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/EmailValidateMethod.java index 8f89fbb..ef04d6d 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/EmailValidateMethod.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/EmailValidateMethod.java @@ -34,7 +34,7 @@ public class EmailValidateMethod implements ValidateMethod { } @Override - public BOOLEAN validate(Object value) { + public Boolean validate(Object value) { if (value == null || !(value instanceof String)) { return false; } @@ -48,7 +48,7 @@ public class EmailValidateMethod implements ValidateMethod { // 域名限制校验 if (allowedDomains != null && allowedDomains.length > 0) { - BOOLEAN domainMatched = false; + Boolean domainMatched = false; for (String domain : allowedDomains) { if (email.endsWith("@" + domain.toLowerCase())) { domainMatched = true; diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/IdCardValidateMethod.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/IdCardValidateMethod.java index de4be89..164bf9a 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/IdCardValidateMethod.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/IdCardValidateMethod.java @@ -60,7 +60,7 @@ public class IdCardValidateMethod implements ValidateMethod { } @Override - public BOOLEAN validate(Object value) { + public Boolean validate(Object value) { if (value == null || !(value instanceof String)) { return false; } @@ -83,7 +83,7 @@ public class IdCardValidateMethod implements ValidateMethod { /** * @description 校验15位身份证 */ - private BOOLEAN validate15IdCard(String idCard) { + private Boolean validate15IdCard(String idCard) { // 15位身份证格式：省(2位)市(2位)县(2位)年(2位)月(2位)日(2位)顺序号(3位) if (!Pattern.matches("^\\d{15}$", idCard)) { return false; @@ -106,7 +106,7 @@ public class IdCardValidateMethod implements ValidateMethod { /** * @description 校验18位身份证 */ - private BOOLEAN validate18IdCard(String idCard) { + private Boolean validate18IdCard(String idCard) { // 18位身份证格式：省(2位)市(2位)县(2位)年(4位)月(2位)日(2位)顺序号(3位)校验码(1位) if (!Pattern.matches("^\\d{17}[0-9Xx]$", idCard)) { return false; @@ -134,11 +134,11 @@ public class IdCardValidateMethod implements ValidateMethod { /** * @description 校验日期是否合法 */ - private BOOLEAN validateDate(String year, String month, String day) { + private Boolean validateDate(String year, String month, String day) { try { - int y = INTEGER.parseInt(year); - int m = INTEGER.parseInt(month); - int d = INTEGER.parseInt(day); + int y = Integer.parseInt(year); + int m = Integer.parseInt(month); + int d = Integer.parseInt(day); // 年份范围：1900-当前年份 int currentYear = java.time.Year.now().getValue(); @@ -168,14 +168,14 @@ public class IdCardValidateMethod implements ValidateMethod { /** * @description 判断是否为闰年 */ - private BOOLEAN isLeapYear(int year) { + private Boolean isLeapYear(int year) { return (year % 4 == 0 && year % 100 != 0) || (year % 400 == 0); } /** * @description 校验18位身份证的校验码 */ - private BOOLEAN validateCheckCode(String idCard) { + private Boolean validateCheckCode(String idCard) { int sum = 0; for (int i = 0; i < 17; i++) { sum += (idCard.charAt(i) - '0') * WEIGHT[i]; diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/PasswordValidateMethod.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/PasswordValidateMethod.java index 15218c6..ad206e7 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/PasswordValidateMethod.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/PasswordValidateMethod.java @@ -13,10 +13,10 @@ public class PasswordValidateMethod implements ValidateMethod { private final int minLength; private final int maxLength; - private final BOOLEAN requireUpperCase; - private final BOOLEAN requireLowerCase; - private final BOOLEAN requireDigit; - private final BOOLEAN requireSpecialChar; + private final Boolean requireUpperCase; + private final Boolean requireLowerCase; + private final Boolean requireDigit; + private final Boolean requireSpecialChar; /** * @description 默认密码规则：6-20位，必须包含字母和数字 @@ -35,8 +35,8 @@ public class PasswordValidateMethod implements ValidateMethod { * @param requireSpecialChar 是否需要特殊字符 */ public PasswordValidateMethod(int minLength, int maxLength, - BOOLEAN requireUpperCase, BOOLEAN requireLowerCase, - BOOLEAN requireDigit, BOOLEAN requireSpecialChar) { + Boolean requireUpperCase, Boolean requireLowerCase, + Boolean requireDigit, Boolean requireSpecialChar) { this.minLength = minLength; this.maxLength = maxLength; this.requireUpperCase = requireUpperCase; @@ -46,7 +46,7 @@ public class PasswordValidateMethod implements ValidateMethod { } @Override - public BOOLEAN validate(Object value) { + public Boolean validate(Object value) { if (value == null || !(value instanceof String)) { return false; } @@ -88,7 +88,7 @@ public class PasswordValidateMethod implements ValidateMethod { if (requireUpperCase || requireLowerCase || requireDigit || requireSpecialChar) { msg.append("，且包含"); - BOOLEAN first = true; + Boolean first = true; if (requireUpperCase) { msg.append("大写字母"); diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/PhoneValidateMethod.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/PhoneValidateMethod.java index c0a7328..dfc8efc 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/PhoneValidateMethod.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/PhoneValidateMethod.java @@ -20,18 +20,18 @@ public class PhoneValidateMethod implements ValidateMethod { // 台湾手机号正则 private static final Pattern TW_PHONE_PATTERN = Pattern.compile("^09\\d{8}$"); - private final BOOLEAN strictMode; // 严格模式，只验证中国大陆手机号 + private final Boolean strictMode; // 严格模式，只验证中国大陆手机号 public PhoneValidateMethod() { this.strictMode = true; } - public PhoneValidateMethod(BOOLEAN strictMode) { + public PhoneValidateMethod(Boolean strictMode) { this.strictMode = strictMode; } @Override - public BOOLEAN validate(Object value) { + public Boolean validate(Object value) { if (value == null || !(value instanceof String)) { return false; } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/UrlValidateMethod.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/UrlValidateMethod.java index af34acd..104d695 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/UrlValidateMethod.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/UrlValidateMethod.java @@ -16,18 +16,18 @@ public class UrlValidateMethod implements ValidateMethod { "^(https?|ftp)://[a-zA-Z0-9+&@#/%?=~_|!:,.;-]*[a-zA-Z0-9+&@#/%=~_|-]$" ); - private final BOOLEAN requireHttps; // 是否要求HTTPS + private final Boolean requireHttps; // 是否要求HTTPS public UrlValidateMethod() { this.requireHttps = false; } - public UrlValidateMethod(BOOLEAN requireHttps) { + public UrlValidateMethod(Boolean requireHttps) { this.requireHttps = requireHttps; } @Override - public BOOLEAN validate(Object value) { + public Boolean validate(Object value) { if (value == null || !(value instanceof String)) { return false; } diff --git a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/ValidateMethod.java b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/ValidateMethod.java index 6a9d711..877a0fd 100644 --- a/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/ValidateMethod.java +++ b/urbanLifelineServ/common/common-utils/src/main/java/org/xyzh/common/utils/validation/method/ValidateMethod.java @@ -12,9 +12,9 @@ public interface ValidateMethod { /** * @description 校验方法 * @param value 待校验的值 - * @return BOOLEAN 是否校验通过 + * @return Boolean 是否校验通过 */ - BOOLEAN validate(Object value); + Boolean validate(Object value); /** * @description 获取校验失败的错误提示信息 diff --git a/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/DeptRoleController.java b/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/DeptRoleController.java index 7a8bb6c..a1c6514 100644 --- a/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/DeptRoleController.java +++ b/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/DeptRoleController.java @@ -56,12 +56,12 @@ public class DeptRoleController { /** * @description 删除部门 * @param deptDTO 部门DTO - * @return ResultDomain 删除结果 + * @return ResultDomain 删除结果 * @author yslg * @since 2025-11-10 */ @DeleteMapping("/dept") - public ResultDomain deleteDept(@RequestBody TbSysDeptDTO deptDTO) { + public ResultDomain deleteDept(@RequestBody TbSysDeptDTO deptDTO) { return deptRoleService.deleteDept(deptDTO); } @@ -117,12 +117,12 @@ public class DeptRoleController { /** * @description 删除角色 * @param roleDTO 角色DTO - * @return ResultDomain 删除结果 + * @return ResultDomain 删除结果 * @author yslg * @since 2025-11-10 */ @DeleteMapping("/role") - public ResultDomain deleteRole(@RequestBody TbSysRoleDTO roleDTO) { + public ResultDomain deleteRole(@RequestBody TbSysRoleDTO roleDTO) { return deptRoleService.deleteRole(roleDTO); } diff --git a/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/PermissionController.java b/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/PermissionController.java index 863b9cc..e509027 100644 --- a/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/PermissionController.java +++ b/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/PermissionController.java @@ -59,7 +59,7 @@ public class PermissionController { * @since 2025-11-10 */ @DeleteMapping("/module") - public ResultDomain deleteModule(@RequestBody TbSysModuleDTO moduleDTO) { + public ResultDomain deleteModule(@RequestBody TbSysModuleDTO moduleDTO) { return modulePermissionService.deleteModule(moduleDTO); } @@ -120,7 +120,7 @@ public class PermissionController { * @since 2025-11-10 */ @DeleteMapping - public ResultDomain deletePermission(@RequestBody TbSysPermissionDTO permissionDTO) { + public ResultDomain deletePermission(@RequestBody TbSysPermissionDTO permissionDTO) { return modulePermissionService.deletePermission(permissionDTO); } diff --git a/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/SysConfigController.java b/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/SysConfigController.java index ecc7fbe..48c3482 100644 --- a/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/SysConfigController.java +++ b/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/SysConfigController.java @@ -38,7 +38,7 @@ public class SysConfigController { } @DeleteMapping - public ResultDomain deleteConfig(@RequestBody TbSysConfigDTO configDTO) { + public ResultDomain deleteConfig(@RequestBody TbSysConfigDTO configDTO) { return sysConfigService.deleteConfig(configDTO); } diff --git a/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/UserController.java b/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/UserController.java index 65e7d65..ea47c30 100644 --- a/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/UserController.java +++ b/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/UserController.java @@ -44,7 +44,7 @@ public class UserController { @DeleteMapping @PreAuthorize("hasAuthority('system:user:delete')") - public ResultDomain deleteUser(@RequestBody TbSysUserDTO userDTO) { + public ResultDomain deleteUser(@RequestBody TbSysUserDTO userDTO) { return sysUserService.deleteUser(userDTO); } diff --git a/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/ViewController.java b/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/ViewController.java index d779a74..4e50d9a 100644 --- a/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/ViewController.java +++ b/urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/ViewController.java @@ -36,7 +36,7 @@ public class ViewController { } @DeleteMapping - public ResultDomain deleteView(@RequestBody TbSysViewDTO viewDTO) { + public ResultDomain deleteView(@RequestBody TbSysViewDTO viewDTO) { return viewService.deleteView(viewDTO); } diff --git a/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/DeptRoleServiceImpl.java b/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/DeptRoleServiceImpl.java index 2b44214..0c52502 100644 --- a/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/DeptRoleServiceImpl.java +++ b/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/DeptRoleServiceImpl.java @@ -104,14 +104,14 @@ public class DeptRoleServiceImpl implements DeptRoleService { } @Override - public ResultDomain deleteDept(TbSysDeptDTO deptDTO) { + public ResultDomain deleteDept(TbSysDeptDTO deptDTO) { if (deptDTO == null || StringUtils.isBlank(deptDTO.getDeptId())) { return ResultDomain.failure(MSG_DEPT_ID_REQUIRED); } int rows = deptMapper.deleteDept(deptDTO); if (rows > 0) { logger.info("删除部门成功, deptId={}", deptDTO.getDeptId()); - return ResultDomain.success("删除部门成功", BOOLEAN.TRUE); + return ResultDomain.success("删除部门成功", Boolean.TRUE); } logger.warn("删除部门失败, deptId={}", deptDTO.getDeptId()); return ResultDomain.failure("删除部门失败"); @@ -203,14 +203,14 @@ public class DeptRoleServiceImpl implements DeptRoleService { } @Override - public ResultDomain deleteRole(TbSysRoleDTO roleDTO) { + public ResultDomain deleteRole(TbSysRoleDTO roleDTO) { if (roleDTO == null || StringUtils.isBlank(roleDTO.getRoleId())) { return ResultDomain.failure(MSG_ROLE_ID_REQUIRED); } int rows = roleMapper.deleteRole(roleDTO); if (rows > 0) { logger.info("删除角色成功, roleId={}", roleDTO.getRoleId()); - return ResultDomain.success("删除角色成功", BOOLEAN.TRUE); + return ResultDomain.success("删除角色成功", Boolean.TRUE); } logger.warn("删除角色失败, roleId={}", roleDTO.getRoleId()); return ResultDomain.failure("删除角色失败"); @@ -322,14 +322,14 @@ public class DeptRoleServiceImpl implements DeptRoleService { } @Override - public ResultDomain deleteDeptRole(TbSysDeptRoleDTO deptRoleDTO) { + public ResultDomain deleteDeptRole(TbSysDeptRoleDTO deptRoleDTO) { if (deptRoleDTO == null || StringUtils.isBlank(deptRoleDTO.getDeptId()) || StringUtils.isBlank(deptRoleDTO.getRoleId())) { return ResultDomain.failure(MSG_DEPT_ROLE_ID_REQUIRED); } int rows = deptRoleMapper.deleteDeptRole(deptRoleDTO); if (rows > 0) { logger.info("删除部门角色关联成功, deptId={}, roleId={}", deptRoleDTO.getDeptId(), deptRoleDTO.getRoleId()); - return ResultDomain.success("删除部门角色关联成功", BOOLEAN.TRUE); + return ResultDomain.success("删除部门角色关联成功", Boolean.TRUE); } logger.warn("删除部门角色关联失败, deptId={}, roleId={}", deptRoleDTO.getDeptId(), deptRoleDTO.getRoleId()); return ResultDomain.failure("删除部门角色关联失败"); diff --git a/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/ModulePermissionServiceImpl.java b/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/ModulePermissionServiceImpl.java index 77b5a2f..6ed8ded 100644 --- a/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/ModulePermissionServiceImpl.java +++ b/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/ModulePermissionServiceImpl.java @@ -94,14 +94,14 @@ public class ModulePermissionServiceImpl implements ModulePermissionService { } @Override - public ResultDomain deleteModule(TbSysModuleDTO moduleDTO) { + public ResultDomain deleteModule(TbSysModuleDTO moduleDTO) { if (moduleDTO == null || StringUtils.isBlank(moduleDTO.getModuleId())) { return ResultDomain.failure(MSG_MODULE_ID_REQUIRED); } int rows = moduleMapper.deleteModule(moduleDTO); if (rows > 0) { logger.info("删除模块成功, moduleId={}", moduleDTO.getModuleId()); - return ResultDomain.success("删除模块成功", BOOLEAN.TRUE); + return ResultDomain.success("删除模块成功", Boolean.TRUE); } logger.warn("删除模块失败, moduleId={}", moduleDTO.getModuleId()); return ResultDomain.failure("删除模块失败"); @@ -171,14 +171,14 @@ public class ModulePermissionServiceImpl implements ModulePermissionService { } @Override - public ResultDomain deletePermission(TbSysPermissionDTO permissionDTO) { + public ResultDomain deletePermission(TbSysPermissionDTO permissionDTO) { if (permissionDTO == null || StringUtils.isBlank(permissionDTO.getPermissionId())) { return ResultDomain.failure(MSG_PERMISSION_ID_REQUIRED); } int rows = permissionMapper.deletePermission(permissionDTO); if (rows > 0) { logger.info("删除权限成功, permissionId={}", permissionDTO.getPermissionId()); - return ResultDomain.success("删除权限成功", BOOLEAN.TRUE); + return ResultDomain.success("删除权限成功", Boolean.TRUE); } logger.warn("删除权限失败, permissionId={}", permissionDTO.getPermissionId()); return ResultDomain.failure("删除权限失败"); diff --git a/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/SysConfigServiceImpl.java b/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/SysConfigServiceImpl.java index 1fb55f3..9b05876 100644 --- a/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/SysConfigServiceImpl.java +++ b/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/SysConfigServiceImpl.java @@ -80,14 +80,14 @@ public class SysConfigServiceImpl implements SysConfigService { } @Override - public ResultDomain deleteConfig(TbSysConfigDTO configDTO) { + public ResultDomain deleteConfig(TbSysConfigDTO configDTO) { if (configDTO == null || StringUtils.isBlank(configDTO.getConfigId())) { return ResultDomain.failure(MSG_CONFIG_ID_REQUIRED); } int rows = configMapper.deleteConfig(configDTO); if (rows > 0) { logger.info("删除配置成功, configId={}", configDTO.getConfigId()); - return ResultDomain.success("删除配置成功", BOOLEAN.TRUE); + return ResultDomain.success("删除配置成功", Boolean.TRUE); } logger.warn("删除配置失败, configId={}", configDTO.getConfigId()); return ResultDomain.failure("删除配置失败"); diff --git a/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/SysUserServiceImpl.java b/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/SysUserServiceImpl.java index 5c28e4f..713f97d 100644 --- a/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/SysUserServiceImpl.java +++ b/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/SysUserServiceImpl.java @@ -93,14 +93,14 @@ public class SysUserServiceImpl implements SysUserService { } @Override - public ResultDomain deleteUser(TbSysUserDTO userDTO) { + public ResultDomain deleteUser(TbSysUserDTO userDTO) { if (userDTO == null || StringUtils.isBlank(userDTO.getUserId())) { return ResultDomain.failure(MSG_USER_ID_REQUIRED); } int rows = userMapper.deleteUser(userDTO); if (rows > 0) { logger.info("删除用户成功, userId={}", userDTO.getUserId()); - return ResultDomain.success("删除用户成功", BOOLEAN.TRUE); + return ResultDomain.success("删除用户成功", Boolean.TRUE); } logger.warn("删除用户失败, userId={}", userDTO.getUserId()); return ResultDomain.failure("删除用户失败"); @@ -168,7 +168,7 @@ public class SysUserServiceImpl implements SysUserService { } @Override - public ResultDomain updateUserPassword(String userId, String oldPassword, String newPassword) { + public ResultDomain updateUserPassword(String userId, String oldPassword, String newPassword) { if (StringUtils.isBlank(userId)) { return ResultDomain.failure(MSG_USER_ID_REQUIRED); } @@ -182,7 +182,7 @@ public class SysUserServiceImpl implements SysUserService { int rows = userMapper.updateUser(dto); if (rows > 0) { logger.info("更新用户密码成功, userId={}", userId); - return ResultDomain.success("更新用户密码成功", BOOLEAN.TRUE); + return ResultDomain.success("更新用户密码成功", Boolean.TRUE); } logger.warn("更新用户密码失败, userId={}", userId); return ResultDomain.failure("更新用户密码失败"); @@ -211,7 +211,7 @@ public class SysUserServiceImpl implements SysUserService { } @Override - public ResultDomain updateUserStatus(String userId, String status) { + public ResultDomain updateUserStatus(String userId, String status) { if (StringUtils.isBlank(userId)) { return ResultDomain.failure(MSG_USER_ID_REQUIRED); } @@ -222,7 +222,7 @@ public class SysUserServiceImpl implements SysUserService { int rows = userMapper.updateUser(dto); if (rows > 0) { logger.info("更新用户状态成功, userId={}", userId); - return ResultDomain.success("更新用户状态成功", BOOLEAN.TRUE); + return ResultDomain.success("更新用户状态成功", Boolean.TRUE); } logger.warn("更新用户状态失败, userId={}", userId); return ResultDomain.failure("更新用户状态失败"); @@ -290,21 +290,21 @@ public class SysUserServiceImpl implements SysUserService { } @Override - public ResultDomain removeUserRole(TbSysUserRoleDTO userRoleDTO) { + public ResultDomain removeUserRole(TbSysUserRoleDTO userRoleDTO) { if (userRoleDTO == null || StringUtils.isBlank(userRoleDTO.getUserId()) || StringUtils.isBlank(userRoleDTO.getRoleId())) { return ResultDomain.failure("用户ID和角色ID不能为空"); } int rows = userRoleMapper.deleteUserRole(userRoleDTO); if (rows > 0) { logger.info("删除用户角色关联成功, userId={}, roleId={}", userRoleDTO.getUserId(), userRoleDTO.getRoleId()); - return ResultDomain.success("删除用户角色关联成功", BOOLEAN.TRUE); + return ResultDomain.success("删除用户角色关联成功", Boolean.TRUE); } logger.warn("删除用户角色关联失败, userId={}, roleId={}", userRoleDTO.getUserId(), userRoleDTO.getRoleId()); return ResultDomain.failure("删除用户角色关联失败"); } @Override - public ResultDomain setUserRoles(String userId, String[] roleIds) { + public ResultDomain setUserRoles(String userId, String[] roleIds) { if (StringUtils.isBlank(userId)) { return ResultDomain.failure(MSG_USER_ID_REQUIRED); } @@ -337,7 +337,7 @@ public class SysUserServiceImpl implements SysUserService { } } logger.info("设置用户角色成功, userId={}, count={}", userId, roleIds == null ? 0 : roleIds.length); - return ResultDomain.success("设置用户角色成功", BOOLEAN.TRUE); + return ResultDomain.success("设置用户角色成功", Boolean.TRUE); } @Override diff --git a/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/ViewServiceImpl.java b/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/ViewServiceImpl.java index afb07a2..7e5a36d 100644 --- a/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/ViewServiceImpl.java +++ b/urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/ViewServiceImpl.java @@ -83,14 +83,14 @@ public class ViewServiceImpl implements ViewService { } @Override - public ResultDomain deleteView(TbSysViewDTO viewDTO) { + public ResultDomain deleteView(TbSysViewDTO viewDTO) { if (viewDTO == null || StringUtils.isBlank(viewDTO.getViewId())) { return ResultDomain.failure(MSG_VIEW_ID_REQUIRED); } int rows = viewMapper.deleteView(viewDTO); if (rows > 0) { logger.info("删除视图成功, viewId={}", viewDTO.getViewId()); - return ResultDomain.success("删除视图成功", BOOLEAN.TRUE); + return ResultDomain.success("删除视图成功", Boolean.TRUE); } logger.warn("删除视图失败, viewId={}", viewDTO.getViewId()); return ResultDomain.failure("删除视图失败"); diff --git a/urbanLifelineServ/system/src/main/resources/mapper/acl/TbSysAclMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/acl/TbSysAclMapper.xml index 9354181..385e2a0 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/acl/TbSysAclMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/acl/TbSysAclMapper.xml @@ -12,8 +12,8 @@ - - + + @@ -23,7 +23,7 @@ - + @@ -35,9 +35,9 @@ - - - + + + @@ -47,7 +47,7 @@ - + @@ -247,7 +247,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_acl diff --git a/urbanLifelineServ/system/src/main/resources/mapper/acl/TbSysAclPolicyMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/acl/TbSysAclPolicyMapper.xml index 0238db7..cd691c6 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/acl/TbSysAclPolicyMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/acl/TbSysAclPolicyMapper.xml @@ -10,9 +10,9 @@ - - - + + + @@ -22,7 +22,7 @@ - + @@ -33,9 +33,9 @@ - - - + + + @@ -45,7 +45,7 @@ - + @@ -213,7 +213,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_acl_policy diff --git a/urbanLifelineServ/system/src/main/resources/mapper/config/TbSysConfigMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/config/TbSysConfigMapper.xml index f3be4d1..1d4b05b 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/config/TbSysConfigMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/config/TbSysConfigMapper.xml @@ -16,8 +16,8 @@ - - + + @@ -27,7 +27,7 @@ - + @@ -44,8 +44,8 @@ - - + + @@ -58,7 +58,7 @@ - + @@ -228,7 +228,7 @@ - SELECT COUNT(1) FROM config.tb_sys_config diff --git a/urbanLifelineServ/system/src/main/resources/mapper/dept/TbSysDeptMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/dept/TbSysDeptMapper.xml index 59fc8e9..8ae68ea 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/dept/TbSysDeptMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/dept/TbSysDeptMapper.xml @@ -18,7 +18,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -172,7 +172,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_dept diff --git a/urbanLifelineServ/system/src/main/resources/mapper/dept/TbSysDeptRoleMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/dept/TbSysDeptRoleMapper.xml index ddc8748..c347715 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/dept/TbSysDeptRoleMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/dept/TbSysDeptRoleMapper.xml @@ -16,7 +16,7 @@ - + @@ -32,7 +32,7 @@ - + @@ -42,7 +42,7 @@ - + @@ -182,7 +182,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_dept_role diff --git a/urbanLifelineServ/system/src/main/resources/mapper/module/TbSysModuleMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/module/TbSysModuleMapper.xml index f0ad21d..089c743 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/module/TbSysModuleMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/module/TbSysModuleMapper.xml @@ -17,7 +17,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -168,7 +168,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_module diff --git a/urbanLifelineServ/system/src/main/resources/mapper/permission/TbSysPermissionMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/permission/TbSysPermissionMapper.xml index 908d8c7..45f79c9 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/permission/TbSysPermissionMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/permission/TbSysPermissionMapper.xml @@ -20,7 +20,7 @@ - + @@ -44,7 +44,7 @@ - + @@ -219,7 +219,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_permission diff --git a/urbanLifelineServ/system/src/main/resources/mapper/permission/TbSysViewPermissionMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/permission/TbSysViewPermissionMapper.xml index 316d0d1..5f61cae 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/permission/TbSysViewPermissionMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/permission/TbSysViewPermissionMapper.xml @@ -16,7 +16,7 @@ - + @@ -28,9 +28,9 @@ - + - + @@ -51,7 +51,7 @@ - + @@ -200,7 +200,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_view_permission diff --git a/urbanLifelineServ/system/src/main/resources/mapper/role/TbSysRoleMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/role/TbSysRoleMapper.xml index 6ffb828..15b5147 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/role/TbSysRoleMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/role/TbSysRoleMapper.xml @@ -10,7 +10,7 @@ - + @@ -20,7 +20,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -198,7 +198,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_role diff --git a/urbanLifelineServ/system/src/main/resources/mapper/role/TbSysRolePermissionMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/role/TbSysRolePermissionMapper.xml index 16c9597..e4ed828 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/role/TbSysRolePermissionMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/role/TbSysRolePermissionMapper.xml @@ -16,7 +16,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -207,7 +207,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_role_permission diff --git a/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserInfoMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserInfoMapper.xml index 65f9d39..ac102ac 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserInfoMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserInfoMapper.xml @@ -7,11 +7,11 @@ - + - + @@ -23,7 +23,7 @@ - + @@ -204,7 +204,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_user_info diff --git a/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserMapper.xml index 7c9914f..77b6969 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserMapper.xml @@ -10,14 +10,14 @@ - + - + @@ -28,14 +28,14 @@ - + - + - + @@ -43,7 +43,7 @@ - + @@ -216,7 +216,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_user diff --git a/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserRoleMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserRoleMapper.xml index a91f7b2..e34d513 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserRoleMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserRoleMapper.xml @@ -16,7 +16,7 @@ - + @@ -32,11 +32,11 @@ - + - + @@ -50,7 +50,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -226,7 +226,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_user_role diff --git a/urbanLifelineServ/system/src/main/resources/mapper/view/TbSysViewMapper.xml b/urbanLifelineServ/system/src/main/resources/mapper/view/TbSysViewMapper.xml index 9983908..4a132ba 100644 --- a/urbanLifelineServ/system/src/main/resources/mapper/view/TbSysViewMapper.xml +++ b/urbanLifelineServ/system/src/main/resources/mapper/view/TbSysViewMapper.xml @@ -11,9 +11,9 @@ - + - + @@ -24,7 +24,7 @@ - + @@ -204,7 +204,7 @@ - SELECT COUNT(1) FROM sys.tb_sys_view