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

类型修正

Browse Source
This commit is contained in:
wangys
2025-12-02 16:13:28 +08:00
parent 28787e5b29
commit 90ddcf7af3
82 changed files with 350 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/DeptRoleController.java
View File

@@ -56,12 +56,12 @@ public class DeptRoleController {
/**
* @description 删除部门
* @param deptDTO 部门DTO
* @return ResultDomain<BOOLEAN> 删除结果
* @return ResultDomain<Boolean> 删除结果
* @author yslg
* @since 2025-11-10
*/
@DeleteMapping("/dept")
public ResultDomain<BOOLEAN> deleteDept(@RequestBody TbSysDeptDTO deptDTO) {
public ResultDomain<Boolean> deleteDept(@RequestBody TbSysDeptDTO deptDTO) {
return deptRoleService.deleteDept(deptDTO);
}
@@ -117,12 +117,12 @@ public class DeptRoleController {
/**
* @description 删除角色
* @param roleDTO 角色DTO
* @return ResultDomain<BOOLEAN> 删除结果
* @return ResultDomain<Boolean> 删除结果
* @author yslg
* @since 2025-11-10
*/
@DeleteMapping("/role")
public ResultDomain<BOOLEAN> deleteRole(@RequestBody TbSysRoleDTO roleDTO) {
public ResultDomain<Boolean> deleteRole(@RequestBody TbSysRoleDTO roleDTO) {
return deptRoleService.deleteRole(roleDTO);
}

4
urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/PermissionController.java
View File

@@ -59,7 +59,7 @@ public class PermissionController {
* @since 2025-11-10
*/
@DeleteMapping("/module")
public ResultDomain<BOOLEAN> deleteModule(@RequestBody TbSysModuleDTO moduleDTO) {
public ResultDomain<Boolean> deleteModule(@RequestBody TbSysModuleDTO moduleDTO) {
return modulePermissionService.deleteModule(moduleDTO);
}
@@ -120,7 +120,7 @@ public class PermissionController {
* @since 2025-11-10
*/
@DeleteMapping
public ResultDomain<BOOLEAN> deletePermission(@RequestBody TbSysPermissionDTO permissionDTO) {
public ResultDomain<Boolean> deletePermission(@RequestBody TbSysPermissionDTO permissionDTO) {
return modulePermissionService.deletePermission(permissionDTO);
}

2
urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/SysConfigController.java
View File

@@ -38,7 +38,7 @@ public class SysConfigController {
}
@DeleteMapping
public ResultDomain<BOOLEAN> deleteConfig(@RequestBody TbSysConfigDTO configDTO) {
public ResultDomain<Boolean> deleteConfig(@RequestBody TbSysConfigDTO configDTO) {
return sysConfigService.deleteConfig(configDTO);
}

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

@@ -44,7 +44,7 @@ public class UserController {
@DeleteMapping
@PreAuthorize("hasAuthority('system:user:delete')")
public ResultDomain<BOOLEAN> deleteUser(@RequestBody TbSysUserDTO userDTO) {
public ResultDomain<Boolean> deleteUser(@RequestBody TbSysUserDTO userDTO) {
return sysUserService.deleteUser(userDTO);
}

2
urbanLifelineServ/system/src/main/java/org/xyzh/system/controller/ViewController.java
View File

@@ -36,7 +36,7 @@ public class ViewController {
}
@DeleteMapping
public ResultDomain<BOOLEAN> deleteView(@RequestBody TbSysViewDTO viewDTO) {
public ResultDomain<Boolean> deleteView(@RequestBody TbSysViewDTO viewDTO) {
return viewService.deleteView(viewDTO);
}

12
urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/DeptRoleServiceImpl.java
View File

@@ -104,14 +104,14 @@ public class DeptRoleServiceImpl implements DeptRoleService {
}
@Override
public ResultDomain<BOOLEAN> deleteDept(TbSysDeptDTO deptDTO) {
public ResultDomain<Boolean> 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<BOOLEAN> deleteRole(TbSysRoleDTO roleDTO) {
public ResultDomain<Boolean> 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<BOOLEAN> deleteDeptRole(TbSysDeptRoleDTO deptRoleDTO) {
public ResultDomain<Boolean> 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("删除部门角色关联失败");

8
urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/ModulePermissionServiceImpl.java
View File

@@ -94,14 +94,14 @@ public class ModulePermissionServiceImpl implements ModulePermissionService {
}
@Override
public ResultDomain<BOOLEAN> deleteModule(TbSysModuleDTO moduleDTO) {
public ResultDomain<Boolean> 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<BOOLEAN> deletePermission(TbSysPermissionDTO permissionDTO) {
public ResultDomain<Boolean> 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("删除权限失败");

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

@@ -80,14 +80,14 @@ public class SysConfigServiceImpl implements SysConfigService {
}
@Override
public ResultDomain<BOOLEAN> deleteConfig(TbSysConfigDTO configDTO) {
public ResultDomain<Boolean> 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("删除配置失败");

20
urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/SysUserServiceImpl.java
View File

@@ -93,14 +93,14 @@ public class SysUserServiceImpl implements SysUserService {
}
@Override
public ResultDomain<BOOLEAN> deleteUser(TbSysUserDTO userDTO) {
public ResultDomain<Boolean> 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<BOOLEAN> updateUserPassword(String userId, String oldPassword, String newPassword) {
public ResultDomain<Boolean> 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<BOOLEAN> updateUserStatus(String userId, String status) {
public ResultDomain<Boolean> 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<BOOLEAN> removeUserRole(TbSysUserRoleDTO userRoleDTO) {
public ResultDomain<Boolean> 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<BOOLEAN> setUserRoles(String userId, String[] roleIds) {
public ResultDomain<Boolean> 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

4
urbanLifelineServ/system/src/main/java/org/xyzh/system/service/impl/ViewServiceImpl.java
View File

@@ -83,14 +83,14 @@ public class ViewServiceImpl implements ViewService {
}
@Override
public ResultDomain<BOOLEAN> deleteView(TbSysViewDTO viewDTO) {
public ResultDomain<Boolean> 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("删除视图失败");

16
urbanLifelineServ/system/src/main/resources/mapper/acl/TbSysAclMapper.xml
View File

@@ -12,8 +12,8 @@
<result column="principal_id" property="principalId" jdbcType="VARCHAR"/>
<result column="principal_dept_id" property="principalDeptId" jdbcType="VARCHAR"/>
<result column="permission" property="permission" jdbcType="VARCHAR"/>
<result column="allow" property="allow" jdbcType="BOOLEAN"/>
<result column="include_descendants" property="includeDescendants" jdbcType="BOOLEAN"/>
<result column="allow" property="allow" jdbcType="Boolean"/>
<result column="include_descendants" property="includeDescendants" jdbcType="Boolean"/>
<!-- 基础字段 -->
<result column="optsn" property="optsn" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
@@ -23,7 +23,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -35,9 +35,9 @@
<result column="principal_type" property="principalType" jdbcType="VARCHAR"/>
<result column="principal_id" property="principalId" jdbcType="VARCHAR"/>
<result column="principal_dept_id" property="principalDeptId" jdbcType="VARCHAR"/>
<result column="permission" property="permission" jdbcType="INTEGER"/>
<result column="allow" property="allow" jdbcType="BOOLEAN"/>
<result column="include_descendants" property="includeDescendants" jdbcType="BOOLEAN"/>
<result column="permission" property="permission" jdbcType="Integer"/>
<result column="allow" property="allow" jdbcType="Boolean"/>
<result column="include_descendants" property="includeDescendants" jdbcType="Boolean"/>
<!-- BaseVO 基础字段 -->
<result column="optsn" property="optsn" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
@@ -47,7 +47,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -247,7 +247,7 @@
</select>
<!-- 根据条件查询系统访问控制列表数量 -->
<select id="getAclCountByFilter" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysAclDTO">
<select id="getAclCountByFilter" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysAclDTO">
SELECT COUNT(1)
FROM sys.tb_sys_acl
<where>

18
urbanLifelineServ/system/src/main/resources/mapper/acl/TbSysAclPolicyMapper.xml
View File

@@ -10,9 +10,9 @@
<result column="object_type" property="objectType" jdbcType="VARCHAR"/>
<result column="edit_hierarchy_rule" property="editHierarchyRule" jdbcType="VARCHAR"/>
<result column="view_hierarchy_rule" property="viewHierarchyRule" jdbcType="VARCHAR"/>
<result column="default_permission" property="defaultPermission" jdbcType="INTEGER"/>
<result column="default_allow" property="defaultAllow" jdbcType="BOOLEAN"/>
<result column="apply_to_children" property="applyToChildren" jdbcType="BOOLEAN"/>
<result column="default_permission" property="defaultPermission" jdbcType="Integer"/>
<result column="default_allow" property="defaultAllow" jdbcType="Boolean"/>
<result column="apply_to_children" property="applyToChildren" jdbcType="Boolean"/>
<!-- 基础字段 -->
<result column="optsn" property="optsn" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
@@ -22,7 +22,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -33,9 +33,9 @@
<result column="object_type" property="policyObjectType" jdbcType="VARCHAR"/>
<result column="edit_hierarchy_rule" property="editHierarchyRule" jdbcType="VARCHAR"/>
<result column="view_hierarchy_rule" property="viewHierarchyRule" jdbcType="VARCHAR"/>
<result column="default_permission" property="defaultPermission" jdbcType="INTEGER"/>
<result column="default_allow" property="defaultAllow" jdbcType="BOOLEAN"/>
<result column="apply_to_children" property="applyToChildren" jdbcType="BOOLEAN"/>
<result column="default_permission" property="defaultPermission" jdbcType="Integer"/>
<result column="default_allow" property="defaultAllow" jdbcType="Boolean"/>
<result column="apply_to_children" property="applyToChildren" jdbcType="Boolean"/>
<!-- BaseVO 基础字段 -->
<result column="optsn" property="optsn" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
@@ -45,7 +45,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -213,7 +213,7 @@
</select>
<!-- 根据条件查询系统访问控制策略数量 -->
<select id="getAclPolicyCount" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysAclPolicyDTO">
<select id="getAclPolicyCount" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysAclPolicyDTO">
SELECT COUNT(1)
FROM sys.tb_sys_acl_policy
<where>

14
urbanLifelineServ/system/src/main/resources/mapper/config/TbSysConfigMapper.xml
View File

@@ -16,8 +16,8 @@
<result column="options" property="options" jdbcType="OTHER"/>
<result column="group" property="group" jdbcType="VARCHAR"/>
<result column="module_id" property="moduleId" jdbcType="VARCHAR"/>
<result column="order_num" property="orderNum" jdbcType="INTEGER"/>
<result column="status" property="status" jdbcType="INTEGER"/>
<result column="order_num" property="orderNum" jdbcType="Integer"/>
<result column="status" property="status" jdbcType="Integer"/>
<!-- 基础字段 -->
<result column="optsn" property="optsn" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
@@ -27,7 +27,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -44,8 +44,8 @@
<result column="options" property="options" jdbcType="OTHER"/>
<result column="group" property="group" jdbcType="VARCHAR"/>
<result column="module_id" property="moduleId" jdbcType="VARCHAR"/>
<result column="order_num" property="orderNum" jdbcType="INTEGER"/>
<result column="status" property="status" jdbcType="INTEGER"/>
<result column="order_num" property="orderNum" jdbcType="Integer"/>
<result column="status" property="status" jdbcType="Integer"/>
<!-- 模块关联字段 -->
<result column="module_name" property="moduleName" jdbcType="VARCHAR"/>
<result column="module_description" property="moduleDescription" jdbcType="VARCHAR"/>
@@ -58,7 +58,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -228,7 +228,7 @@
</select>
<!-- 根据条件查询系统配置数量 -->
<select id="getConfigCount" resultType="java.lang.INTEGER" parameterType="TbSysConfigDTO">
<select id="getConfigCount" resultType="java.lang.Integer" parameterType="TbSysConfigDTO">
SELECT COUNT(1)
FROM config.tb_sys_config
<where>

6
urbanLifelineServ/system/src/main/resources/mapper/dept/TbSysDeptMapper.xml
View File

@@ -18,7 +18,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -37,7 +37,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -172,7 +172,7 @@
</select>
<!-- 根据条件查询系统部门数量 -->
<select id="getDeptCount" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysDeptDTO">
<select id="getDeptCount" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysDeptDTO">
SELECT COUNT(1)
FROM sys.tb_sys_dept
<where>

8
urbanLifelineServ/system/src/main/resources/mapper/dept/TbSysDeptRoleMapper.xml
View File

@@ -16,7 +16,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -32,7 +32,7 @@
<result column="role_description" property="roleDescription" jdbcType="VARCHAR"/>
<result column="scope" property="roleScope" jdbcType="VARCHAR"/>
<result column="owner_dept_id" property="roleOwnerDeptId" jdbcType="VARCHAR"/>
<result column="role_status" property="roleStatus" jdbcType="BOOLEAN"/>
<result column="role_status" property="roleStatus" jdbcType="Boolean"/>
<!-- BaseVO 基础字段 -->
<result column="optsn" property="optsn" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
@@ -42,7 +42,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -182,7 +182,7 @@
</select>
<!-- 根据条件查询系统部门角色关系数量 -->
<select id="getDeptRoleCount" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysDeptRoleDTO">
<select id="getDeptRoleCount" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysDeptRoleDTO">
SELECT COUNT(1)
FROM sys.tb_sys_dept_role
<where>

6
urbanLifelineServ/system/src/main/resources/mapper/module/TbSysModuleMapper.xml
View File

@@ -17,7 +17,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -35,7 +35,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -168,7 +168,7 @@
</select>
<!-- 根据条件查询系统模块数量 -->
<select id="getModuleCount" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysModuleDTO">
<select id="getModuleCount" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysModuleDTO">
SELECT COUNT(1)
FROM sys.tb_sys_module
<where>

6
urbanLifelineServ/system/src/main/resources/mapper/permission/TbSysPermissionMapper.xml
View File

@@ -20,7 +20,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -44,7 +44,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -219,7 +219,7 @@
</select>
<!-- 根据条件查询系统权限数量 -->
<select id="getPermissionCount" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysPermissionDTO">
<select id="getPermissionCount" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysPermissionDTO">
SELECT COUNT(1)
FROM sys.tb_sys_permission
<where>

10
urbanLifelineServ/system/src/main/resources/mapper/permission/TbSysViewPermissionMapper.xml
View File

@@ -16,7 +16,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -28,9 +28,9 @@
<result column="view_url" property="viewUrl" jdbcType="VARCHAR"/>
<result column="view_component" property="viewComponent" jdbcType="VARCHAR"/>
<result column="view_icon" property="viewIcon" jdbcType="VARCHAR"/>
<result column="view_type" property="viewType" jdbcType="INTEGER"/>
<result column="view_type" property="viewType" jdbcType="Integer"/>
<result column="view_layout" property="viewLayout" jdbcType="VARCHAR"/>
<result column="view_order_num" property="viewOrderNum" jdbcType="INTEGER"/>
<result column="view_order_num" property="viewOrderNum" jdbcType="Integer"/>
<result column="view_description" property="viewDescription" jdbcType="VARCHAR"/>
<!-- 权限字段 -->
<result column="permission_id" property="permissionId" jdbcType="VARCHAR"/>
@@ -51,7 +51,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -200,7 +200,7 @@
</select>
<!-- 根据条件查询系统视图权限关系数量 -->
<select id="getViewPermissionCount" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysViewPermissionDTO">
<select id="getViewPermissionCount" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysViewPermissionDTO">
SELECT COUNT(1)
FROM sys.tb_sys_view_permission
<where>

10
urbanLifelineServ/system/src/main/resources/mapper/role/TbSysRoleMapper.xml
View File

@@ -10,7 +10,7 @@
<result column="description" property="description" jdbcType="VARCHAR"/>
<result column="scope" property="scope" jdbcType="VARCHAR"/>
<result column="owner_dept_id" property="ownerDeptId" jdbcType="VARCHAR"/>
<result column="status" property="status" jdbcType="BOOLEAN"/>
<result column="status" property="status" jdbcType="Boolean"/>
<!-- 基础字段 -->
<result column="optsn" property="optsn" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
@@ -20,7 +20,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -31,7 +31,7 @@
<result column="description" property="roleDescription" jdbcType="VARCHAR"/>
<result column="scope" property="roleScope" jdbcType="VARCHAR"/>
<result column="owner_dept_id" property="roleOwnerDeptId" jdbcType="VARCHAR"/>
<result column="status" property="roleStatus" jdbcType="BOOLEAN"/>
<result column="status" property="roleStatus" jdbcType="Boolean"/>
<!-- BaseVO 基础字段 -->
<result column="optsn" property="optsn" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
@@ -41,7 +41,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -198,7 +198,7 @@
</select>
<!-- 根据条件查询系统角色数量 -->
<select id="getRoleCount" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysRoleDTO">
<select id="getRoleCount" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysRoleDTO">
SELECT COUNT(1)
FROM sys.tb_sys_role
<where>

8
urbanLifelineServ/system/src/main/resources/mapper/role/TbSysRolePermissionMapper.xml
View File

@@ -16,7 +16,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -27,7 +27,7 @@
<result column="role_description" property="roleDescription" jdbcType="VARCHAR"/>
<result column="role_scope" property="roleScope" jdbcType="VARCHAR"/>
<result column="role_owner_dept_id" property="roleOwnerDeptId" jdbcType="VARCHAR"/>
<result column="role_status" property="roleStatus" jdbcType="BOOLEAN"/>
<result column="role_status" property="roleStatus" jdbcType="Boolean"/>
<!-- 权限字段 -->
<result column="permission_id" property="permissionId" jdbcType="VARCHAR"/>
<result column="permission_name" property="permissionName" jdbcType="VARCHAR"/>
@@ -47,7 +47,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -207,7 +207,7 @@
</select>
<!-- 根据条件查询系统角色权限关系数量 -->
<select id="getRolePermissionCount" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysRolePermissionDTO">
<select id="getRolePermissionCount" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysRolePermissionDTO">
SELECT COUNT(1)
FROM sys.tb_sys_role_permission
<where>

8
urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserInfoMapper.xml
View File

@@ -7,11 +7,11 @@
<!-- 用户信息字段 -->
<id column="user_id" property="userId" jdbcType="VARCHAR"/>
<result column="avatar" property="avatar" jdbcType="VARCHAR"/>
<result column="gender" property="gender" jdbcType="INTEGER"/>
<result column="gender" property="gender" jdbcType="Integer"/>
<result column="family_name" property="familyName" jdbcType="VARCHAR"/>
<result column="given_name" property="givenName" jdbcType="VARCHAR"/>
<result column="full_name" property="fullName" jdbcType="VARCHAR"/>
<result column="level" property="level" jdbcType="INTEGER"/>
<result column="level" property="level" jdbcType="Integer"/>
<result column="id_card" property="idCard" jdbcType="VARCHAR"/>
<result column="address" property="address" jdbcType="VARCHAR"/>
<!-- 基础字段 -->
@@ -23,7 +23,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -204,7 +204,7 @@
</select>
<!-- 根据条件查询系统用户信息数量 -->
<select id="getUserInfoCount" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysUserInfoDTO">
<select id="getUserInfoCount" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysUserInfoDTO">
SELECT COUNT(1)
FROM sys.tb_sys_user_info
<where>

14
urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserMapper.xml
View File

@@ -10,14 +10,14 @@
<result column="email" property="email" jdbcType="VARCHAR"/>
<result column="phone" property="phone" jdbcType="VARCHAR"/>
<result column="wechat_id" property="wechatId" jdbcType="VARCHAR"/>
<result column="status" property="status" jdbcType="INTEGER"/>
<result column="status" property="status" jdbcType="Integer"/>
<!-- BaseDTO 中在该表实际存在的字段 -->
<result column="optsn" property="optsn" jdbcType="VARCHAR"/>
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -28,14 +28,14 @@
<result column="email" property="email" jdbcType="VARCHAR"/>
<result column="phone" property="phone" jdbcType="VARCHAR"/>
<result column="wechat_id" property="wechatId" jdbcType="VARCHAR"/>
<result column="status" property="status" jdbcType="INTEGER"/>
<result column="status" property="status" jdbcType="Integer"/>
<!-- 用户信息关联字段 -->
<result column="avatar" property="avatar" jdbcType="VARCHAR"/>
<result column="gender" property="gender" jdbcType="INTEGER"/>
<result column="gender" property="gender" jdbcType="Integer"/>
<result column="family_name" property="familyName" jdbcType="VARCHAR"/>
<result column="given_name" property="givenName" jdbcType="VARCHAR"/>
<result column="full_name" property="fullName" jdbcType="VARCHAR"/>
<result column="level" property="level" jdbcType="INTEGER"/>
<result column="level" property="level" jdbcType="Integer"/>
<result column="id_card" property="idCard" jdbcType="VARCHAR"/>
<result column="address" property="address" jdbcType="VARCHAR"/>
<!-- BaseVO 中在该表实际存在的字段 -->
@@ -43,7 +43,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列（完全按表结构） -->
@@ -216,7 +216,7 @@
</select>
<!-- 根据条件查询用户数量 -->
<select id="getUserCountByFilter" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysUserDTO">
<select id="getUserCountByFilter" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysUserDTO">
SELECT COUNT(1)
FROM sys.tb_sys_user
<where>

12
urbanLifelineServ/system/src/main/resources/mapper/user/TbSysUserRoleMapper.xml
View File

@@ -16,7 +16,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- VO结果映射（用于前端展示） -->
@@ -32,11 +32,11 @@
<result column="user_type" property="userType" jdbcType="VARCHAR"/>
<!-- 用户信息字段 -->
<result column="avatar" property="avatar" jdbcType="VARCHAR"/>
<result column="gender" property="gender" jdbcType="INTEGER"/>
<result column="gender" property="gender" jdbcType="Integer"/>
<result column="family_name" property="familyName" jdbcType="VARCHAR"/>
<result column="given_name" property="givenName" jdbcType="VARCHAR"/>
<result column="full_name" property="fullName" jdbcType="VARCHAR"/>
<result column="level" property="level" jdbcType="INTEGER"/>
<result column="level" property="level" jdbcType="Integer"/>
<result column="id_card" property="idCard" jdbcType="VARCHAR"/>
<result column="address" property="address" jdbcType="VARCHAR"/>
<!-- 部门字段 -->
@@ -50,7 +50,7 @@
<result column="role_description" property="roleDescription" jdbcType="VARCHAR"/>
<result column="scope" property="scope" jdbcType="VARCHAR"/>
<result column="owner_dept_id" property="ownerDeptId" jdbcType="VARCHAR"/>
<result column="role_status" property="roleStatus" jdbcType="BOOLEAN"/>
<result column="role_status" property="roleStatus" jdbcType="Boolean"/>
<!-- BaseVO 基础字段 -->
<result column="optsn" property="optsn" jdbcType="VARCHAR"/>
<result column="creator" property="creator" jdbcType="VARCHAR"/>
@@ -60,7 +60,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -226,7 +226,7 @@
</select>
<!-- 根据条件查询系统用户角色关系数量 -->
<select id="getUserRoleCount" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysUserRoleDTO">
<select id="getUserRoleCount" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysUserRoleDTO">
SELECT COUNT(1)
FROM sys.tb_sys_user_role
<where>

8
urbanLifelineServ/system/src/main/resources/mapper/view/TbSysViewMapper.xml
View File

@@ -11,9 +11,9 @@
<result column="url" property="url" jdbcType="VARCHAR"/>
<result column="component" property="component" jdbcType="VARCHAR"/>
<result column="icon" property="icon" jdbcType="VARCHAR"/>
<result column="type" property="type" jdbcType="INTEGER"/>
<result column="type" property="type" jdbcType="Integer"/>
<result column="layout" property="layout" jdbcType="VARCHAR"/>
<result column="order_num" property="orderNum" jdbcType="INTEGER"/>
<result column="order_num" property="orderNum" jdbcType="Integer"/>
<result column="description" property="description" jdbcType="VARCHAR"/>
<!-- 基础字段 -->
<result column="optsn" property="optsn" jdbcType="VARCHAR"/>
@@ -24,7 +24,7 @@
<result column="create_time" property="createTime" jdbcType="DATE"/>
<result column="update_time" property="updateTime" jdbcType="DATE"/>
<result column="delete_time" property="deleteTime" jdbcType="DATE"/>
<result column="deleted" property="deleted" jdbcType="BOOLEAN"/>
<result column="deleted" property="deleted" jdbcType="Boolean"/>
</resultMap>
<!-- 基础列 -->
@@ -204,7 +204,7 @@
</select>
<!-- 根据条件查询系统视图数量 -->
<select id="getViewCount" resultType="java.lang.INTEGER" parameterType="org.xyzh.common.dto.sys.TbSysViewDTO">
<select id="getViewCount" resultType="java.lang.Integer" parameterType="org.xyzh.common.dto.sys.TbSysViewDTO">
SELECT COUNT(1)
FROM sys.tb_sys_view
<where>