环境因素识别

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/qhse/environment/IotEnvironmentRecognizeMapper.java

@@ -1,14 +1,14 @@
 package cn.iocoder.yudao.module.pms.dal.mysql.qhse.environment;
 
-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.environment.vo.IotEnvironmentRecognizePageReqVO;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.environment.IotEnvironmentRecognizeDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.Set;
+
 /**
  * 环境因素识别 Mapper
  *
@@ -17,7 +17,7 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IotEnvironmentRecognizeMapper extends BaseMapperX<IotEnvironmentRecognizeDO> {
 
-    default PageResult<IotEnvironmentRecognizeDO> selectPage(IotEnvironmentRecognizePageReqVO reqVO) {
+    default PageResult<IotEnvironmentRecognizeDO> selectPage(IotEnvironmentRecognizePageReqVO reqVO, Set<Long> deptIds) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotEnvironmentRecognizeDO>()
                 .eqIfPresent(IotEnvironmentRecognizeDO::getProcess, reqVO.getProcess())
                 .eqIfPresent(IotEnvironmentRecognizeDO::getStepBreak, reqVO.getStepBreak())
@@ -38,7 +38,8 @@ public interface IotEnvironmentRecognizeMapper extends BaseMapperX<IotEnvironmen
                 .eqIfPresent(IotEnvironmentRecognizeDO::getControlMethod, reqVO.getControlMethod())
                 .betweenIfPresent(IotEnvironmentRecognizeDO::getCreateTime, reqVO.getCreateTime())
                 .eqIfPresent(IotEnvironmentRecognizeDO::getRemark, reqVO.getRemark())
-                .eqIfPresent(IotEnvironmentRecognizeDO::getDeptId, reqVO.getDeptId())
+//                .eqIfPresent(IotEnvironmentRecognizeDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotEnvironmentRecognizeDO::getDeptId, deptIds)
                 .orderByDesc(IotEnvironmentRecognizeDO::getId));
     }
 

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/qhse/environment/IotEnvironmentRecognizeServiceImpl.java

@@ -1,21 +1,23 @@
 package cn.iocoder.yudao.module.pms.service.qhse.environment;
 
 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.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.environment.vo.IotEnvironmentRecognizePageReqVO;
 import cn.iocoder.yudao.module.pms.controller.admin.qhse.environment.vo.IotEnvironmentRecognizeSaveReqVO;
+import cn.iocoder.yudao.module.pms.controller.admin.stat.DeptUtil;
 import cn.iocoder.yudao.module.pms.dal.dataobject.qhse.environment.IotEnvironmentRecognizeDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.qhse.environment.IotEnvironmentRecognizeMapper;
+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 +32,10 @@ public class IotEnvironmentRecognizeServiceImpl implements IotEnvironmentRecogni
 
     @Resource
     private IotEnvironmentRecognizeMapper iotEnvironmentRecognizeMapper;
+    @Autowired
+    private DeptUtil deptUtil;
+    @Autowired
+    private DeptService deptService;
 
     @Override
     public Long createIotEnvironmentRecognize(IotEnvironmentRecognizeSaveReqVO createReqVO) {
@@ -71,7 +77,22 @@ public class IotEnvironmentRecognizeServiceImpl implements IotEnvironmentRecogni
 
     @Override
     public PageResult<IotEnvironmentRecognizeDO> getIotEnvironmentRecognizePage(IotEnvironmentRecognizePageReqVO pageReqVO) {
-        return iotEnvironmentRecognizeMapper.selectPage(pageReqVO);
+        Long loginUserDeptId = SecurityFrameworkUtils.getLoginUserDeptId();
+        String companyCode = deptUtil.getCompanyCode(loginUserDeptId);
+        Set<Long> ids = new HashSet<>();
+        if ("rh".equals(companyCode)) {
+            ids.add(157L);
+        } else if ("ry".equals(companyCode)) {
+            ids.add(158L);
+        } else if ("rd".equals(companyCode)) {
+            ids.add(163L);
+        } else {
+            if (Objects.nonNull(pageReqVO.getDeptId())) {
+                ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+                ids.add(pageReqVO.getDeptId());
+            }
+        }
+        return iotEnvironmentRecognizeMapper.selectPage(pageReqVO, ids);
     }
 
 }