From 16ffd7f5fd416d2dc159e9b749cd28f1f88fd482 Mon Sep 17 00:00:00 2001 From: wangrunpu <2095588299@qq.com> Date: Mon, 15 Dec 2025 15:13:12 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=88=A4=E9=87=8D=E9=80=BB=E8=BE=91=E3=80=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E7=AD=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 10 +++++----- .../main/java/org/dromara/DromaraApplication.java | 2 +- .../org/dromara/web/controller/AuthController.java | 2 +- ruoyi-admin/src/main/resources/application-dev.yml | 4 ++-- ruoyi-admin/src/main/resources/application.yml | 2 +- .../mybatis/handler/PlusDataPermissionHandler.java | 1 - .../src/main/resources/application.yml | 4 ++-- .../src/main/resources/application.yml | 2 +- .../hazard/controller/DustDustinfoController.java | 12 ++++++------ .../controller/system/SysProfileController.java | 2 +- .../controller/system/SysTenantController.java | 12 +++++------- .../controller/system/SysUserController.java | 8 ++++---- .../dromara/system/service/ISysUserService.java | 8 ++++---- .../system/service/impl/SysTenantServiceImpl.java | 1 - .../system/service/impl/SysUserServiceImpl.java | 14 ++++++++------ 15 files changed, 41 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index 04e5f86db..886254df1 100644 --- a/pom.xml +++ b/pom.xml @@ -8,9 +8,9 @@ ruoyi-vue-plus ${revision} - RuoYi-Vue-Plus + stm32-iot-server https://gitee.com/dromara/RuoYi-Vue-Plus - Dromara RuoYi-Vue-Plus多租户管理系统 + 涉尘涉爆后台管理系统 5.5.1 @@ -69,7 +69,7 @@ local info - ruoyi + admin 123456 @@ -79,7 +79,7 @@ dev info - ruoyi + admin 123456 @@ -92,7 +92,7 @@ prod warn - ruoyi + admin 123456 diff --git a/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java b/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java index 8ef33fe5f..716054bd8 100644 --- a/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java +++ b/ruoyi-admin/src/main/java/org/dromara/DromaraApplication.java @@ -17,7 +17,7 @@ public class DromaraApplication { SpringApplication application = new SpringApplication(DromaraApplication.class); application.setApplicationStartup(new BufferingApplicationStartup(2048)); application.run(args); - System.out.println("(♥◠‿◠)ﾉﾞ RuoYi-Vue-Plus启动成功 ლ(´ڡ`ლ)ﾞ"); + System.out.println("(♥◠‿◠)ﾉﾞ 涉尘涉爆服务端启动成功 ლ(´ڡ`ლ)ﾞ"); } } diff --git a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java index e4be72c36..c3f3eeba9 100644 --- a/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java +++ b/ruoyi-admin/src/main/java/org/dromara/web/controller/AuthController.java @@ -106,7 +106,7 @@ public class AuthController { Long userId = LoginHelper.getUserId(); scheduledExecutorService.schedule(() -> { SseMessageDto dto = new SseMessageDto(); - dto.setMessage("欢迎登录RuoYi-Vue-Plus后台管理系统"); + dto.setMessage("欢迎登录涉尘涉爆后台管理系统"); dto.setUserIds(List.of(userId)); SseMessageUtils.publishMessage(dto); }, 5, TimeUnit.SECONDS); diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 0e9e259a6..805d016db 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -119,7 +119,7 @@ redisson: # 单节点配置 singleServerConfig: # 客户端名称 不能用中文 - clientName: RuoYi-Vue-Plus + clientName: stm32-iot-server # 最小空闲连接数 connectionMinimumIdleSize: 8 # 连接池大小 @@ -274,7 +274,7 @@ justauth: mqtt: server: http://localhost:18083 host: tcp://83l6076j43.goho.co:37690 - client-id: stm32-iot-server # 推荐使用模块名+端口，确保唯一性 + client-id: stm32-iot-server890 # 推荐使用模块名+端口，确保唯一性 username: password: api-key: 890c854975af5456 diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 866b8f1a2..9f45d0791 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -52,7 +52,7 @@ user: # Spring配置 spring: application: - name: RuoYi-Vue-Plus + name: stm32-iot-server threads: # 开启虚拟线程 仅jdk21可用 virtual: diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java index 5c2ca983b..0a6be6782 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/handler/PlusDataPermissionHandler.java @@ -146,7 +146,6 @@ public class PlusDataPermissionHandler { for (DataColumn dataColumn : dataPermission.value()) { // 包含权限标识符 这直接跳过 if (ignoreMap.containsKey(dataColumn)) { - // 修复多角色与权限标识符共用问题 https://gitee.com/dromara/RuoYi-Vue-Plus/issues/IB4CS4 conditions.add(joinStr + " 1 = 1 "); isSuccess = true; continue; diff --git a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml index 1dd5a8308..a3d399d23 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml +++ b/ruoyi-extend/ruoyi-monitor-admin/src/main/resources/application.yml @@ -2,7 +2,7 @@ server: port: 9090 spring: application: - name: ruoyi-monitor-admin + name: stm32-iot-monitor profiles: active: @profiles.active@ @@ -18,7 +18,7 @@ spring: boot: admin: ui: - title: RuoYi-Vue-Plus服务监控中心 + title: 涉尘涉爆管理平台服务监控中心 context-path: /admin # 忽略无用警告 thymeleaf: diff --git a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml index ba6df45fb..750271485 100644 --- a/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml +++ b/ruoyi-extend/ruoyi-snailjob-server/src/main/resources/application.yml @@ -5,7 +5,7 @@ server: spring: application: - name: ruoyi-snailjob-server + name: stm32-iot-snailjob profiles: active: @profiles.active@ web: diff --git a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/DustDustinfoController.java b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/DustDustinfoController.java index 87f8d53b6..b41182ea8 100644 --- a/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/DustDustinfoController.java +++ b/ruoyi-modules/ruoyi-hazard/src/main/java/org/dromara/hazard/controller/DustDustinfoController.java @@ -39,7 +39,7 @@ public class DustDustinfoController extends BaseController { /** * 查询涉尘信息列表 */ - @SaCheckPermission("hazard:dustDustinfo:list") + @SaCheckPermission("hazard:dustCompanyinfo:list") @GetMapping("/list") public TableDataInfo list(DustDustinfoBo bo, PageQuery pageQuery) { return dustDustinfoService.queryPageList(bo, pageQuery); @@ -50,7 +50,7 @@ public class DustDustinfoController extends BaseController { /** * 导出涉尘信息列表 */ - @SaCheckPermission("hazard:dustDustinfo:export") + @SaCheckPermission("hazard:dustCompanyinfo:export") @Log(title = "涉尘信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(DustDustinfoBo bo, HttpServletResponse response) { @@ -63,7 +63,7 @@ public class DustDustinfoController extends BaseController { * * @param id 主键 */ - @SaCheckPermission("hazard:dustDustinfo:query") + @SaCheckPermission("hazard:dustCompanyinfo:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable String id) { @@ -73,7 +73,7 @@ public class DustDustinfoController extends BaseController { /** * 新增涉尘信息 */ - @SaCheckPermission("hazard:dustDustinfo:add") + @SaCheckPermission("hazard:dustCompanyinfo:add") @Log(title = "涉尘信息", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -84,7 +84,7 @@ public class DustDustinfoController extends BaseController { /** * 修改涉尘信息 */ - @SaCheckPermission("hazard:dustDustinfo:edit") + @SaCheckPermission("hazard:dustCompanyinfo:edit") @Log(title = "涉尘信息", businessType = BusinessType.UPDATE) @RepeatSubmit() @PutMapping() @@ -97,7 +97,7 @@ public class DustDustinfoController extends BaseController { * * @param ids 主键串 */ - @SaCheckPermission("hazard:dustDustinfo:remove") + @SaCheckPermission("hazard:dustCompanyinfo:remove") @Log(title = "涉尘信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java index 5cae89764..9621cb239 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java @@ -67,7 +67,7 @@ public class SysProfileController extends BaseController { SysUserBo user = BeanUtil.toBean(profile, SysUserBo.class); user.setUserId(LoginHelper.getUserId()); String username = LoginHelper.getUsername(); - if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user.getPhonenumber())) { + if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { return R.fail("修改用户'" + username + "'失败，手机号码已存在"); } if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java index 4e83f03c7..c9f241d15 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysTenantController.java @@ -22,6 +22,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysTenantBo; +import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysTenantVo; import org.dromara.system.service.ISysTenantService; import org.dromara.system.service.ISysUserService; @@ -95,13 +96,13 @@ public class SysTenantController extends BaseController { if (!tenantService.checkCompanyNameUnique(bo)) { return R.fail("新增租户'" + bo.getCompanyName() + "'失败，企业名称已存在"); } + SysUserBo user = new SysUserBo(); + user.setPhonenumber(bo.getContactPhone()); + user.setUserName(bo.getUsername()); // 校验用户名和手机号是否全局唯一(方法内部已使用TenantHelper.ignore) - if (!userService.checkUserNameUnique(bo.getUsername())) { + if (!userService.checkUserNameUnique(user)) { return R.fail("新增租户失败，管理员账号'" + bo.getUsername() + "'已存在"); } - if (!userService.checkPhoneUnique(bo.getContactPhone())) { - return R.fail("新增租户失败，联系电话'" + bo.getContactPhone() + "'已存在"); - } return toAjax(TenantHelper.ignore(() -> tenantService.insertByBo(bo))); } @@ -118,9 +119,6 @@ public class SysTenantController extends BaseController { if (!tenantService.checkCompanyNameUnique(bo)) { return R.fail("修改租户'" + bo.getCompanyName() + "'失败，公司名称已存在"); } - if (!userService.checkPhoneUnique(bo.getContactPhone())) { - return R.fail("新增租户失败，联系电话'" + bo.getContactPhone() + "'已存在"); - } return toAjax(tenantService.updateByBo(bo)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index 3c84acdff..c8673a15c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -168,9 +168,9 @@ public class SysUserController extends BaseController { @PostMapping public R add(@Validated @RequestBody SysUserBo user) { deptService.checkDeptDataScope(user.getDeptId()); - if (!userService.checkUserNameUnique(user.getUserName())) { + if (!userService.checkUserNameUnique(user)) { return R.fail("新增用户'" + user.getUserName() + "'失败，登录账号已存在"); - } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user.getPhonenumber())) { + } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { return R.fail("新增用户'" + user.getUserName() + "'失败，手机号码已存在"); } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return R.fail("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); @@ -195,9 +195,9 @@ public class SysUserController extends BaseController { userService.checkUserAllowed(user.getUserId()); userService.checkUserDataScope(user.getUserId()); deptService.checkDeptDataScope(user.getDeptId()); - if (!userService.checkUserNameUnique(user.getUserName())) { + if (!userService.checkUserNameUnique(user)) { return R.fail("修改用户'" + user.getUserName() + "'失败，登录账号已存在"); - } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user.getPhonenumber())) { + } else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user)) { return R.fail("修改用户'" + user.getUserName() + "'失败，手机号码已存在"); } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return R.fail("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index ce4c0be73..1fe554547 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -103,18 +103,18 @@ public interface ISysUserService { /** * 校验用户名称是否唯一 * - * @param username 用户信息 + * @param user 用户信息 * @return 结果 */ - boolean checkUserNameUnique(String username); + boolean checkUserNameUnique(SysUserBo user); /** * 校验手机号码是否唯一 * - * @param phone 用户信息 + * @param user 用户信息 * @return 结果 */ - boolean checkPhoneUnique(String phone); + boolean checkPhoneUnique(SysUserBo user); /** * 校验email是否唯一 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index 7aa29acc8..570cb5dcd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -177,7 +177,6 @@ public class SysTenantServiceImpl implements ISysTenantService { user.setNickName(bo.getUsername()); user.setPassword(BCrypt.hashpw(bo.getPassword())); user.setDeptId(deptId); - user.setPhonenumber(bo.getContactPhone()); userMapper.insert(user); //新增系统用户后，默认当前用户为部门的负责人 SysDept sd = new SysDept(); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index c1e2ecdc6..b20fe0612 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -236,15 +236,16 @@ public class SysUserServiceImpl implements ISysUserService, UserService { /** * 校验用户名称是否唯一 * - * @param username 用户信息 + * @param user 用户信息 * @return 结果 */ @Override - public boolean checkUserNameUnique(String username) { + public boolean checkUserNameUnique(SysUserBo user) { AtomicBoolean exist = new AtomicBoolean(false); TenantHelper.ignore(() -> { exist.set(baseMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getUserName, username))); + .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()) + .eq(SysUser::getUserName, user.getUserName()))); }); return !exist.get(); @@ -253,14 +254,15 @@ public class SysUserServiceImpl implements ISysUserService, UserService { /** * 校验手机号码是否唯一 * - * @param phonenumber 用户信息 + * @param user 用户信息 */ @Override - public boolean checkPhoneUnique(String phonenumber) { + public boolean checkPhoneUnique(SysUserBo user) { AtomicBoolean exist = new AtomicBoolean(false); TenantHelper.ignore(() -> { exist.set(baseMapper.exists(new LambdaQueryWrapper() - .eq(SysUser::getPhonenumber, phonenumber))); + .ne(ObjectUtil.isNotNull(user.getUserId()), SysUser::getUserId, user.getUserId()) + .eq(SysUser::getPhonenumber, user.getPhonenumber()))); }); return !exist.get(); }