危险源的处理

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/danger/vo/IotDangerSourcePageReqVO.java

@@ -1,10 +1,12 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.danger.vo;
 
-import lombok.*;
-import java.util.*;
-import io.swagger.v3.oas.annotations.media.Schema;
 import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
@@ -14,6 +16,8 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class IotDangerSourcePageReqVO extends PageParam {
+    @Schema(description = "部门id")
+    private Long deptId;
 
     @Schema(description = "区域/位置")
     private String region;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/danger/vo/IotDangerSourceRespVO.java

@@ -1,11 +1,11 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.danger.vo;
 
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import org.springframework.format.annotation.DateTimeFormat;
+import lombok.Data;
+
 import java.time.LocalDateTime;
-import com.alibaba.excel.annotation.*;
 
 @Schema(description = "管理后台 - 危险源 Response VO")
 @Data
@@ -16,6 +16,9 @@ public class IotDangerSourceRespVO {
     @ExcelProperty("主键id")
     private Long id;
 
+    @Schema(description = "部门id")
+    private Long deptId;
+
     @Schema(description = "区域/位置", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("区域/位置")
     private String region;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/controller/admin/qhse/danger/vo/IotDangerSourceSaveReqVO.java

@@ -1,10 +1,9 @@
 package cn.iocoder.yudao.module.pms.controller.admin.qhse.danger.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
+import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
-import java.util.*;
 
 @Schema(description = "管理后台 - 危险源新增/修改 Request VO")
 @Data
@@ -13,6 +12,9 @@ public class IotDangerSourceSaveReqVO {
     @Schema(description = "主键id", requiredMode = Schema.RequiredMode.REQUIRED, example = "11742")
     private Long id;
 
+    @Schema(description = "部门id")
+    private Long deptId;
+
     @Schema(description = "区域/位置", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotEmpty(message = "区域/位置不能为空")
     private String region;

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/dataobject/qhse/danger/IotDangerSourceDO.java

@@ -1,11 +1,10 @@
 package cn.iocoder.yudao.module.pms.dal.dataobject.qhse.danger;
 
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
 
 /**
  * 危险源 DO
@@ -31,6 +30,11 @@ public class IotDangerSourceDO extends BaseDO {
      * 区域/位置
      */
     private String region;
+
+    /**
+     * 部门id
+     */
+    private Long deptId;
     /**
      * 危害因素描述
      */

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/danger/IotDangerSourceMapper.java

@@ -1,14 +1,14 @@
 package cn.iocoder.yudao.module.pms.dal.mysql.qhse.danger;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.danger.vo.IotDangerSourcePageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.danger.IotDangerSourceDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Set;
+
 /**
  * 危险源 Mapper
  *
@@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IotDangerSourceMapper extends BaseMapperX<IotDangerSourceDO> {
 
-    default PageResult<IotDangerSourceDO> selectPage(IotDangerSourcePageReqVO reqVO) {
+    default PageResult<IotDangerSourceDO> selectPage(IotDangerSourcePageReqVO reqVO, Set<Long> ids) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotDangerSourceDO>()
                 .eqIfPresent(IotDangerSourceDO::getRegion, reqVO.getRegion())
                 .eqIfPresent(IotDangerSourceDO::getElementDescription, reqVO.getElementDescription())
@@ -27,6 +27,7 @@ public interface IotDangerSourceMapper extends BaseMapperX<IotDangerSourceDO> {
                 .eqIfPresent(IotDangerSourceDO::getEvalFxz, reqVO.getEvalFxz())
                 .eqIfPresent(IotDangerSourceDO::getRiskGrade, reqVO.getRiskGrade())
                 .eqIfPresent(IotDangerSourceDO::getControlMethod, reqVO.getControlMethod())
+                .inIfPresent(IotDangerSourceDO::getDeptId, ids)
                 .eqIfPresent(IotDangerSourceDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(IotDangerSourceDO::getCreateTime, reqVO.getCreateTime())
                 .orderByDesc(IotDangerSourceDO::getId));

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/danger/IotDangerSourceServiceImpl.java

@@ -1,22 +1,23 @@
 package cn.iocoder.yudao.module.pms.service.qhse.danger;
 
 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.danger.vo.IotDangerSourcePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.danger.vo.IotDangerSourceSaveReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.danger.IotDangerSourceDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.qhse.danger.IotDangerSourceMapper;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.pojo.PageParam;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-
 
 import javax.annotation.Resource;
 
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 
 /**
@@ -30,6 +31,8 @@ public class IotDangerSourceServiceImpl implements IotDangerSourceService {
 
     @Resource
     private IotDangerSourceMapper iotDangerSourceMapper;
+    @Autowired
+    private DeptService deptService;
 
     @Override
     public Long createIotDangerSource(IotDangerSourceSaveReqVO createReqVO) {
@@ -71,7 +74,12 @@ public class IotDangerSourceServiceImpl implements IotDangerSourceService {
 
     @Override
     public PageResult<IotDangerSourceDO> getIotDangerSourcePage(IotDangerSourcePageReqVO pageReqVO) {
-        return iotDangerSourceMapper.selectPage(pageReqVO);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return iotDangerSourceMapper.selectPage(pageReqVO, ids);
     }
 
 }