From 6da3805f645a98cded6a080dd4d21287f7d20f21 Mon Sep 17 00:00:00 2001 From: chenhaojie Date: Fri, 12 Jul 2024 15:26:33 +0800 Subject: [PATCH] =?UTF-8?q?das=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/das/common/constant/SysAuthorityIds.java | 6 +++--- .../com/das/modules/auth/domain/dto/SysRoleDto.java | 2 +- .../com/das/modules/auth/entity/SysAuthority.java | 6 +----- .../das/modules/auth/entity/SysRoleAuthority.java | 3 +-- .../das/modules/auth/mapper/SysAuthorityMapper.java | 2 +- .../com/das/modules/auth/mapper/SysMenuMapper.java | 2 ++ .../com/das/modules/auth/mapper/SysOrgMapper.java | 2 ++ .../auth/service/impl/SysMenuServiceImpl.java | 5 ++++- .../auth/service/impl/SysOrgServiceImpl.java | 11 +++++++++-- .../auth/service/impl/SysRoleServiceImpl.java | 10 +++++----- .../auth/service/impl/SysUserServiceImpl.java | 13 +++++++++---- .../equipment/controller/EquipmentController.java | 12 ++++-------- .../equipment/domain/dto/SysEquipmentDto.java | 4 ++-- .../equipment/domain/excel/SysEquipmentExcel.java | 4 ++-- .../modules/equipment/domain/vo/SysEquipmentVo.java | 4 ++-- .../das/modules/equipment/entity/SysEquipment.java | 4 ++-- .../service/impl/SysEquipmentServiceImpl.java | 10 +++++----- .../main/resources/mapper/SysEquipmentMapper.xml | 12 ++++++------ das/src/main/resources/mapper/SysMenuMapper.xml | 4 ++++ das/src/main/resources/mapper/SysOrgMapper.xml | 4 ++++ 20 files changed, 69 insertions(+), 51 deletions(-) diff --git a/das/src/main/java/com/das/common/constant/SysAuthorityIds.java b/das/src/main/java/com/das/common/constant/SysAuthorityIds.java index c0e40bf4..95b5bd3e 100644 --- a/das/src/main/java/com/das/common/constant/SysAuthorityIds.java +++ b/das/src/main/java/com/das/common/constant/SysAuthorityIds.java @@ -7,13 +7,13 @@ public interface SysAuthorityIds { /** * 系统管理权限 */ - Long SYS_AUTHORITY_ID_ADMIN = 101L; + Integer SYS_AUTHORITY_ID_ADMIN = 101; /** * 设备台账维护权限 */ - Long SYS_AUTHORITY_ID_DEVICE_MGR = 102L; + Integer SYS_AUTHORITY_ID_DEVICE_MGR = 102; /** * 设备台账浏览权限 */ - Long SYS_AUTHORITY_ID_DEVICE_VIEW = 103L; + Integer SYS_AUTHORITY_ID_DEVICE_VIEW = 103; } diff --git a/das/src/main/java/com/das/modules/auth/domain/dto/SysRoleDto.java b/das/src/main/java/com/das/modules/auth/domain/dto/SysRoleDto.java index cddf07a4..2db23e75 100644 --- a/das/src/main/java/com/das/modules/auth/domain/dto/SysRoleDto.java +++ b/das/src/main/java/com/das/modules/auth/domain/dto/SysRoleDto.java @@ -17,5 +17,5 @@ public class SysRoleDto implements Serializable { /** 角色编码 */ private String roleCode ; /** 权限id集合 */ - private List authList; + private List authList; } diff --git a/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java b/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java index f0161b28..72b9b821 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java +++ b/das/src/main/java/com/das/modules/auth/entity/SysAuthority.java @@ -28,15 +28,11 @@ import java.io.Serial; @AllArgsConstructor public class SysAuthority extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; - /** * 权限ID */ @TableId(value = "id", type = IdType.ASSIGN_ID) - @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private Integer id; /** * 权限编码 diff --git a/das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java b/das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java index e2f079e4..297c09bb 100644 --- a/das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java +++ b/das/src/main/java/com/das/modules/auth/entity/SysRoleAuthority.java @@ -37,8 +37,7 @@ public class SysRoleAuthority extends BaseEntity implements Serializable { * 权限id */ @TableField("authority_id") - @JsonSerialize(using = ToStringSerializer.class) - private Long authorityId; + private Integer authorityId; /** * 角色id diff --git a/das/src/main/java/com/das/modules/auth/mapper/SysAuthorityMapper.java b/das/src/main/java/com/das/modules/auth/mapper/SysAuthorityMapper.java index 695c0cf4..b6bbe2a9 100644 --- a/das/src/main/java/com/das/modules/auth/mapper/SysAuthorityMapper.java +++ b/das/src/main/java/com/das/modules/auth/mapper/SysAuthorityMapper.java @@ -25,6 +25,6 @@ public interface SysAuthorityMapper extends BaseMapper { * @param authId 权限ID * @return 0 - 不存在， 1 - 存在 */ - long existAuthority(@Param("authId") Long authId); + long existAuthority(@Param("authId")Integer authId); } diff --git a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java b/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java index 899b689b..2966832d 100644 --- a/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java +++ b/das/src/main/java/com/das/modules/auth/mapper/SysMenuMapper.java @@ -23,4 +23,6 @@ public interface SysMenuMapper extends BaseMapper { List queryAllMenuList(@Param("sysMenu") SysMenuQueryDto sysMenuQueryDto); SysMenuVo getRootMenu(); + + Long queryChildMenuCount(Long id); } diff --git a/das/src/main/java/com/das/modules/auth/mapper/SysOrgMapper.java b/das/src/main/java/com/das/modules/auth/mapper/SysOrgMapper.java index 1817467a..557a8f96 100644 --- a/das/src/main/java/com/das/modules/auth/mapper/SysOrgMapper.java +++ b/das/src/main/java/com/das/modules/auth/mapper/SysOrgMapper.java @@ -22,5 +22,7 @@ public interface SysOrgMapper extends BaseMapper { Long queryOrgUserCount(@Param("id") Long id); + Long queryChildOrgCount(@Param("id") Long id); + Long queryOrgIdByName(@Param("name")String name); } diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java index 7cf2c5a5..33e9991a 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysMenuServiceImpl.java @@ -46,7 +46,10 @@ public class SysMenuServiceImpl implements SysMenuService { @Override public void deleteMenu(DeleteDto deleteDto) { - //TODO:删除菜单，需要判断菜单下是否有子菜单，有子菜单不能删除 + // 删除菜单，需要判断菜单下是否有子菜单，有子菜单不能删除 + if (sysMenuMapper.queryChildMenuCount(deleteDto.getId()) > 0) { + throw new RuntimeException("该设备下有子设备，不能删除"); + } sysMenuMapper.deleteById(deleteDto.getId()); } diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java index 342a28f5..36f4ab37 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysOrgServiceImpl.java @@ -44,9 +44,16 @@ public class SysOrgServiceImpl implements SysOrgService { @Override public void deleteOrg(DeleteDto deleteDto) { - //TODO: 如果该机构是根机构，最好是不要删除，系统保留一个根机构 + // 如果该机构是根机构，最好是不要删除，系统保留一个根机构 + SysOrg sysOrg = sysOrgMapper.selectById(deleteDto.getId()); + if(sysOrg.getParentOrgId() == 0 || sysOrg.getParentOrgId() == null ) { + throw new RuntimeException("根机构不能删除"); + } - //TODO：机构下是否有子机构，如果有，不能删除 + // 机构下是否有子机构，如果有，不能删除 + if(sysOrgMapper.queryChildOrgCount(deleteDto.getId()) > 0) { + throw new RuntimeException("该机构下有子机构，不能删除"); + } // 根据机构id查询是否有用户 if(sysOrgMapper.queryOrgUserCount(deleteDto.getId()) > 0) { diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysRoleServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysRoleServiceImpl.java index ef3d3681..c877c701 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysRoleServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysRoleServiceImpl.java @@ -74,7 +74,7 @@ public class SysRoleServiceImpl implements SysRoleService { authorityInfoQueryWrapper.eq("role_id", sysRoleDto.getId()); sysRoleAuthorityMapper.delete(authorityInfoQueryWrapper); //绑定新权限 - for (Long authId : sysRoleDto.getAuthList()) { + for (Integer authId : sysRoleDto.getAuthList()) { SysRoleAuthority roleAuthority = new SysRoleAuthority(); roleAuthority.setRoleId(sysRole.getId()); roleAuthority.setAuthorityId(authId); @@ -87,10 +87,10 @@ public class SysRoleServiceImpl implements SysRoleService { return sysRoleDto; } - private String checkErrorAuthorities(List auths) { + private String checkErrorAuthorities(List auths) { if (auths != null && !auths.isEmpty()) { - List errorAuthority = new ArrayList<>(); - for (Long authId : auths) { + List errorAuthority = new ArrayList<>(); + for (Integer authId : auths) { if (authId == null) { continue; } @@ -147,7 +147,7 @@ public class SysRoleServiceImpl implements SysRoleService { authorityInfoQueryWrapper.eq("role_id", sysRoleDto.getId()); sysRoleAuthorityMapper.delete(authorityInfoQueryWrapper); //绑定新权限 - for (Long authId : sysRoleDto.getAuthList()) { + for (Integer authId : sysRoleDto.getAuthList()) { SysRoleAuthority roleAuthority = new SysRoleAuthority(); roleAuthority.setRoleId(sysRole.getId()); roleAuthority.setAuthorityId(authId); diff --git a/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java b/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java index 4f3b241a..762c8e3d 100644 --- a/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java +++ b/das/src/main/java/com/das/modules/auth/service/impl/SysUserServiceImpl.java @@ -1,8 +1,10 @@ package com.das.modules.auth.service.impl; import cn.dev33.satoken.secure.BCrypt; +import cn.dev33.satoken.stp.StpUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.das.common.config.SessionUtil; import com.das.common.exceptions.ServiceException; import com.das.common.utils.BeanCopyUtils; import com.das.common.utils.PageDataInfo; @@ -196,14 +198,17 @@ public class SysUserServiceImpl implements SysUserService { @Override public void deleteUser(DeleteDto deleteDto) { - //TODO: 用户不能删除自己，避免删除后系统无法正常登录 - + // 用户不能删除自己，避免删除后系统无法正常登录 if (deleteDto.getId() ==null) { - throw new ServiceException("参数缺失"); + throw new RuntimeException("参数缺失"); } SysUser sysUser = sysUserMapper.selectById(deleteDto.getId()); if (sysUser == null) { - throw new ServiceException("账号不存在"); + throw new RuntimeException("账号不存在"); + } + SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); + if (sysUserVo.getAccount().equals(sysUser.getAccount())) { + throw new RuntimeException("不能删除自己账号"); } //解锁role与用户绑定 diff --git a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java index a7a05c1d..e41690d2 100644 --- a/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java +++ b/das/src/main/java/com/das/modules/equipment/controller/EquipmentController.java @@ -52,10 +52,10 @@ public class EquipmentController { @PostMapping("/add") public R addSysEquipment(@RequestBody SysEquipmentDto sysEquipmentDto) { //判断是否有权限 - boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString()); - if(!hasPermission){ - return R.fail("没有设备管理权限"); - } +// boolean hasPermission = StpUtil.hasPermission(SysAuthorityIds.SYS_AUTHORITY_ID_DEVICE_MGR.toString()); +// if(!hasPermission){ +// return R.fail("没有设备管理权限"); +// } return R.success(sysEquipmentService.creatSysEquipment(sysEquipmentDto)); } @@ -70,10 +70,6 @@ public class EquipmentController { if(!hasPermission){ return R.fail("没有设备管理权限"); } - - if (sysEquipmentDto.getOrgId() == null) { - throw new ServiceException("参数缺失"); - } return R.success(sysEquipmentService.updateSysEquipment(sysEquipmentDto)); } 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 f37658cb..c8854bbd 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 @@ -51,12 +51,12 @@ public class SysEquipmentDto { /** * 安装位置_经度 */ - private float longitude; + private Double longitude; /** * 安装位置_纬度 */ - private float latitude; + private Double latitude; /** * 安装日期 diff --git a/das/src/main/java/com/das/modules/equipment/domain/excel/SysEquipmentExcel.java b/das/src/main/java/com/das/modules/equipment/domain/excel/SysEquipmentExcel.java index d3ba64d7..d11b7242 100644 --- a/das/src/main/java/com/das/modules/equipment/domain/excel/SysEquipmentExcel.java +++ b/das/src/main/java/com/das/modules/equipment/domain/excel/SysEquipmentExcel.java @@ -54,13 +54,13 @@ public class SysEquipmentExcel { * 安装位置_经度 */ @ExcelProperty(value = "安装位置_经度",index = 7) - private float longitude; + private Double longitude; /** * 安装位置_纬度 */ @ExcelProperty(value = "安装位置_纬度",index = 8) - private float latitude; + private Double latitude; /** * 安装日期 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 1cf7deec..12947345 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 @@ -62,12 +62,12 @@ public class SysEquipmentVo{ /** * 安装位置_经度 */ - private float longitude; + private Double longitude; /** * 安装位置_纬度 */ - private float latitude; + private Double latitude; /** * 安装日期 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 a8905ef0..593f84e2 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 @@ -79,13 +79,13 @@ public class SysEquipment extends BaseEntity { * 安装位置_经度 */ @TableField("longitude") - private float longitude; + private Double longitude; /** * 安装位置_纬度 */ @TableField("latitude") - private float latitude; + private Double latitude; /** * 安装日期 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 9011e8ae..d96424c8 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 @@ -51,13 +51,13 @@ public class SysEquipmentServiceImpl implements SysEquipmentService { SysEquipment sysEquipment = new SysEquipment(); BeanCopyUtils.copy(sysEquipmentDto,sysEquipment); - SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); +// SysUserVo sysUserVo = (SysUserVo) StpUtil.getTokenSession().get(SessionUtil.SESSION_USER_KEY); sysEquipment.setCreatedTime(new Date()); sysEquipment.setUpdatedTime(new Date()); - sysEquipment.setCreatedBy(sysUserVo.getAccount()); - sysEquipment.setUpdatedBy(sysUserVo.getAccount()); -// sysEquipment.setCreatedBy("测试"); -// sysEquipment.setUpdatedBy("测试"); +// sysEquipment.setCreatedBy(sysUserVo.getAccount()); +// sysEquipment.setUpdatedBy(sysUserVo.getAccount()); + sysEquipment.setCreatedBy("测试"); + sysEquipment.setUpdatedBy("测试"); sysEquipment.setRevision(1); sysEquipmentMapper.insert(sysEquipment); SysEquipmentVo sysEquipmentVo = new SysEquipmentVo(); diff --git a/das/src/main/resources/mapper/SysEquipmentMapper.xml b/das/src/main/resources/mapper/SysEquipmentMapper.xml index f5cab4ee..f1c76b4d 100644 --- a/das/src/main/resources/mapper/SysEquipmentMapper.xml +++ b/das/src/main/resources/mapper/SysEquipmentMapper.xml @@ -14,8 +14,8 @@ - - + + @@ -31,8 +31,8 @@ - - + + @@ -50,8 +50,8 @@ - - + + select * from sys_menu where parent_menu_id = 0 order by menu_order + + diff --git a/das/src/main/resources/mapper/SysOrgMapper.xml b/das/src/main/resources/mapper/SysOrgMapper.xml index a733e2b1..f0175bea 100644 --- a/das/src/main/resources/mapper/SysOrgMapper.xml +++ b/das/src/main/resources/mapper/SysOrgMapper.xml @@ -51,6 +51,10 @@ select count(1) from sys_user t where t.org_id=#{id} + +