增加角色权限控制

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblBreakdownServiceImpl.java

@@ -2,12 +2,17 @@ package com.ruoyi.data.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.data.domain.TblRoleDevice;
+import com.ruoyi.data.domain.TblWarn;
+import com.ruoyi.data.mapper.TblRoleDeviceMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.data.domain.bo.TblBreakdownBo;
@@ -16,10 +21,7 @@ import com.ruoyi.data.domain.TblBreakdown;
 import com.ruoyi.data.mapper.TblBreakdownMapper;
 import com.ruoyi.data.service.ITblBreakdownService;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * 故障管理Service业务层处理
@@ -33,6 +35,8 @@ public class TblBreakdownServiceImpl implements ITblBreakdownService {
 
     private final TblBreakdownMapper baseMapper;
 
+    private final TblRoleDeviceMapper tblRoleDeviceMapper;
+
     /**
      * 查询故障管理
      */
@@ -61,6 +65,8 @@ public class TblBreakdownServiceImpl implements ITblBreakdownService {
     }
 
     private LambdaQueryWrapper<TblBreakdown> buildQueryWrapper(TblBreakdownBo bo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        Long roleId = loginUser.getRoles().get(0).getRoleId();
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TblBreakdown> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getName()), TblBreakdown::getName, bo.getName());
@@ -74,6 +80,14 @@ public class TblBreakdownServiceImpl implements ITblBreakdownService {
         lqw.eq(bo.getHandlerTime() != null, TblBreakdown::getHandlerTime, bo.getHandlerTime());
         lqw.eq(bo.getFaultTime() != null, TblBreakdown::getFaultTime, bo.getFaultTime());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), TblBreakdown::getStatus, bo.getStatus());
+        if(roleId != 1){
+            List<TblRoleDevice> list = tblRoleDeviceMapper.getRoleDeviceList(roleId);
+            List<Long> deviceList = new ArrayList<Long>();
+            for(TblRoleDevice tblRoleDevice:list){
+                deviceList.add(tblRoleDevice.getDeviceId());
+            }
+            lqw.in(TblBreakdown::getEquipmentId,deviceList);
+        }
         return lqw;
     }
 

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblWarnServiceImpl.java

@@ -2,12 +2,16 @@ package com.ruoyi.data.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
+import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.ruoyi.data.domain.TblRoleDevice;
+import com.ruoyi.data.mapper.TblRoleDeviceMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.ruoyi.data.domain.bo.TblWarnBo;
@@ -16,10 +20,7 @@ import com.ruoyi.data.domain.TblWarn;
 import com.ruoyi.data.mapper.TblWarnMapper;
 import com.ruoyi.data.service.ITblWarnService;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * 告警管理Service业务层处理
@@ -33,6 +34,7 @@ public class TblWarnServiceImpl implements ITblWarnService {
 
     private final TblWarnMapper baseMapper;
 
+    private final TblRoleDeviceMapper tblRoleDeviceMapper;
     /**
      * 查询告警管理
      */
@@ -63,6 +65,8 @@ public class TblWarnServiceImpl implements ITblWarnService {
     }
 
     private LambdaQueryWrapper<TblWarn> buildQueryWrapper(TblWarnBo bo) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        Long roleId = loginUser.getRoles().get(0).getRoleId();
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<TblWarn> lqw = Wrappers.lambdaQuery();
         lqw.like(StringUtils.isNotBlank(bo.getName()), TblWarn::getName, bo.getName());
@@ -76,6 +80,14 @@ public class TblWarnServiceImpl implements ITblWarnService {
         lqw.eq(bo.getHandleTime() != null, TblWarn::getHandleTime, bo.getHandleTime());
         lqw.eq(bo.getAlarmTime() != null, TblWarn::getAlarmTime, bo.getAlarmTime());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), TblWarn::getStatus, bo.getStatus());
+        if(roleId != 1){
+            List<TblRoleDevice> list = tblRoleDeviceMapper.getRoleDeviceList(roleId);
+            List<Long> deviceList = new ArrayList<Long>();
+            for(TblRoleDevice tblRoleDevice:list){
+                deviceList.add(tblRoleDevice.getDeviceId());
+            }
+            lqw.in(TblWarn::getEquipmentId,deviceList);
+        }
         return lqw;
     }