From b5da2e3082a31f346aec8a8081c79e6fbf9faa27 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 8 Apr 2025 17:29:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../industry/software/manage/controller/UserController.java | 2 ++ .../manage/service/serviceimpl/EdFileInfoServiceImpl.java | 4 +++- .../manage/service/serviceimpl/FileBackLogServiceImpl.java | 1 + .../manage/service/serviceimpl/RoleServiceImpl.java | 1 + .../manage/service/serviceimpl/UserServiceImpl.java | 6 +++--- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java index 05f48f9..cb52513 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserController.java @@ -120,8 +120,10 @@ public class UserController { public ElectromagneticResult getAdminType() { String adminType = UserThreadLocal.getAdminType(); if (adminType == null || adminType.isEmpty()) { + UserThreadLocal.setSuccessInfo("", "", "查询当前用户的管理员类型失败，当前用户未登录"); return ElectromagneticResultUtil.fail("500", "当前用户未登录"); } else { + UserThreadLocal.setSuccessInfo("", "", "查询当前用户的管理员类型成功"); return ElectromagneticResultUtil.success(adminType); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index 8f4d18b..cc42aea 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -208,6 +208,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl()); } } else { @@ -1071,6 +1072,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl())); } @@ -1084,7 +1086,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl edFileInfoPage = this.baseMapper.selectPage(new Page<>(pageNum, pageSize), lambdaQuery); long total = edFileInfoPage.getTotal(); List uploadRecordDTOS = BeanUtil.copyToList(edFileInfoPage.getRecords(), UploadRecordDTO.class); - UserThreadLocal.setSuccessInfo("", "", "查看了发布管理"); + UserThreadLocal.setSuccessInfo("", "", "查看发布管理成功"); return ElectromagneticResultUtil.success(new UploadRecordVO(total, uploadRecordDTOS)); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java index 7857172..5d0f2cc 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileBackLogServiceImpl.java @@ -52,6 +52,7 @@ public class FileBackLogServiceImpl extends ServiceImpl records = fileBackupLogPage.getRecords(); if (CollUtil.isEmpty(records)) { + UserThreadLocal.setSuccessInfo("", "", "查询备份日志成功"); return ElectromagneticResultUtil.success(new RespPageVO<>(0L, records)); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java index d397d30..4cc72f4 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/RoleServiceImpl.java @@ -288,6 +288,7 @@ public class RoleServiceImpl extends ServiceImpl implements Ro nodes.add(rolePermissionDTO); } roleDTO.setData(buildTree(nodes)); + UserThreadLocal.setSuccessInfo("", "", "获取角色配置模版成功"); return roleDTO; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java index e9cae14..d061230 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserServiceImpl.java @@ -357,13 +357,13 @@ public class UserServiceImpl implements UserService { } } - // 在 UserServiceImpl.java 类中实现以下方法 @Override public ElectromagneticResult validateOldPassword(String userId, String oldInputPassword) { - User user = userMapper.getSingleUser(userId); Assert.notNull(user, StrFormatter.format("用户不存在，ID为 {}", userId)); String decodeOldPwd = AESUtils.decrypt(oldInputPassword, UserConstants.SECRET_KEY); - return ElectromagneticResultUtil.success(matchPassword(user, decodeOldPwd)); + Boolean res = matchPassword(user, decodeOldPwd); + UserThreadLocal.setSuccessInfo("", "", "校验原始密码，当前密码与原始密码匹配结果 {}", res); + return ElectromagneticResultUtil.success(res); } }