From d22b97e6f59eb6534875543f2d7de6a3f86279c8 Mon Sep 17 00:00:00 2001 From: dongzeliang <2746733890@qq.com> Date: Mon, 17 Mar 2025 21:57:30 +0800 Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=8C=85?= =?UTF-8?q?=E5=86=85=E5=AE=B9=EF=BC=8C=E8=8F=9C=E5=8D=95=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=81mybatis-plus=E5=85=83=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=8F=92=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/SystemMetaObjectHandler.java | 42 +++++++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 3 +- .../controller/SysDictDataController.java | 3 -- .../controller/SysDictTypeController.java | 3 -- .../system/controller/SysMenuController.java | 4 -- .../system/controller/SysPostController.java | 3 -- .../system/controller/SysRoleController.java | 4 -- .../system/controller/SysUserController.java | 4 -- .../com/muyu/system/domain/SysConfig.java | 3 -- .../java/com/muyu/system/domain/SysMenu.java | 1 + .../system/domain/model/SysMenuAddModel.java | 1 + .../system/domain/model/SysMenuUpdModel.java | 1 + .../muyu/system/domain/rep/SysDeptAddReq.java | 2 - .../muyu/system/domain/rep/SysDeptUpdReq.java | 2 - .../muyu/system/domain/rep/SysMenuUpdReq.java | 1 - .../com/muyu/system/rabbit/RabbitTest.java | 52 ------------------- .../service/impl/SysMenuServiceImpl.java | 5 +- 17 files changed, 49 insertions(+), 85 deletions(-) create mode 100644 cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/config/SystemMetaObjectHandler.java delete mode 100644 cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/config/SystemMetaObjectHandler.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/config/SystemMetaObjectHandler.java new file mode 100644 index 0000000..ff617f6 --- /dev/null +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/config/SystemMetaObjectHandler.java @@ -0,0 +1,42 @@ +package com.muyu.common.security.config; + +import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; +import com.muyu.common.core.basic.SecurityBasic; +import lombok.AllArgsConstructor; +import org.apache.ibatis.reflection.MetaObject; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; + +import java.util.Date; + +/** + * myBatsPlus字段自动填充 + * @author DongZeLiang + * @date 2025/03/02 22:24 + */ +@AllArgsConstructor //全参注入 +@ConditionalOnProperty(value = "mybatis-plus.meta.enabled", havingValue = "true") +public class SystemMetaObjectHandler implements MetaObjectHandler { + + private final SecurityBasic securityBasic; + + /** + * 数据库字段插入 + * @param metaObject 元对象 + */ + @Override + public void insertFill(MetaObject metaObject) { + this.strictInsertFill(metaObject, "createBy", String.class, securityBasic.getUsername()); + this.strictInsertFill(metaObject,"createTime", Date.class,new Date()); + } + + /** + * 数据库字段修改 + * @param metaObject 元对象 + */ + @Override + public void updateFill(MetaObject metaObject) { + this.strictUpdateFill(metaObject, "updateBy", String.class, securityBasic.getUsername()); + this.strictUpdateFill(metaObject,"updateTime", Date.class,new Date()); + } + +} diff --git a/cloud-common/cloud-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 66ebfea..369bb33 100644 --- a/cloud-common/cloud-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/cloud-common/cloud-common-security/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -3,4 +3,5 @@ com.muyu.common.security.service.TokenService com.muyu.common.security.aspect.PreAuthorizeAspect com.muyu.common.security.aspect.InnerAuthAspect com.muyu.common.security.handler.GlobalExceptionHandler -com.muyu.common.security.service.SecurityBasicImpl \ No newline at end of file +com.muyu.common.security.service.SecurityBasicImpl +com.muyu.common.security.config.SystemMetaObjectHandler diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java index 602226e..86ed86f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java @@ -9,7 +9,6 @@ import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDictData; import com.muyu.system.domain.model.SysDictDataAddModel; import com.muyu.system.domain.model.SysDictDataPageQueryModel; @@ -106,7 +105,6 @@ public class SysDictDataController extends BaseController { @Log(title = "字典数据", businessType = BusinessType.INSERT) @PostMapping public Result add (@Validated @RequestBody SysDictDataAddReq sysDictDataAddReq) { - sysDictDataAddReq.setCreateBy(SecurityUtils.getUsername()); dictDataService.insertDictData(SysDictDataAddModel.buildAddModel(sysDictDataAddReq)); return Result.success(); } @@ -118,7 +116,6 @@ public class SysDictDataController extends BaseController { @Log(title = "字典数据", businessType = BusinessType.UPDATE) @PutMapping public Result edit (@Validated @RequestBody SysDictDataUpdReq sysDictDataUpdReq) { - sysDictDataUpdReq.setUpdateBy(SecurityUtils.getUsername()); dictDataService.updateDictData(SysDictDataUpdModel.buildUpdModel(sysDictDataUpdReq)); return Result.success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java index b2422bc..289af79 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java @@ -7,7 +7,6 @@ import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDictType; import com.muyu.system.domain.model.SysDictTypeAddModel; import com.muyu.system.domain.model.SysDictTypePageQueryModel; @@ -77,7 +76,6 @@ public class SysDictTypeController extends BaseController { if (!dictTypeService.checkDictTypeUnique(SysDictTypeAddModel.buildModel(sysDictTypeAddReq))) { return error("新增字典'" + sysDictTypeAddReq.getDictName() + "'失败，字典类型已存在"); } - sysDictTypeAddReq.setCreateBy(SecurityUtils.getUsername()); dictTypeService.insertDictType(SysDictTypeAddModel.buildModel(sysDictTypeAddReq)); return Result.success(); } @@ -92,7 +90,6 @@ public class SysDictTypeController extends BaseController { if (!dictTypeService.checkDictTypeUnique(SysDictTypeUpdModel.buildUpdModel(sysDictTypeUpdReq))) { return error("修改字典'" + sysDictTypeUpdReq.getDictName() + "'失败，字典类型已存在"); } - sysDictTypeUpdReq.setUpdateBy(SecurityUtils.getUsername()); dictTypeService.updateDictType(SysDictTypeUpdModel.buildUpdModel(sysDictTypeUpdReq)); return Result.success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java index b2c60cd..988e578 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -98,7 +98,6 @@ public class SysMenuController extends BaseController { return error("新增菜单'" + sysMenuAddModel.getMenuName() + "'失败，地址必须以http(s)://开头"); } SysMenu menu = SysMenu.buildSysMenu(sysMenuAddReq); - menu.setCreateBy(SecurityUtils.getUsername()); menuService.insertMenu(SysMenuAddModel.of(sysMenuAddReq)); return Result.success(); } @@ -116,9 +115,6 @@ public class SysMenuController extends BaseController { } else if (UserConstants.YES_FRAME.equals(sysMenuAddModel.getIsFrame()) && !StringUtils.ishttp(sysMenuAddModel.getPath())) { return error("新增菜单'" + sysMenuAddModel.getMenuName() + "'失败，地址必须以http(s)://开头"); } - SysMenu menu = SysMenu.buildSysMenu(sysMenuAddModel); - menu.setCreateBy(SecurityUtils.getUsername()); - menu.setUpdateBy(SecurityUtils.getUsername()); menuService.updateMenu(SysMenuUpdModel.of(sysMenuUpdReq)); return Result.success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java index 441f40f..2e5603d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java @@ -8,7 +8,6 @@ import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysPost; import com.muyu.system.domain.model.SysPostEditModel; import com.muyu.system.domain.model.SysPostListModel; @@ -79,7 +78,6 @@ public class SysPostController extends BaseController { } else if (!postService.checkPostCodeUnique(SysPostSaveModel.saveBuild(sysPostSaveReq))) { return error("新增岗位'" + sysPostSaveReq.getPostName() + "'失败，岗位编码已存在"); } - sysPostSaveReq.setCreateBy(SecurityUtils.getUsername()); postService.insertPost(SysPost.saveBuild(SysPostSaveModel.saveBuild(sysPostSaveReq))); return Result.success(); } @@ -96,7 +94,6 @@ public class SysPostController extends BaseController { } else if (!postService.checkEditPostCodeUnique(SysPostEditModel.editBuild(sysPostEditReq))) { return error("修改岗位'" + sysPostEditReq.getPostName() + "'失败，岗位编码已存在"); } - sysPostEditReq.setUpdateBy(SecurityUtils.getUsername()); postService.updatePost(SysPost.editBuild(SysPostEditModel.editBuild(sysPostEditReq))); return Result.success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java index d813518..c191cff 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -7,7 +7,6 @@ import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysUserRole; @@ -77,7 +76,6 @@ public class SysRoleController extends BaseController { } else if (!roleService.checkRoleKeyUnique(role)) { return error("新增角色'" + role.getRoleName() + "'失败，角色权限已存在"); } - role.setCreateBy(SecurityUtils.getUsername()); return toAjax(roleService.insertRole(role)); } @@ -96,7 +94,6 @@ public class SysRoleController extends BaseController { } else if (!roleService.checkRoleKeyUnique(role)) { return error("修改角色'" + role.getRoleName() + "'失败，角色权限已存在"); } - role.setUpdateBy(SecurityUtils.getUsername()); return toAjax(roleService.updateRole(role)); } @@ -122,7 +119,6 @@ public class SysRoleController extends BaseController { public Result changeStatus (@RequestBody SysRole role) { roleService.checkRoleAllowed(role); roleService.checkRoleDataScope(role.getRoleId()); - role.setUpdateBy(SecurityUtils.getUsername()); roleService.updateRoleStatus(role); return Result.success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index 2e5d44a..e14bdbb 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -187,7 +187,6 @@ public class SysUserController extends BaseController { } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } - user.setCreateBy(SecurityUtils.getUsername()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); userService.insertUser(user); return Result.success(); @@ -209,7 +208,6 @@ public class SysUserController extends BaseController { } else if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(user)) { return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在"); } - user.setUpdateBy(SecurityUtils.getUsername()); userService.updateUser(user); return Result.success(); } @@ -238,7 +236,6 @@ public class SysUserController extends BaseController { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); - user.setUpdateBy(SecurityUtils.getUsername()); userService.resetPwd(user); return Result.success(); } @@ -252,7 +249,6 @@ public class SysUserController extends BaseController { public Result changeStatus (@RequestBody SysUser user) { userService.checkUserAllowed(user); userService.checkUserDataScope(user.getUserId()); - user.setUpdateBy(SecurityUtils.getUsername()); userService.updateUserStatus(user); return Result.success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java index 6c531b7..0955ded 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java @@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; -import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.rep.SysConfigAddReq; import com.muyu.system.domain.rep.SysConfigUpdReq; import jakarta.validation.constraints.NotBlank; @@ -92,7 +91,6 @@ public class SysConfig extends BaseEntity { .configValue(addReq.getConfigValue()) .configType(addReq.getConfigType()) .remark(addReq.getRemark()) - .createBy(SecurityUtils.getUsername()) .build(); } /** @@ -108,7 +106,6 @@ public class SysConfig extends BaseEntity { .configValue(updReq.getConfigValue()) .configType(updReq.getConfigType()) .remark(updReq.getRemark()) - .updateBy(SecurityUtils.getUsername()) .build(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java index aeb18d5..255b29e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java @@ -225,6 +225,7 @@ public class SysMenu extends BaseEntity { public static SysMenu buildSysMenu(SysMenuAddModel sysMenuAddModel) { return SysMenu.builder() + .menuId(sysMenuAddModel.getMenuId()) .menuName(sysMenuAddModel.getMenuName()) .parentId(sysMenuAddModel.getParentId()) .orderNum(sysMenuAddModel.getOrderNum()) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuAddModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuAddModel.java index 79aad8d..e1f2b90 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuAddModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuAddModel.java @@ -118,6 +118,7 @@ public class SysMenuAddModel { public static SysMenuAddModel buildSysMenuAddModel(SysMenuUpdReq sysMenuUpdReq){ return SysMenuAddModel.builder() + .menuId(sysMenuUpdReq.getMenuId()) .menuName(sysMenuUpdReq.getMenuName()) .parentId(sysMenuUpdReq.getParentId()) .orderNum(sysMenuUpdReq.getOrderNum()) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuUpdModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuUpdModel.java index 355d465..0beefe0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuUpdModel.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuUpdModel.java @@ -98,6 +98,7 @@ public class SysMenuUpdModel { public static SysMenuUpdModel of(SysMenuUpdReq sysMenuUpdReq) { return SysMenuUpdModel.builder() + .menuId(sysMenuUpdReq.getMenuId()) .menuName(sysMenuUpdReq.getMenuName()) .parentId(sysMenuUpdReq.getParentId()) .orderNum(sysMenuUpdReq.getOrderNum()) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptAddReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptAddReq.java index cafdb1d..d82759f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptAddReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptAddReq.java @@ -1,7 +1,6 @@ package com.muyu.system.domain.rep; import com.muyu.common.core.enums.SysDelFlagEnum; -import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import lombok.AllArgsConstructor; import lombok.Builder; @@ -66,7 +65,6 @@ public class SysDeptAddReq { .status(this.status) .leader(this.leader) .parentId(this.parentId) - .createBy(SecurityUtils.getUsername()) .build(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptUpdReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptUpdReq.java index cb63663..72630ce 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptUpdReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptUpdReq.java @@ -1,6 +1,5 @@ package com.muyu.system.domain.rep; -import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import lombok.AllArgsConstructor; import lombok.Builder; @@ -64,7 +63,6 @@ public class SysDeptUpdReq { .status(this.status) .leader(this.leader) .parentId(this.parentId) - .updateBy(SecurityUtils.getUsername()) .build(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuUpdReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuUpdReq.java index 7c304b3..3a66612 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuUpdReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuUpdReq.java @@ -56,7 +56,6 @@ public class SysMenuUpdReq { /** * 组件路径 */ - @NotBlank(message = "组件路径不能为空") private String component; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java deleted file mode 100644 index 78c182b..0000000 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java +++ /dev/null @@ -1,52 +0,0 @@ -//package com.muyu.system.rabbit; -// -//import com.alibaba.fastjson2.JSONObject; -//import com.muyu.system.domain.SysConfig; -//import jakarta.annotation.PostConstruct; -//import lombok.extern.log4j.Log4j2; -//import org.springframework.amqp.core.Queue; -//import org.springframework.amqp.rabbit.annotation.RabbitListener; -//import org.springframework.amqp.rabbit.core.RabbitTemplate; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.context.annotation.Bean; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//@Log4j2 -//@RestController -//@RequestMapping("/rabbit/test") -//public class RabbitTest { -// -// @Autowired -// private RabbitTemplate rabbitTemplate; -// -// @Bean -// public Queue initQueue(){ -// return new Queue("rabbit.test.init"); -// } -// -// @RabbitListener(queues = "rabbit.test.init") -// public void msg(SysConfig sysConfig){ -// log.info("消息队列：[{}], 消息内容：[{}]", "rabbit.test.init", JSONObject.toJSONString(sysConfig)); -// } -// -// @PostConstruct -// public void init(){ -// new Thread(() -> { -// try { -// Thread.sleep(5000); -// } catch (InterruptedException e) { -// throw new RuntimeException(e); -// } -// SysConfig sysConfig = SysConfig.builder() -// .configId(1L) -// .configKey("ceshi-key") -// .configName("测试名称") -// .configType("测试类型") -// .configValue("测试值") -// .build(); -// rabbitTemplate.convertAndSend("rabbit.test.init",sysConfig); -// }).start(); -// } -// -//} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index f955319..cd60bde 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -351,10 +351,9 @@ public class SysMenuServiceImpl extends ServiceImpl impl */ @Override public boolean checkMenuNameUnique (SysMenuAddModel sysMenuAddModel) { - SysMenu menu = SysMenu.buildSysMenu(sysMenuAddModel); LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(SysMenu::getMenuName, menu.getMenuName()); - lambdaQueryWrapper.ne(menu.getMenuId() != null, SysMenu::getParentId, menu.getParentId()); + lambdaQueryWrapper.eq(SysMenu::getMenuName, sysMenuAddModel.getMenuName()); + lambdaQueryWrapper.ne(sysMenuAddModel.getMenuId() != null, SysMenu::getParentId, sysMenuAddModel.getParentId()); if (this.count(lambdaQueryWrapper) > 0) { return UserConstants.NOT_UNIQUE; }