From 98a90516b381f8646e04e003f82947c66aaeebac Mon Sep 17 00:00:00 2001 From: yu Date: Tue, 22 Oct 2024 15:12:29 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=90=8D=E7=A7=B0=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E4=BC=98=E5=8C=96;=20=E8=AE=BE=E5=A4=87=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E5=8E=BB=E9=99=A4=E7=A9=BA=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/SysMenusController.java | 5 ++++- .../controller/SysEnumController.java | 17 ++++++++++++++++ .../equipment/service/SysEnumService.java | 2 ++ .../service/impl/SysEnumServiceImpl.java | 20 +++++++++++++++++++ .../service/impl/SysEquipmentServiceImpl.java | 4 ++++ 5 files changed, 47 insertions(+), 1 deletion(-) diff --git a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java index 45b33017..75bd2071 100644 --- a/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java +++ b/das/src/main/java/com/das/modules/auth/controller/SysMenusController.java @@ -41,6 +41,9 @@ public class SysMenusController { if(!hasPermission){ return R.fail("没有系统管理权限"); } + if (!sysMenuDto.getMenuName().matches("^[a-zA-Z]*$")){ + return R.fail("菜单名称,必须为英文"); + } return R.success(sysMenuService.createMenu(sysMenuDto)); } @@ -55,7 +58,7 @@ public class SysMenusController { if(!hasPermission){ return R.fail("没有系统管理权限"); } - if (StringUtils.isAllEnglishLetters(sysMenuDto.getMenuName())){ + if (!sysMenuDto.getMenuName().matches("^[a-zA-Z]*$")){ return R.fail("菜单名称,必须为英文"); } sysMenuService.updateMenu(sysMenuDto); diff --git a/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java b/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java index ba161a15..a9dd9816 100644 --- a/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java +++ b/das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java @@ -62,6 +62,23 @@ public class SysEnumController { } + /** 更新枚举值 */ + @PostMapping("/updateEnumValues") + public R updateEnumValues(@RequestBody SysEnumValuesDto sysEnumValuesDto) { + //判断是否有权限 + boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString()); + if(!hasPermission){ + return R.fail("没有设备管理权限"); + } + if (sysEnumValuesDto.getEnumTypeId() ==null && StringUtils.isBlank(sysEnumValuesDto.getValue()) + || sysEnumValuesDto.getOrderNumber() == null || sysEnumValuesDto.getIsActive() ==null || + sysEnumValuesDto.getId() ==null) { + throw new ServiceException("参数缺失"); + } + SysEnumValuesVo sysEnumValuesVo = sysEnumService.updateEnumValues(sysEnumValuesDto); + return R.success(sysEnumValuesVo); + } + /** * 查询枚举类型列表 * diff --git a/das/src/main/java/com/das/modules/equipment/service/SysEnumService.java b/das/src/main/java/com/das/modules/equipment/service/SysEnumService.java index 596cc9c9..ce4f13e1 100644 --- a/das/src/main/java/com/das/modules/equipment/service/SysEnumService.java +++ b/das/src/main/java/com/das/modules/equipment/service/SysEnumService.java @@ -14,6 +14,8 @@ public interface SysEnumService { SysEnumValuesVo addEnumValues(SysEnumValuesDto sysEnumValuesDto); + SysEnumValuesVo updateEnumValues(SysEnumValuesDto sysEnumValuesDto); + List queryEnumTypesList(); PageDataInfo queryEnumValuesList(SysEnumValuesDto sysEnumValuesDto); diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java index b076db8e..12e9b263 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java @@ -80,6 +80,26 @@ public class SysEnumServiceImpl implements SysEnumService { return sysEnumValuesVo; } + @Override + public SysEnumValuesVo updateEnumValues(SysEnumValuesDto sysEnumValuesDto) { + SysEnumValues sysEnumValues = new SysEnumValues(); + BeanCopyUtils.copy(sysEnumValuesDto,sysEnumValues); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("enum_type_id",sysEnumValuesDto.getEnumTypeId()); + queryWrapper.eq("description",sysEnumValuesDto.getDescription()); + Long count = sysEnumValuesMapper.selectCount(queryWrapper); + if (count >0){ + throw new ServiceException("枚举值描述,不可重复!"); + } + SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); + sysEnumValues.setUpdatedBy(sysUserVo.getAccount()); + sysEnumValues.setUpdatedTime(new Date()); + sysEnumValuesMapper.updateById(sysEnumValues); + SysEnumValuesVo sysEnumValuesVo = new SysEnumValuesVo(); + BeanCopyUtils.copy(sysEnumValues, sysEnumValuesVo); + return sysEnumValuesVo; + } + /** * 查询枚举类型列表 * @return diff --git a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java index c9be0752..159eb70a 100644 --- a/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java +++ b/das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java @@ -60,6 +60,8 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { @Override public SysEquipmentVo creatSysEquipment(SysEquipmentDto sysEquipmentDto) { + //去除空格 + sysEquipmentDto.setCode(sysEquipmentDto.getCode().replaceAll(" ", "")); SysEquipment sysEquipment = new SysEquipment(); BeanCopyUtils.copy(sysEquipmentDto, sysEquipment); @@ -81,6 +83,8 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { @Override public SysEquipmentVo updateSysEquipment(SysEquipmentDto sysEquipmentDto) { + //去除空格 + sysEquipmentDto.setCode(sysEquipmentDto.getCode().replaceAll(" ", "")); SysEquipment sysEquipment = new SysEquipment(); BeanCopyUtils.copy(sysEquipmentDto, sysEquipment); SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY);