From 7755b45b59d6a461a06f1f8a79cb2f38028f8ced Mon Sep 17 00:00:00 2001 From: yu Date: Tue, 15 Oct 2024 14:51:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E8=B7=AF=E7=94=B1,?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=AD=E6=96=87=E6=8F=8F=E8=BF=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5;=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=20=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E6=B8=85=E5=8D=95,=E6=B7=BB=E5=8A=A0=E6=89=80?= =?UTF-8?q?=E5=B1=9E=20=E7=BA=BF=E8=B7=AF=E5=92=8C=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E4=B8=BA=E6=A0=87=E6=9D=86=E6=9C=BA=E7=BB=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/das/common/utils/StringUtils.java | 8 ++++++++ .../modules/auth/controller/SysMenusController.java | 9 +++++++-- .../com/das/modules/auth/domain/dto/SysMenuDto.java | 2 ++ .../das/modules/auth/domain/dto/SysMenuQueryDto.java | 5 ++++- .../com/das/modules/auth/domain/vo/SysMenuVo.java | 2 ++ .../java/com/das/modules/auth/entity/SysMenu.java | 4 ++++ .../equipment/domain/dto/SysEquipmentDto.java | 12 ++++++++++++ .../modules/equipment/domain/vo/SysEquipmentVo.java | 11 +++++++++++ .../das/modules/equipment/entity/SysEquipment.java | 12 ++++++++++++ das/src/main/resources/mapper/SysEquipmentMapper.xml | 2 ++ das/src/main/resources/mapper/SysMenuMapper.xml | 5 +++++ 11 files changed, 69 insertions(+), 3 deletions(-) diff --git a/das/src/main/java/com/das/common/utils/StringUtils.java b/das/src/main/java/com/das/common/utils/StringUtils.java index 44d40d9a..6b29264b 100644 --- a/das/src/main/java/com/das/common/utils/StringUtils.java +++ b/das/src/main/java/com/das/common/utils/StringUtils.java @@ -339,4 +339,12 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { return c; } + public static boolean isAllEnglishLetters(String str) { + if (str == null || str.isEmpty()) { + return false; + } + // 正则表达式 [a-zA-Z] 匹配英文字母 + return str.matches("[a-zA-Z]+"); + } + } 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 6993a3d6..f95da79e 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 @@ -5,6 +5,7 @@ import com.das.common.config.SessionUtil; import com.das.common.constant.SysAuthorityIds; import com.das.common.result.R; import com.das.common.utils.PageDataInfo; +import com.das.common.utils.StringUtils; import com.das.modules.auth.domain.dto.DeleteDto; import com.das.modules.auth.domain.dto.SysMenuDto; import com.das.modules.auth.domain.dto.SysMenuQueryDto; @@ -35,12 +36,14 @@ public class SysMenusController { */ @PostMapping("/add") public R createMenu(@RequestBody SysMenuDto sysMenuDto) { - //判断是否有权限 boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_ADMIN.toString()); if(!hasPermission){ return R.fail("没有系统管理权限"); } + if (StringUtils.isAllEnglishLetters(sysMenuDto.getMenuName())){ + return R.fail("菜单名称,必须为英文"); + } return R.success(sysMenuService.createMenu(sysMenuDto)); } @@ -55,7 +58,9 @@ public class SysMenusController { if(!hasPermission){ return R.fail("没有系统管理权限"); } - + if (StringUtils.isAllEnglishLetters(sysMenuDto.getMenuName())){ + return R.fail("菜单名称,必须为英文"); + } sysMenuService.updateMenu(sysMenuDto); return R.success(); } diff --git a/das/src/main/java/com/das/modules/auth/domain/dto/SysMenuDto.java b/das/src/main/java/com/das/modules/auth/domain/dto/SysMenuDto.java index 89bd5398..706ddc1a 100644 --- a/das/src/main/java/com/das/modules/auth/domain/dto/SysMenuDto.java +++ b/das/src/main/java/com/das/modules/auth/domain/dto/SysMenuDto.java @@ -14,6 +14,8 @@ public class SysMenuDto implements Serializable { private Long id ; /** 菜单名称 */ private String menuName ; + /** 菜单名称中文描述 */ + private String menuDesc ; /** 菜单排列顺序 */ private Integer menuOrder ; /** 菜单图标名称 */ diff --git a/das/src/main/java/com/das/modules/auth/domain/dto/SysMenuQueryDto.java b/das/src/main/java/com/das/modules/auth/domain/dto/SysMenuQueryDto.java index 89ead2d2..b0d39c40 100644 --- a/das/src/main/java/com/das/modules/auth/domain/dto/SysMenuQueryDto.java +++ b/das/src/main/java/com/das/modules/auth/domain/dto/SysMenuQueryDto.java @@ -12,8 +12,11 @@ public class SysMenuQueryDto implements Serializable { @JsonSerialize(using = ToStringSerializer.class) private Long id ; - /** 菜单名称 */ + /** 菜单英文名称 */ private String menuName ; + /** 菜单中文名称 */ + private String menuDesc ; + /** 上级菜单ID */ @JsonSerialize(using = ToStringSerializer.class) private Long parentMenuId ; diff --git a/das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java b/das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java index 37efdbed..303da4c4 100644 --- a/das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java +++ b/das/src/main/java/com/das/modules/auth/domain/vo/SysMenuVo.java @@ -19,6 +19,8 @@ public class SysMenuVo implements Serializable { private Long id ; /** 菜单名称 */ private String menuName ; + /** 菜单中文名称 */ + private String menuDesc ; /** 菜单排列顺序 */ private Integer menuOrder ; /** 菜单图标名称 */ diff --git a/das/src/main/java/com/das/modules/auth/entity/SysMenu.java b/das/src/main/java/com/das/modules/auth/entity/SysMenu.java index 65d0fb77..b91c455c 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysMenu.java +++ b/das/src/main/java/com/das/modules/auth/entity/SysMenu.java @@ -40,6 +40,10 @@ public class SysMenu extends BaseEntity { @TableField("menu_name") private String menuName ; + /** 菜单名称,中文描述 */ + @TableField("menu_desc") + private String menuDesc ; + /** 菜单排列顺序 */ @TableField("menu_order") private Integer menuOrder ; diff --git a/das/src/main/java/com/das/modules/equipment/domain/dto/SysEquipmentDto.java b/das/src/main/java/com/das/modules/equipment/domain/dto/SysEquipmentDto.java index c8854bbd..486a0a65 100644 --- a/das/src/main/java/com/das/modules/equipment/domain/dto/SysEquipmentDto.java +++ b/das/src/main/java/com/das/modules/equipment/domain/dto/SysEquipmentDto.java @@ -95,4 +95,16 @@ public class SysEquipmentDto { * 当前页数 */ private Integer pageNum; + + /** + * 所属线路 + */ + private String belongLine; + + /** + * 是否为标杆机组 + */ + private Integer standard; + + } diff --git a/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java b/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java index 12947345..cd63e6b6 100644 --- a/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java +++ b/das/src/main/java/com/das/modules/equipment/domain/vo/SysEquipmentVo.java @@ -102,4 +102,15 @@ public class SysEquipmentVo{ */ @TableField(exist = false) private List equipChildren; + + /** + * 所属线路 + */ + private String belongLine; + + /** + * 是否为标杆机组 + */ + private Integer standard; + } diff --git a/das/src/main/java/com/das/modules/equipment/entity/SysEquipment.java b/das/src/main/java/com/das/modules/equipment/entity/SysEquipment.java index 593f84e2..b33d349d 100644 --- a/das/src/main/java/com/das/modules/equipment/entity/SysEquipment.java +++ b/das/src/main/java/com/das/modules/equipment/entity/SysEquipment.java @@ -119,4 +119,16 @@ public class SysEquipment extends BaseEntity { @TableField(value = "iot_model_id") @JsonSerialize(using = ToStringSerializer.class) private Long iotModelId; + + /** + * 所属线路 + */ + @TableField(value = "belong_line") + private String belongLine; + + /** + * 是否为标杆机组 + */ + @TableField(value = "standard") + private Integer standard; } diff --git a/das/src/main/resources/mapper/SysEquipmentMapper.xml b/das/src/main/resources/mapper/SysEquipmentMapper.xml index 7543c2c7..b3c44f70 100644 --- a/das/src/main/resources/mapper/SysEquipmentMapper.xml +++ b/das/src/main/resources/mapper/SysEquipmentMapper.xml @@ -17,6 +17,8 @@ + + diff --git a/das/src/main/resources/mapper/SysMenuMapper.xml b/das/src/main/resources/mapper/SysMenuMapper.xml index beb931ad..3e9e42c6 100644 --- a/das/src/main/resources/mapper/SysMenuMapper.xml +++ b/das/src/main/resources/mapper/SysMenuMapper.xml @@ -5,6 +5,7 @@ + @@ -22,6 +23,7 @@ + @@ -48,6 +50,9 @@ and menu_name like concat('%',#{sysMenu.menuName},'%') + + and menu_desc like concat('%',#{sysMenu.menuDesc},'%') + order by menu_order From ec2c51002711b8367fda7dd9c707ca6bc0c1e644 Mon Sep 17 00:00:00 2001 From: yuwanchiren <863666755@qq.com> Date: Tue, 15 Oct 2024 14:52:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../equipment/equipmentManagement/index.vue | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue index 49cc5deb..eab17544 100644 --- a/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue +++ b/ui/dasadmin/src/views/backend/equipment/equipmentManagement/index.vue @@ -147,12 +147,12 @@ - + - + @@ -302,12 +302,17 @@ - + - + @@ -536,6 +541,7 @@ const handleNodeClick = (data: any) => { formQuery.objectType = data.equipmentTypeId equipQuery(formQuery).then((res) => { deviceList.value = res.rows + pageTotal.value = res.total }) equipModeList({ @@ -626,8 +632,8 @@ const addDeviceList = () => { editAddDeviceData.orgId = '' editAddDeviceData.parentEquipmentId = '' editAddDeviceData.iotModelId = '' - editAddDeviceData.belongingLine = '' - editAddDeviceData.isbenchMarkUnit = false + editAddDeviceData.belongLine = '' + editAddDeviceData.standard = 0 } // 查看设备详情 @@ -648,8 +654,8 @@ const editDeviceData = reactive({ parentEquipmentId: '', iotModelId: '', id: '', - belongingLine: '', - isbenchMarkUnit: false, + belongLine: '', + standard: 0, }) const size = ref<'default' | 'large' | 'small'>('default') @@ -677,8 +683,8 @@ const viewDeviceDetails = (data: any) => { editDeviceData.orgId = data.row.orgId editDeviceData.parentEquipmentId = data.row.parentEquipmentId editDeviceData.iotModelId = data.row.iotModelId - editDeviceData.belongingLine = data.row.belongingLine - editDeviceData.isbenchMarkUnit = data.row.isbenchMarkUnit + editDeviceData.belongLine = data.row.belongLine + editDeviceData.standard = data.row.standard || 0 } // 设备删除 @@ -798,9 +804,15 @@ const editAddDeviceData = reactive({ orgId: '', parentEquipmentId: '', iotModelId: '', - belongingLine: '', - isbenchMarkUnit: false, + belongLine: '', + standard: 0, }) +const addhandleSwitchChange = (value: any) => { + editAddDeviceData.standard = value ? 1 : 0 +} +const edithandleSwitchChange = (value: any) => { + editDeviceData.standard = value ? 1 : 0 +} // 设备新增字段校验 const editAddDeviceRules = reactive({ @@ -832,7 +844,6 @@ const saveAddData = () => { editAddDeviceData.objectType = ele.equipmentTypeId } }) - equipAdd(editAddDeviceData).then((res) => { if (res.code == 200) { ElMessage({