From f28749865997ce6c6c83a1eabc31317e5bcd4bd4 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Wed, 4 Dec 2024 09:50:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/err/pojo/vo/PqErrSysDtlsVO.java | 38 ++++++++++++++ .../service/impl/DictTreeServiceImpl.java | 9 ++-- .../gather/user/pojo/constant/UserConst.java | 16 ++++++ .../gather/user/pojo/constant/UserState.java | 14 ----- .../user/pojo/enums/UserResponseEnum.java | 3 +- .../service/impl/SysFunctionServiceImpl.java | 51 ++----------------- .../user/service/impl/SysUserServiceImpl.java | 31 +++++------ 7 files changed, 82 insertions(+), 80 deletions(-) create mode 100644 device/src/main/java/com/njcn/gather/device/err/pojo/vo/PqErrSysDtlsVO.java create mode 100644 user/src/main/java/com/njcn/gather/user/pojo/constant/UserConst.java delete mode 100644 user/src/main/java/com/njcn/gather/user/pojo/constant/UserState.java diff --git a/device/src/main/java/com/njcn/gather/device/err/pojo/vo/PqErrSysDtlsVO.java b/device/src/main/java/com/njcn/gather/device/err/pojo/vo/PqErrSysDtlsVO.java new file mode 100644 index 00000000..15bf8370 --- /dev/null +++ b/device/src/main/java/com/njcn/gather/device/err/pojo/vo/PqErrSysDtlsVO.java @@ -0,0 +1,38 @@ +package com.njcn.gather.device.err.pojo.vo; + +import lombok.Data; + +import java.util.List; +import java.util.Map; + +/** + * @author caozehui + * @data 2024-12-02 + */ +@Data +public class PqErrSysDtlsVO { + /** + * 列1 + */ + private String col1; + + /** + * 列2 + */ + private String col2; + + /** + * 装置等级 + */ + private String devLevel; + + /** + * 测量类型 + */ + private String testType; + + /** + * 测量条件 & 最大误差 + */ + private List> info; +} diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java index 31faa59a..f1bedb14 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/service/impl/DictTreeServiceImpl.java @@ -183,11 +183,12 @@ public class DictTreeServiceImpl extends ServiceImpl i if (CollectionUtils.isEmpty(dictTree.getChildren())) { list.remove(i); } - } else { - if (!CollectionUtils.isEmpty(children)) { - filter(children, keyword); - } } +// else { +// if (!CollectionUtils.isEmpty(children)) { +// filter(children, keyword); +// } +// } } } diff --git a/user/src/main/java/com/njcn/gather/user/pojo/constant/UserConst.java b/user/src/main/java/com/njcn/gather/user/pojo/constant/UserConst.java new file mode 100644 index 00000000..48baa693 --- /dev/null +++ b/user/src/main/java/com/njcn/gather/user/pojo/constant/UserConst.java @@ -0,0 +1,16 @@ +package com.njcn.gather.user.pojo.constant; + +/** + * @author caozehui + * @data 2024/11/11 + */ +public interface UserConst { + Integer STATE_DELETE = 0; + Integer STATE_ENABLE = 1; + Integer STATE_LOCKED = 2; + Integer STATE_WAITING_FOR_APPROVAL = 3; + Integer STATE_SLEEPING = 4; + Integer STATE_PASSWORD_EXPIRED = 5; + + String SUPER_ADMIN = "root"; +} diff --git a/user/src/main/java/com/njcn/gather/user/pojo/constant/UserState.java b/user/src/main/java/com/njcn/gather/user/pojo/constant/UserState.java deleted file mode 100644 index 995bdc7f..00000000 --- a/user/src/main/java/com/njcn/gather/user/pojo/constant/UserState.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.njcn.gather.user.pojo.constant; - -/** - * @author caozehui - * @data 2024/11/11 - */ -public interface UserState { - Integer DELETE = 0; - Integer ENABLE = 1; - Integer LOCKED = 2; - Integer WAITING_FOR_APPROVAL = 3; - Integer SLEEPING = 4; - Integer PASSWORD_EXPIRED = 5; -} diff --git a/user/src/main/java/com/njcn/gather/user/pojo/enums/UserResponseEnum.java b/user/src/main/java/com/njcn/gather/user/pojo/enums/UserResponseEnum.java index 70c591bf..98058d7e 100644 --- a/user/src/main/java/com/njcn/gather/user/pojo/enums/UserResponseEnum.java +++ b/user/src/main/java/com/njcn/gather/user/pojo/enums/UserResponseEnum.java @@ -20,7 +20,8 @@ public enum UserResponseEnum { SUPER_ADMINSTRATOR_ROLE_CANNOT_DELETE("A010009", "禁止删除超级管理员角色"), SUPER_ADMIN_CANNOT_DELETE("A010010", "禁止删除超级管理员用户"), COMPONENT_NOT_BLANK("A010011", "组件地址不能为空"), - FUNCTION_PATH_FORMAT_ERROR("A010012", "路由地址格式错误"); + FUNCTION_PATH_FORMAT_ERROR("A010012", "路由地址格式错误"), + SUPER_ADMIN_REPEAT("A010013","超级管理员已存在，请勿重复添加" ); private String code; private String message; diff --git 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 index 106ebf45..fef93350 100644 --- 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 @@ -157,7 +157,6 @@ public class SysFunctionServiceImpl extends ServiceImpl List getChildrenList(T currMenu, List categories) { return categories.stream().filter(o -> Objects.equals(o.getPid(), currMenu.getId())).peek(o -> o.setChildren(getChildrenList(o, categories))).sorted(Comparator.comparingInt(SysFunction::getSort)).collect(Collectors.toList()); } @@ -211,52 +210,12 @@ public class SysFunctionServiceImpl extends ServiceImpl getMenuByUserId(String userId) { -// List menu = this.baseMapper.getMenuByUserId(userId); -// HashSet menuIdSet = new HashSet<>(); -// menuIdSet.addAll(menu.stream().map(MenuVO::getId).collect(Collectors.toList())); -// menu.stream().forEach(m -> { -// String pids = m.getPids(); -// if (StrUtil.isNotBlank(pids)) { -// String[] pidArr = pids.split(","); -// for (String pid : pidArr) { -// menuIdSet.add(pid); +// else { +// if (!CollectionUtils.isEmpty(children)) { +// filter(children, keyword); // } // } -// }); -// List menu this.baseMapper.getMenuByIds(menuIdSet); -// menu.stream().forEach(m -> { -// MetaVO meta = new MetaVO(); -// meta.setIcon(m.getIcon()); -// meta.setTitle(m.getName()); -// meta.setIsLink(""); -// meta.setHide(false); -// meta.setFull(false); -// meta.setAffix(false); -// meta.setKeepAlive(true); -// m.setMeta(meta); -// m.setName(m.getCode()); -// }); -// return menu.stream().filter(fun -> Objects.equals(FunctionConst.FATHER_PID, fun.getPid())).peek(funS -> { -// List childrenList = getChildrenList(funS, menu); -// if (ObjectUtil.isNull(childrenList) || childrenList.size() == 0) { -// funS.setRedirect(null); -// } else { -// funS.setRedirect(funS.getComponent()); -// funS.setComponent(null); -// } -// funS.setChildren(childrenList); -// }) -// .sorted(Comparator.comparingInt(MenuVO::getSort)).collect(Collectors.toList()); -// } + } + } } \ No newline at end of file diff --git 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 index c26f6a6a..2a38684d 100644 --- 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 @@ -11,13 +11,12 @@ import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.utils.sm.Sm4Utils; import com.njcn.db.mybatisplus.constant.DbConstant; import com.njcn.gather.user.pojo.constant.RoleConst; -import com.njcn.gather.user.pojo.constant.UserState; +import com.njcn.gather.user.pojo.constant.UserConst; import com.njcn.gather.user.pojo.enums.UserResponseEnum; import com.njcn.gather.user.user.mapper.SysUserMapper; import com.njcn.gather.user.user.pojo.param.SysUserParam; import com.njcn.gather.user.user.pojo.po.SysRole; import com.njcn.gather.user.user.pojo.po.SysUser; -import com.njcn.gather.user.user.service.ISysRoleService; import com.njcn.gather.user.user.service.ISysUserRoleService; import com.njcn.gather.user.user.service.ISysUserService; import com.njcn.web.factory.PageFactory; @@ -42,7 +41,6 @@ import java.util.stream.Collectors; public class SysUserServiceImpl extends ServiceImpl implements ISysUserService { private final ISysUserRoleService sysUserRoleService; - private final ISysRoleService sysRoleService; @Override public Page listUser(SysUserParam.SysUserQueryParam queryParam) { @@ -59,7 +57,7 @@ public class SysUserServiceImpl extends ServiceImpl impl } else { queryWrapper.orderByDesc("sys_user.update_time"); } - queryWrapper.ne("sys_user.state", UserState.DELETE); + queryWrapper.ne("sys_user.Login_Name", UserConst.SUPER_ADMIN).ne("sys_user.state", UserConst.STATE_DELETE); Page page = this.baseMapper.selectPage(new Page<>(PageFactory.getPageNum(queryParam), PageFactory.getPageSize(queryParam)), queryWrapper); page.getRecords().forEach(sysUser -> { List sysRoles = sysUserRoleService.listRoleByUserId(sysUser.getId()); @@ -72,20 +70,20 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public List listUserByDeptId(String deptId) { if (StrUtil.isNotBlank(deptId)) { - return this.lambdaQuery().ne(SysUser::getState, UserState.DELETE).eq(SysUser::getDeptId, deptId).orderByAsc(SysUser::getCreateTime).list(); + return this.lambdaQuery().ne(SysUser::getState, UserConst.STATE_DELETE).eq(SysUser::getDeptId, deptId).orderByAsc(SysUser::getCreateTime).list(); } return Collections.emptyList(); } @Override public SysUser getUserByLoginName(String loginName) { - return this.lambdaQuery().ne(SysUser::getState, UserState.DELETE).eq(SysUser::getLoginName, loginName).one(); + return this.lambdaQuery().ne(SysUser::getState, UserConst.STATE_DELETE).eq(SysUser::getLoginName, loginName).one(); } @Override public SysUser getUserByPhone(String phone, boolean isExcludeSelf, String id) { LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); - lambdaQuery.eq(SysUser::getPhone, phone).ne(SysUser::getState, UserState.DELETE); + lambdaQuery.eq(SysUser::getPhone, phone).ne(SysUser::getState, UserConst.STATE_DELETE); if (isExcludeSelf) { lambdaQuery.ne(SysUser::getId, id); } @@ -95,7 +93,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public SysUser getUserByName(String name, boolean isExcludeSelf, String id) { LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); - lambdaQuery.eq(SysUser::getName, name).ne(SysUser::getState, UserState.DELETE); + lambdaQuery.eq(SysUser::getName, name).ne(SysUser::getState, UserConst.STATE_DELETE); if (isExcludeSelf) { lambdaQuery.ne(SysUser::getId, id); } @@ -105,7 +103,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public SysUser getUserByEmail(String email, boolean isExcludeSelf, String id) { LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); - lambdaQuery.eq(SysUser::getEmail, email).ne(SysUser::getState, UserState.DELETE); + lambdaQuery.eq(SysUser::getEmail, email).ne(SysUser::getState, UserConst.STATE_DELETE); if (isExcludeSelf) { lambdaQuery.ne(SysUser::getId, id); } @@ -114,6 +112,9 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public boolean addUser(SysUserParam.SysUserAddParam addUserParam) { + if (UserConst.SUPER_ADMIN.equals(addUserParam.getLoginName())) { + throw new BusinessException(UserResponseEnum.SUPER_ADMIN_REPEAT); + } if (!Objects.isNull(getUserByLoginName(addUserParam.getLoginName()))) { throw new BusinessException(UserResponseEnum.LOGIN_NAME_REPEAT); } @@ -126,7 +127,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // todo 别忘记移除登录时间 sysUser.setLoginTime(LocalDateTimeUtil.now()); sysUser.setLoginErrorTimes(0); - sysUser.setState(UserState.ENABLE); + sysUser.setState(UserConst.STATE_ENABLE); boolean result = this.save(sysUser); sysUserRoleService.addUserRole(sysUser.getId(), addUserParam.getRoleIds()); return result; @@ -143,7 +144,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public boolean oldPwdConfirm(String userId, String oldPassword) { - SysUser user = lambdaQuery().ne(SysUser::getState, UserState.DELETE).eq(SysUser::getId, userId).one(); + SysUser user = lambdaQuery().ne(SysUser::getState, UserConst.STATE_DELETE).eq(SysUser::getId, userId).one(); if (ObjectUtil.isNotNull(user)) { String secretkey = Sm4Utils.globalSecretKey; Sm4Utils sm4 = new Sm4Utils(secretkey); @@ -156,7 +157,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @Override public boolean updatePassword(String userId, String newPassword) { - SysUser user = lambdaQuery().ne(SysUser::getState, UserState.DELETE).eq(SysUser::getId, userId).one(); + SysUser user = lambdaQuery().ne(SysUser::getState, UserConst.STATE_DELETE).eq(SysUser::getId, userId).one(); if (ObjectUtil.isNotNull(user)) { String secretkey = Sm4Utils.globalSecretKey; Sm4Utils sm4 = new Sm4Utils(secretkey); @@ -179,7 +180,7 @@ public class SysUserServiceImpl extends ServiceImpl impl // 删除用户角色关联数据 sysUserRoleService.deleteUserRoleByUserIds(ids); return this.lambdaUpdate() - .set(SysUser::getState, UserState.DELETE) + .set(SysUser::getState, UserConst.STATE_DELETE) .in(SysUser::getId, ids) .update(); } @@ -188,14 +189,14 @@ public class SysUserServiceImpl extends ServiceImpl impl public SysUser getUserByLoginNameAndPassword(String loginName, String password) { String secretkey = Sm4Utils.globalSecretKey; Sm4Utils sm4 = new Sm4Utils(secretkey); - return this.lambdaQuery().ne(SysUser::getState, UserState.DELETE) + return this.lambdaQuery().ne(SysUser::getState, UserConst.STATE_DELETE) .eq(SysUser::getLoginName, loginName) .eq(SysUser::getPassword, sm4.encryptData_ECB(password)).one(); } @Override public boolean isAdmin(String userId) { - SysUser user = lambdaQuery().ne(SysUser::getState, UserState.DELETE).eq(SysUser::getId, userId).one(); + SysUser user = lambdaQuery().ne(SysUser::getState, UserConst.STATE_DELETE).eq(SysUser::getId, userId).one(); if (ObjectUtil.isNotNull(user)) { List sysRoles = sysUserRoleService.listRoleByUserId(user.getId()); for (SysRole sysRole : sysRoles) {