From b1b8ced0a8f2cf09987784007ac0318770b3d299 Mon Sep 17 00:00:00 2001 From: lcj <2331845269@qq.com> Date: Mon, 10 Nov 2025 15:32:41 +0800 Subject: [PATCH] =?UTF-8?q?AI=20=E8=BF=9D=E7=AB=A0=E5=B7=A5=E5=8D=95?= =?UTF-8?q?=E7=AD=89=E7=BA=A7=E5=85=B3=E8=81=94=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/OthYs7DeviceImgServiceImpl.java | 3 - .../HseViolationLevelController.java | 4 +- ...elPost.java => HseViolationLevelRole.java} | 10 +-- .../HseViolationLevelCreateReq.java | 6 +- .../HseViolationLevelUpdateReq.java | 4 +- ...Vo.java => HseViolationLevelByRoleVo.java} | 6 +- .../HseViolationLevelRoleVo.java} | 16 ++-- .../mapper/HseViolationLevelPostMapper.java | 15 ---- .../mapper/HseViolationLevelRoleMapper.java | 15 ++++ .../IHseViolationLevelPostService.java | 13 --- .../IHseViolationLevelRoleService.java | 13 +++ .../service/IHseViolationLevelService.java | 6 +- .../HseViolationLevelPostServiceImpl.java | 19 ----- .../HseViolationLevelRoleServiceImpl.java | 19 +++++ .../impl/HseViolationLevelServiceImpl.java | 79 +++++++++---------- .../impl/HseViolationRecordServiceImpl.java | 17 ++-- .../dromara/system/domain/vo/SysRoleVo.java | 8 ++ .../service/impl/SysDeptServiceImpl.java | 16 ++-- ...er.xml => HseViolationLevelRoleMapper.xml} | 2 +- 19 files changed, 141 insertions(+), 130 deletions(-) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/{HseViolationLevelPost.java => HseViolationLevelRole.java} (72%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevel/{HseViolationLevelByPostVo.java => HseViolationLevelByRoleVo.java} (84%) rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/{violationlevelpost/HseViolationLevelPostVo.java => violationlevelrole/HseViolationLevelRoleVo.java} (57%) delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationLevelPostMapper.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationLevelRoleMapper.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelPostService.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelRoleService.java delete mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelPostServiceImpl.java create mode 100644 xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelRoleServiceImpl.java rename xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/{HseViolationLevelPostMapper.xml => HseViolationLevelRoleMapper.xml} (69%) diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java index e4e44310..53f33cda 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/service/impl/OthYs7DeviceImgServiceImpl.java @@ -347,9 +347,6 @@ public class OthYs7DeviceImgServiceImpl extends ServiceImpl getInfo(@NotNull(message = "主键不能为空") + public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { return R.ok(hseViolationLevelService.queryById(id)); } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseViolationLevelPost.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseViolationLevelRole.java similarity index 72% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseViolationLevelPost.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseViolationLevelRole.java index 211b0ca0..81574de1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseViolationLevelPost.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/HseViolationLevelRole.java @@ -9,14 +9,14 @@ import java.io.Serial; import java.io.Serializable; /** - * 等级与岗位关联对象 hse_violation_level_post + * 等级与角色关联对象 hse_violation_level_role * * @author lilemy * @date 2025-06-20 */ @Data -@TableName("hse_violation_level_post") -public class HseViolationLevelPost implements Serializable { +@TableName("hse_violation_level_role") +public class HseViolationLevelRole implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -28,8 +28,8 @@ public class HseViolationLevelPost implements Serializable { private Long level; /** - * 岗位 + * 角色 */ - private Long post; + private Long role; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationlevel/HseViolationLevelCreateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationlevel/HseViolationLevelCreateReq.java index 672b6438..66a3d8f9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationlevel/HseViolationLevelCreateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationlevel/HseViolationLevelCreateReq.java @@ -40,10 +40,10 @@ public class HseViolationLevelCreateReq implements Serializable { private String riskType; /** - * 岗位 + * 角色 */ - @NotNull(message = "岗位不能为空") - private List postIdList; + @NotNull(message = "角色不能为空") + private List roleIdList; /** * 违章类型（多个逗号分隔） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationlevel/HseViolationLevelUpdateReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationlevel/HseViolationLevelUpdateReq.java index 574955ce..969d19d6 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationlevel/HseViolationLevelUpdateReq.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/dto/violationlevel/HseViolationLevelUpdateReq.java @@ -39,9 +39,9 @@ public class HseViolationLevelUpdateReq implements Serializable { private String riskType; /** - * 岗位 + * 角色 */ - private List postIdList; + private List roleIdList; /** * 违章类型（多个逗号分隔） diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevel/HseViolationLevelByPostVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevel/HseViolationLevelByRoleVo.java similarity index 84% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevel/HseViolationLevelByPostVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevel/HseViolationLevelByRoleVo.java index d770a998..6e91c9e9 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevel/HseViolationLevelByPostVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevel/HseViolationLevelByRoleVo.java @@ -1,7 +1,7 @@ package org.dromara.safety.domain.vo.violationlevel; import lombok.Data; -import org.dromara.system.domain.vo.SysPostVo; +import org.dromara.system.domain.vo.SysRoleVo; import java.io.Serial; import java.io.Serializable; @@ -13,7 +13,7 @@ import java.util.List; * @date 2025/6/20 14:22 */ @Data -public class HseViolationLevelByPostVo implements Serializable { +public class HseViolationLevelByRoleVo implements Serializable { @Serial private static final long serialVersionUID = -5927532440663249467L; @@ -56,6 +56,6 @@ public class HseViolationLevelByPostVo implements Serializable { /** * 岗位 */ - private List postList; + private List roleList; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevelpost/HseViolationLevelPostVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevelrole/HseViolationLevelRoleVo.java similarity index 57% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevelpost/HseViolationLevelPostVo.java rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevelrole/HseViolationLevelRoleVo.java index f340a7a5..2f2fc69d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevelpost/HseViolationLevelPostVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/domain/vo/violationlevelrole/HseViolationLevelRoleVo.java @@ -1,25 +1,25 @@ -package org.dromara.safety.domain.vo.violationlevelpost; +package org.dromara.safety.domain.vo.violationlevelrole; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.safety.domain.HseViolationLevelPost; +import org.dromara.safety.domain.HseViolationLevelRole; import java.io.Serial; import java.io.Serializable; /** - * 等级与岗位关联视图对象 hse_violation_level_post + * 等级与岗位关联视图对象 hse_violation_level_role * * @author lilemy * @date 2025-06-20 */ @Data @ExcelIgnoreUnannotated -@AutoMapper(target = HseViolationLevelPost.class) -public class HseViolationLevelPostVo implements Serializable { +@AutoMapper(target = HseViolationLevelRole.class) +public class HseViolationLevelRoleVo implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -31,9 +31,9 @@ public class HseViolationLevelPostVo implements Serializable { private Long level; /** - * 岗位 + * 角色 */ - @ExcelProperty(value = "岗位") - private Long post; + @ExcelProperty(value = "角色") + private Long role; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationLevelPostMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationLevelPostMapper.java deleted file mode 100644 index c1d35bb7..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationLevelPostMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.dromara.safety.mapper; - -import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.safety.domain.HseViolationLevelPost; -import org.dromara.safety.domain.vo.violationlevelpost.HseViolationLevelPostVo; - -/** - * 等级与岗位关联Mapper接口 - * - * @author lilemy - * @date 2025-06-20 - */ -public interface HseViolationLevelPostMapper extends BaseMapperPlus { - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationLevelRoleMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationLevelRoleMapper.java new file mode 100644 index 00000000..7cfd90da --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/mapper/HseViolationLevelRoleMapper.java @@ -0,0 +1,15 @@ +package org.dromara.safety.mapper; + +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; +import org.dromara.safety.domain.HseViolationLevelRole; +import org.dromara.safety.domain.vo.violationlevelrole.HseViolationLevelRoleVo; + +/** + * 等级与角色关联Mapper接口 + * + * @author lilemy + * @date 2025-06-20 + */ +public interface HseViolationLevelRoleMapper extends BaseMapperPlus { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelPostService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelPostService.java deleted file mode 100644 index 59d3c026..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelPostService.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.dromara.safety.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import org.dromara.safety.domain.HseViolationLevelPost; - -/** - * 等级与岗位关联Service接口 - * - * @author lilemy - * @date 2025-06-20 - */ -public interface IHseViolationLevelPostService extends IService { -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelRoleService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelRoleService.java new file mode 100644 index 00000000..921b4679 --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelRoleService.java @@ -0,0 +1,13 @@ +package org.dromara.safety.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import org.dromara.safety.domain.HseViolationLevelRole; + +/** + * 等级与角色关联Service接口 + * + * @author lilemy + * @date 2025-06-20 + */ +public interface IHseViolationLevelRoleService extends IService { +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelService.java index 5dd2459e..34340f76 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/IHseViolationLevelService.java @@ -9,7 +9,7 @@ import org.dromara.safety.domain.HseViolationLevel; import org.dromara.safety.domain.dto.violationlevel.HseViolationLevelCreateReq; import org.dromara.safety.domain.dto.violationlevel.HseViolationLevelQueryReq; import org.dromara.safety.domain.dto.violationlevel.HseViolationLevelUpdateReq; -import org.dromara.safety.domain.vo.violationlevel.HseViolationLevelByPostVo; +import org.dromara.safety.domain.vo.violationlevel.HseViolationLevelByRoleVo; import org.dromara.safety.domain.vo.violationlevel.HseViolationLevelVo; import java.util.Collection; @@ -29,7 +29,7 @@ public interface IHseViolationLevelService extends IService { * @param id 主键 * @return 违章等级 */ - HseViolationLevelByPostVo queryById(Long id); + HseViolationLevelByRoleVo queryById(Long id); /** * 分页查询违章等级列表 @@ -79,7 +79,7 @@ public interface IHseViolationLevelService extends IService { * @param violationLevel 违章等级对象 * @return 违章等级视图对象 */ - HseViolationLevelByPostVo getByPostVo(HseViolationLevel violationLevel); + HseViolationLevelByRoleVo getByPostVo(HseViolationLevel violationLevel); /** * 获取违章等级视图对象 diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelPostServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelPostServiceImpl.java deleted file mode 100644 index 2193a7dc..00000000 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelPostServiceImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.dromara.safety.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.dromara.safety.domain.HseViolationLevelPost; -import org.dromara.safety.mapper.HseViolationLevelPostMapper; -import org.dromara.safety.service.IHseViolationLevelPostService; -import org.springframework.stereotype.Service; - -/** - * 等级与岗位关联Service业务层处理 - * - * @author lilemy - * @date 2025-06-20 - */ -@Service -public class HseViolationLevelPostServiceImpl extends ServiceImpl - implements IHseViolationLevelPostService { - -} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelRoleServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelRoleServiceImpl.java new file mode 100644 index 00000000..1cf828ad --- /dev/null +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelRoleServiceImpl.java @@ -0,0 +1,19 @@ +package org.dromara.safety.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.dromara.safety.domain.HseViolationLevelRole; +import org.dromara.safety.mapper.HseViolationLevelRoleMapper; +import org.dromara.safety.service.IHseViolationLevelRoleService; +import org.springframework.stereotype.Service; + +/** + * 等级与角色关联Service业务层处理 + * + * @author lilemy + * @date 2025-06-20 + */ +@Service +public class HseViolationLevelRoleServiceImpl extends ServiceImpl + implements IHseViolationLevelRoleService { + +} diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelServiceImpl.java index 16217f11..8fca0703 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationLevelServiceImpl.java @@ -11,21 +11,20 @@ import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.project.service.IBusProjectService; import org.dromara.safety.constant.HseSafetyConstant; import org.dromara.safety.domain.HseViolationLevel; -import org.dromara.safety.domain.HseViolationLevelPost; +import org.dromara.safety.domain.HseViolationLevelRole; import org.dromara.safety.domain.dto.violationlevel.HseViolationLevelCreateReq; import org.dromara.safety.domain.dto.violationlevel.HseViolationLevelQueryReq; import org.dromara.safety.domain.dto.violationlevel.HseViolationLevelUpdateReq; -import org.dromara.safety.domain.vo.violationlevel.HseViolationLevelByPostVo; +import org.dromara.safety.domain.vo.violationlevel.HseViolationLevelByRoleVo; import org.dromara.safety.domain.vo.violationlevel.HseViolationLevelVo; import org.dromara.safety.mapper.HseViolationLevelMapper; -import org.dromara.safety.service.IHseViolationLevelPostService; +import org.dromara.safety.service.IHseViolationLevelRoleService; import org.dromara.safety.service.IHseViolationLevelService; -import org.dromara.system.domain.vo.SysPostVo; -import org.dromara.system.mapper.SysPostMapper; +import org.dromara.system.domain.vo.SysRoleVo; +import org.dromara.system.mapper.SysRoleMapper; import org.dromara.system.service.ISysDictDataService; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -48,10 +47,10 @@ public class HseViolationLevelServiceImpl extends ServiceImpl postIdList = req.getPostIdList(); - if (CollUtil.isEmpty(postIdList)) { - throw new ServiceException("岗位不能为空", HttpStatus.BAD_REQUEST); + List roleIdList = req.getRoleIdList(); + if (CollUtil.isEmpty(roleIdList)) { + throw new ServiceException("角色不能为空", HttpStatus.BAD_REQUEST); } // 判断违章等级或风险等级是否存在 List existList = this.lambdaQuery() @@ -168,16 +167,16 @@ public class HseViolationLevelServiceImpl extends ServiceImpl postList = postIdList.stream().map(postId -> { - HseViolationLevelPost violationLevelPost = new HseViolationLevelPost(); + // 新增角色与违章等级关联 + List roleList = roleIdList.stream().map(roleId -> { + HseViolationLevelRole violationLevelPost = new HseViolationLevelRole(); violationLevelPost.setLevel(id); - violationLevelPost.setPost(postId); + violationLevelPost.setRole(roleId); return violationLevelPost; }).toList(); - boolean saveRelevancy = violationLevelPostService.saveBatch(postList); + boolean saveRelevancy = violationLevelPostService.saveBatch(roleList); if (!saveRelevancy) { - throw new ServiceException("新增岗位与违章等级关联失败，数据库异常", HttpStatus.ERROR); + throw new ServiceException("新增角色与违章等级关联失败，数据库异常", HttpStatus.ERROR); } return id; } @@ -251,42 +250,42 @@ public class HseViolationLevelServiceImpl extends ServiceImpl postIdList = req.getPostIdList(); - if (CollUtil.isNotEmpty(postIdList)) { + List roleIdList = req.getRoleIdList(); + if (CollUtil.isNotEmpty(roleIdList)) { List oldPostIdList = violationLevelPostService.lambdaQuery() - .eq(HseViolationLevelPost::getLevel, id) - .select(HseViolationLevelPost::getPost) - .list().stream().map(HseViolationLevelPost::getPost).toList(); + .eq(HseViolationLevelRole::getLevel, id) + .select(HseViolationLevelRole::getRole) + .list().stream().map(HseViolationLevelRole::getRole).toList(); // 转换为 Set - Set newSet = new HashSet<>(postIdList); + Set newSet = new HashSet<>(roleIdList); Set oldSet = new HashSet<>(oldPostIdList); - // 需要添加的岗位ID（在 new 中有，但在 old 中没有） + // 需要添加的角色ID（在 new 中有，但在 old 中没有） Set needAdd = new HashSet<>(newSet); needAdd.removeAll(oldSet); - // 需要删除的岗位ID（在 old 中有，但在 new 中没有） + // 需要删除的角色ID（在 old 中有，但在 new 中没有） Set needDelete = new HashSet<>(oldSet); needDelete.removeAll(newSet); // 执行新增 if (CollUtil.isNotEmpty(needAdd)) { - List addList = needAdd.stream().map(postId -> { - HseViolationLevelPost item = new HseViolationLevelPost(); + List addList = needAdd.stream().map(roleId -> { + HseViolationLevelRole item = new HseViolationLevelRole(); item.setLevel(id); - item.setPost(postId); + item.setRole(roleId); return item; }).toList(); boolean result = violationLevelPostService.saveBatch(addList); if (!result) { - throw new ServiceException("新增岗位与违章等级关联失败，数据库异常", HttpStatus.ERROR); + throw new ServiceException("新增角色与违章等级关联失败，数据库异常", HttpStatus.ERROR); } } // 执行删除 if (CollUtil.isNotEmpty(needDelete)) { boolean remove = violationLevelPostService.lambdaUpdate() - .eq(HseViolationLevelPost::getLevel, id) - .in(HseViolationLevelPost::getPost, needDelete) + .eq(HseViolationLevelRole::getLevel, id) + .in(HseViolationLevelRole::getRole, needDelete) .remove(); if (!remove) { - throw new ServiceException("删除岗位与违章等级关联失败，数据库异常", HttpStatus.ERROR); + throw new ServiceException("删除角色与违章等级关联失败，数据库异常", HttpStatus.ERROR); } } } @@ -339,19 +338,19 @@ public class HseViolationLevelServiceImpl extends ServiceImpl levelPostList = violationLevelPostService.lambdaQuery() - .eq(HseViolationLevelPost::getLevel, violationLevel.getId()) + List levelPostList = violationLevelPostService.lambdaQuery() + .eq(HseViolationLevelRole::getLevel, violationLevel.getId()) .list(); if (CollUtil.isNotEmpty(levelPostList)) { - List postIdList = levelPostList.stream().map(HseViolationLevelPost::getPost).toList(); - List postList = postMapper.selectVoByIds(postIdList); - vo.setPostList(postList); + List roleList = levelPostList.stream().map(HseViolationLevelRole::getRole).toList(); + List postList = roleMapper.selectVoByIds(roleList); + vo.setRoleList(postList); } return vo; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java index 37b11c45..c12a4ad5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseViolationRecordServiceImpl.java @@ -23,7 +23,7 @@ import org.dromara.project.domain.BusProjectTeamMember; import org.dromara.project.service.IBusProjectTeamMemberService; import org.dromara.safety.domain.HseRecognizeRecord; import org.dromara.safety.domain.HseViolationLevel; -import org.dromara.safety.domain.HseViolationLevelPost; +import org.dromara.safety.domain.HseViolationLevelRole; import org.dromara.safety.domain.HseViolationRecord; import org.dromara.safety.domain.dto.violationrecord.*; import org.dromara.safety.domain.enums.HseSafetyInspectionReviewTypeEnum; @@ -31,7 +31,7 @@ import org.dromara.safety.domain.enums.HseSafetyInspectionStatusEnum; import org.dromara.safety.domain.vo.violationrecord.HseViolationRecordVo; import org.dromara.safety.mapper.HseViolationRecordMapper; import org.dromara.safety.service.IHseRecognizeRecordService; -import org.dromara.safety.service.IHseViolationLevelPostService; +import org.dromara.safety.service.IHseViolationLevelRoleService; import org.dromara.safety.service.IHseViolationLevelService; import org.dromara.safety.service.IHseViolationRecordService; import org.dromara.system.domain.vo.SysUserVo; @@ -69,7 +69,7 @@ public class HseViolationRecordServiceImpl extends ServiceImpl levelIds = violationRecordList.stream().map(HseViolationRecord::getLevelId).collect(Collectors.toSet()); - List levelPostList = violationLevelPostService.lambdaQuery() - .in(HseViolationLevelPost::getLevel, levelIds) + List levelRoleList = violationLevelPostService.lambdaQuery() + .in(HseViolationLevelRole::getLevel, levelIds) .list(); - List postIdList = levelPostList.stream().map(HseViolationLevelPost::getPost).distinct().toList(); - List userVoList = userService.selectUserListByPostList(postIdList); + List roleIdList = levelRoleList.stream().map(HseViolationLevelRole::getRole).distinct().toList(); + List userVoList = userService.selectUserListByPostList(roleIdList); if (CollUtil.isNotEmpty(userVoList)) { // 通过 sse 向指定用户发送通知 Set userIds = userVoList.stream().map(SysUserVo::getUserId).collect(Collectors.toSet()); @@ -222,7 +222,7 @@ public class HseViolationRecordServiceImpl extends ServiceImpl> postVoMap = postVos.stream().collect(Collectors.groupingBy(SysPostVo::getDeptId)); + List roleVos = roleMapper.selectVoList( + new LambdaQueryWrapper<>(SysRole.class) + .in(SysRole::getDeptId, deptVoList.stream().map(SysDeptVo::getDeptId).collect(Collectors.toSet())) + .eq(SysRole::getStatus, SystemConstants.NORMAL) + .eq(SysRole::getDelFlag, SystemConstants.NORMAL) + ); + Map> roleVoMap = roleVos.stream().collect(Collectors.groupingBy(SysRoleVo::getDeptId)); // 获取当前列表中每一个节点的parentId，然后在列表中查找是否有id与其parentId对应，若无对应，则表明此时节点列表中，该节点在当前列表中属于顶级节点 List> treeList = CollUtil.newArrayList(); for (SysDeptVo d : deptVoList) { @@ -172,6 +178,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { .putExtra("disabled", SystemConstants.DISABLE.equals(deptVo.getStatus())); tree.putExtra("deptType", deptVo.getDeptType()); tree.putExtra("postVoList", postVoMap.get(deptId)); + tree.putExtra("roleVoList", roleVoMap.get(deptId)); } ); Tree tree = StreamUtils.findFirst(trees, it -> it.getId().longValue() == d.getDeptId()); @@ -433,7 +440,6 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { }*/ - return insert; } @@ -541,7 +547,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { @Override public String selectDeptNameById(Long id) { SysDept sysDept = baseMapper.selectById(id); - return sysDept != null ?sysDept.getDeptName():""; + return sysDept != null ? sysDept.getDeptName() : ""; } /** diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseViolationLevelPostMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseViolationLevelRoleMapper.xml similarity index 69% rename from xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseViolationLevelPostMapper.xml rename to xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseViolationLevelRoleMapper.xml index 30d8624f..2dab0c24 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseViolationLevelPostMapper.xml +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/safety/HseViolationLevelRoleMapper.xml @@ -2,6 +2,6 @@ - +