调整检测计划导入、导出功能

2025-03-25 16:10:17 +08:00
parent 6ff3d7e336
commit 22028fe7eb
39 changed files with 620 additions and 730 deletions
--- a/user/src/main/java/com/njcn/gather/user/user/controller/SysUserController.java
+++ b/user/src/main/java/com/njcn/gather/user/user/controller/SysUserController.java
@@ -72,8 +72,6 @@ public class SysUserController extends BaseController {
        String methodDescribe = getMethodDescribe("add");
        LogUtil.njcnDebug(log, "{}，用户数据为：{}", methodDescribe, addUserParam);
        boolean result = sysUserService.addUser(addUserParam);
-        //更新redis数据
-        //sysUserService.userRoleList();
        if (result) {
            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
        } else {
@@ -89,8 +87,6 @@ public class SysUserController extends BaseController {
        String methodDescribe = getMethodDescribe("update");
        LogUtil.njcnDebug(log, "{}，用户数据为：{}", methodDescribe, updateUserParam);
        boolean result = sysUserService.updateUser(updateUserParam);
-        //更新redis数据
-        //userService.userRoleList();
        if (result) {
            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
        } else {
@@ -106,8 +102,6 @@ public class SysUserController extends BaseController {
        String methodDescribe = getMethodDescribe("delete");
        LogUtil.njcnDebug(log, "{}，用户id为：{}", methodDescribe, String.join(StrUtil.COMMA, ids));
        boolean result = sysUserService.deleteUser(ids);
-        //更新redis数据
-        //sysUserService.userRoleList();
        if (result) {
            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
        } else {
--- a/user/src/main/java/com/njcn/gather/user/user/pojo/param/SysFunctionParam.java
+++ b/user/src/main/java/com/njcn/gather/user/user/pojo/param/SysFunctionParam.java
@@ -33,12 +33,9 @@ public class SysFunctionParam {
    private String code;

    @ApiModelProperty("路径")
-//    @NotBlank(message = UserValidMessage.PATH_NOT_BLANK)
-//    @Pattern(regexp = PatternRegex.FUNCTION_URL, message = UserValidMessage.PATH_FORMAT_ERROR)
    private String path;

    @ApiModelProperty("组件地址")
-//    @NotBlank(message = UserValidMessage.COMPONENT_NOT_BLANK)
    private String component;

    @ApiModelProperty("图标")
@@ -63,10 +60,6 @@ public class SysFunctionParam {
        @ApiModelProperty("名称")
        @Pattern(regexp = PatternRegex.FUNCTION_NAME, message = UserValidMessage.NAME_FORMAT_ERROR)
        private String name;
-
-//        @ApiModelProperty("资源类型")
-//        @Range(min = 0, max = 3, message = UserValidMessage.PARAM_FORMAT_ERROR)
-//        private Integer type;
    }

    @Data
--- a/user/src/main/java/com/njcn/gather/user/user/pojo/param/SysUserParam.java
+++ b/user/src/main/java/com/njcn/gather/user/user/pojo/param/SysUserParam.java
@@ -37,18 +37,6 @@ public class SysUserParam {
    @ApiModelProperty("角色ids")
    private List<String> roleIds;

-    //    @ApiModelProperty("最后一次登录时间")
-    //    @DateTimeStrValid(format = "yyyy-MM-dd HH:mm:ss")
-    //    private String loginTime;
-
-//    @ApiModelProperty("密码错误次数")
-//    @NotNull(message = UserValidMessage.LOGIN_ERROR_TIMES_NOT_NULL)
-//    private Integer loginErrorTimes;
-
-//    @ApiModelProperty("密码错误锁定时间")
-//    @DateTimeStrValid(format = "yyyy-MM-dd HH:mm:ss")
-//    private String lockTime;
-
    @Data
    @EqualsAndHashCode(callSuper = true)
    public static class SysUserAddParam extends SysUserParam {
--- a/user/src/main/java/com/njcn/gather/user/user/service/impl/SysFunctionServiceImpl.java
+++ b/user/src/main/java/com/njcn/gather/user/user/service/impl/SysFunctionServiceImpl.java
@@ -46,7 +46,7 @@ public class SysFunctionServiceImpl extends ServiceImpl<SysFunctionMapper, SysFu
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean addFunction(SysFunctionParam functionParam) {
        checkFunctionParam(functionParam, false);
        SysFunction function = new SysFunction();
@@ -67,7 +67,7 @@ public class SysFunctionServiceImpl extends ServiceImpl<SysFunctionMapper, SysFu
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean updateFunction(SysFunctionParam.UpdateParam param) {
        boolean result = false;
        checkFunctionParam(param, true);
@@ -84,7 +84,7 @@ public class SysFunctionServiceImpl extends ServiceImpl<SysFunctionMapper, SysFu
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean deleteFunction(String id) {
        boolean result1 = false;
        sysRoleFunctionService.deleteRoleFunctionByFunctionIds(Collections.singletonList(id));
--- a/user/src/main/java/com/njcn/gather/user/user/service/impl/SysRoleFunctionServiceImpl.java
+++ b/user/src/main/java/com/njcn/gather/user/user/service/impl/SysRoleFunctionServiceImpl.java
@@ -31,7 +31,7 @@ public class SysRoleFunctionServiceImpl extends ServiceImpl<SysRoleFunctionMappe
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean addRoleFunction(String roleId, List<String> functionIds) {
        List<SysRoleFunction> roleFunctions = new ArrayList<>();
        if (!CollectionUtil.isEmpty(functionIds)) {
@@ -46,7 +46,7 @@ public class SysRoleFunctionServiceImpl extends ServiceImpl<SysRoleFunctionMappe
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean updateRoleFunction(String roleId, List<String> functionIds) {
        //删除原有关系
        this.deleteRoleFunctionByRoleIds(Collections.singletonList(roleId));
@@ -62,7 +62,7 @@ public class SysRoleFunctionServiceImpl extends ServiceImpl<SysRoleFunctionMappe
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean deleteRoleFunctionByRoleIds(List<String> roleIds) {
        LambdaQueryWrapper<SysRoleFunction> lambdaQuery = new LambdaQueryWrapper<>();
        lambdaQuery.in(SysRoleFunction::getRoleId, roleIds);
@@ -70,7 +70,7 @@ public class SysRoleFunctionServiceImpl extends ServiceImpl<SysRoleFunctionMappe
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean deleteRoleFunctionByFunctionIds(List<String> functionIds) {
        LambdaQueryWrapper<SysRoleFunction> lambdaQuery = new LambdaQueryWrapper<>();
        lambdaQuery.in(SysRoleFunction::getFunctionId, functionIds);
--- a/user/src/main/java/com/njcn/gather/user/user/service/impl/SysRoleServiceImpl.java
+++ b/user/src/main/java/com/njcn/gather/user/user/service/impl/SysRoleServiceImpl.java
@@ -53,7 +53,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean addRole(SysRoleParam sysRoleParam) {
        checkRepeat(sysRoleParam, false);
        SysRole role = new SysRole();
@@ -64,7 +64,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean updateRole(SysRoleParam.UpdateParam updateParam) {
        checkRepeat(updateParam, true);
        //不能修改超级管理员角色
@@ -80,7 +80,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> impl
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean deleteRole(List<String> ids) {
        //不能删除超级管理员角色
        Integer count = this.lambdaQuery()
--- a/user/src/main/java/com/njcn/gather/user/user/service/impl/SysUserRoleServiceImpl.java
+++ b/user/src/main/java/com/njcn/gather/user/user/service/impl/SysUserRoleServiceImpl.java
@@ -31,7 +31,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean addUserRole(String userId, List<String> roleIds) {
        List<SysUserRole> userRoles = new ArrayList<>();
        if (!CollectionUtil.isEmpty(roleIds)) {
@@ -46,7 +46,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean updateUserRole(String userId, List<String> roleIds) {
        //删除原有关系
        this.deleteUserRoleByUserIds(Collections.singletonList(userId));
@@ -62,7 +62,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean deleteUserRoleByUserIds(List<String> userIds) {
        LambdaQueryWrapper<SysUserRole> lambdaQuery = new LambdaQueryWrapper<>();
        lambdaQuery.in(SysUserRole::getUserId, userIds);
@@ -70,7 +70,7 @@ public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUs
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean deleteUserRoleByRoleIds(List<String> roleIds) {
        LambdaQueryWrapper<SysUserRole> lambdaQuery = new LambdaQueryWrapper<>();
        lambdaQuery.in(SysUserRole::getRoleId, roleIds);
--- a/user/src/main/java/com/njcn/gather/user/user/service/impl/SysUserServiceImpl.java
+++ b/user/src/main/java/com/njcn/gather/user/user/service/impl/SysUserServiceImpl.java
@@ -112,7 +112,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean addUser(SysUserParam.SysUserAddParam addUserParam) {
        if (UserConst.SUPER_ADMIN.equals(addUserParam.getLoginName())) {
            throw new BusinessException(UserResponseEnum.SUPER_ADMIN_REPEAT);
@@ -135,7 +135,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean updateUser(SysUserParam.SysUserUpdateParam updateUserParam) {
        checkRepeat(updateUserParam, true, updateUserParam.getId());
        SysUser sysUser = new SysUser();
@@ -158,7 +158,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean updatePassword(String userId, String newPassword) {
        SysUser user = lambdaQuery().ne(SysUser::getState, UserConst.STATE_DELETE).eq(SysUser::getId, userId).one();
        if (ObjectUtil.isNotNull(user)) {
@@ -171,7 +171,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
    }

    @Override
-    @Transactional(rollbackFor = {Exception.class})
+    @Transactional
    public boolean deleteUser(List<String> ids) {
        for (String id : ids) {
            List<SysRole> sysRoles = sysUserRoleService.listRoleByUserId(id);