巡检项及路线的组织树

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/inspect/IotInspectItemMapper.java

@@ -22,14 +22,14 @@ import java.util.Set;
 @Mapper
 public interface IotInspectItemMapper extends BaseMapperX<IotInspectItemDO> {
 
-    default PageResult<IotInspectItemDO> selectPage(IotInspectItemPageReqVO reqVO, Set<Long> classifies) {
+    default PageResult<IotInspectItemDO> selectPage(IotInspectItemPageReqVO reqVO, Set<Long> classifies, Set<Long> deptIds) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotInspectItemDO>()
                 .likeIfPresent(IotInspectItemDO::getItem, reqVO.getItem())
                 .eqIfPresent(IotInspectItemDO::getStandard, reqVO.getStandard())
                 .eqIfPresent(IotInspectItemDO::getSort, reqVO.getSort())
                 .eqIfPresent(IotInspectItemDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(IotInspectItemDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(IotInspectItemDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotInspectItemDO::getDeptId, deptIds)
                 .inIfPresent(IotInspectItemDO::getDeviceClassify, classifies)
                 .eqIfPresent(IotInspectItemDO::getDeviceId, reqVO.getDeviceId())
                 .orderByDesc(IotInspectItemDO::getId));

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/dal/mysql/inspect/IotInspectRouteMapper.java

@@ -22,17 +22,17 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface IotInspectRouteMapper extends BaseMapperX<IotInspectRouteDO> {
 
-    default PageResult<IotInspectRouteDO> selectPage(IotInspectRoutePageReqVO reqVO) {
+    default PageResult<IotInspectRouteDO> selectPage(IotInspectRoutePageReqVO reqVO, Set<Long> classifies, Set<Long> deptIds) {
         return selectPage(reqVO, new LambdaQueryWrapperX<IotInspectRouteDO>()
                 .likeIfPresent(IotInspectRouteDO::getRouteName, reqVO.getRouteName())
-                .eqIfPresent(IotInspectRouteDO::getDeviceClassify, reqVO.getDeviceClassify())
+                .inIfPresent(IotInspectRouteDO::getDeviceClassify, classifies)
                 .eqIfPresent(IotInspectRouteDO::getDeviceId, reqVO.getDeviceId())
                 .likeIfPresent(IotInspectRouteDO::getDeviceClassifyName, reqVO.getDeviceClassifyName())
                 .likeIfPresent(IotInspectRouteDO::getDeviceName, reqVO.getDeviceName())
                 .eqIfPresent(IotInspectRouteDO::getItemJson, reqVO.getItemJson())
                 .eqIfPresent(IotInspectRouteDO::getRemark, reqVO.getRemark())
                 .betweenIfPresent(IotInspectRouteDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(IotInspectRouteDO::getDeptId, reqVO.getDeptId())
+                .inIfPresent(IotInspectRouteDO::getDeptId, deptIds)
                 .orderByDesc(IotInspectRouteDO::getId));
     }
     IPage<IotInspectRouteDO> getRoute(IPage<IotInspectRoutePageReqVO> page,@Param("reqVO")  IotInspectRoutePageReqVO reqVO);

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectItemServiceImpl.java

@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.pms.dal.dataobject.inspect.IotInspectRouteDO;
 import cn.iocoder.yudao.module.pms.dal.mysql.IotProductClassifyMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectItemMapper;
 import cn.iocoder.yudao.module.pms.service.IotProductClassifyService;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,6 +42,8 @@ public class IotInspectItemServiceImpl implements IotInspectItemService {
     private IotProductClassifyService iotProductClassifyService;
     @Autowired
     private IotProductClassifyMapper iotProductClassifyMapper;
+    @Autowired
+    private DeptService deptService;
 
     @Override
     public Long createIotInspectItem(IotInspectItemSaveReqVO createReqVO) {
@@ -91,7 +94,12 @@ public class IotInspectItemServiceImpl implements IotInspectItemService {
             classifies = iotProductClassifyService.getChildIotProductClassifyList(pageReqVO.getDeviceClassify());
             classifies.add(pageReqVO.getDeviceClassify());
         }
-        return iotInspectItemMapper.selectPage(pageReqVO, classifies);
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return iotInspectItemMapper.selectPage(pageReqVO, classifies, ids);
     }
 
     @Override

yudao-module-pms/yudao-module-pms-biz/src/main/java/cn/iocoder/yudao/module/pms/service/inspect/IotInspectRouteServiceImpl.java

@@ -13,6 +13,7 @@ import cn.iocoder.yudao.module.pms.dal.mysql.IotDeviceMapper;
 import cn.iocoder.yudao.module.pms.dal.mysql.inspect.IotInspectRouteMapper;
 import cn.iocoder.yudao.module.pms.enums.ErrorCodeConstant;
 import cn.iocoder.yudao.module.pms.service.IotProductClassifyService;
+import cn.iocoder.yudao.module.system.service.dept.DeptService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +21,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 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;
 
@@ -39,6 +42,8 @@ public class IotInspectRouteServiceImpl implements IotInspectRouteService {
     private IotProductClassifyService iotProductClassifyService;
     @Autowired
     private IotDeviceMapper iotDeviceMapper;
+    @Autowired
+    private DeptService deptService;
 
     @Override
     public Long createIotInspectRoute(IotInspectRouteSaveReqVO createReqVO) {
@@ -91,7 +96,17 @@ public class IotInspectRouteServiceImpl implements IotInspectRouteService {
 
     @Override
     public PageResult<IotInspectRouteDO> getIotInspectRoutePage(IotInspectRoutePageReqVO pageReqVO) {
-        return iotInspectRouteMapper.selectPage(pageReqVO);
+        Set<Long> classifies = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeviceClassify())) {
+            classifies = iotProductClassifyService.getChildIotProductClassifyList(pageReqVO.getDeviceClassify());
+            classifies.add(pageReqVO.getDeviceClassify());
+        }
+        Set<Long> ids = new HashSet<>();
+        if (Objects.nonNull(pageReqVO.getDeptId())) {
+            ids = deptService.getChildDeptIdListFromCache(pageReqVO.getDeptId());
+            ids.add(pageReqVO.getDeptId());
+        }
+        return iotInspectRouteMapper.selectPage(pageReqVO, classifies, ids);
     }
 
     @Override