sx/map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

菜单名称判断优化;

Browse Source 
设备编码去除空格
This commit is contained in:
yu 2024-10-22 15:12:29 +08:00
parent db84ae4478
commit 98a90516b3
5 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
das/src/main/java/com/das/modules/auth/controller/SysMenusController.java
View File

@ -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);

17
das/src/main/java/com/das/modules/equipment/controller/SysEnumController.java
View File

@ -62,6 +62,23 @@ public class SysEnumController {
}
/** 更新枚举值 */
@PostMapping("/updateEnumValues")
public R<SysEnumValuesVo> 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);
}
/**
* 查询枚举类型列表
*

2
das/src/main/java/com/das/modules/equipment/service/SysEnumService.java
View File

@ -14,6 +14,8 @@ public interface SysEnumService {
SysEnumValuesVo addEnumValues(SysEnumValuesDto sysEnumValuesDto);
SysEnumValuesVo updateEnumValues(SysEnumValuesDto sysEnumValuesDto);
List<SysEnumTypesVo> queryEnumTypesList();
PageDataInfo<SysEnumValuesVo> queryEnumValuesList(SysEnumValuesDto sysEnumValuesDto);

20
das/src/main/java/com/das/modules/equipment/service/impl/SysEnumServiceImpl.java
View File

@ -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<SysEnumValues> 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

4
das/src/main/java/com/das/modules/equipment/service/impl/SysEquipmentServiceImpl.java
View File

@ -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);