Browse Source

值班人员数据权限

yangyue 1 year ago
parent
commit
77a33d9453

+ 16 - 9
duty-service/src/main/java/cn/com/taiji/duty/controller/DutyDailyReportRecordController.java

@@ -1,18 +1,12 @@
 package cn.com.taiji.duty.controller;
 
 
-import cn.com.taiji.duty.model.DutyAccount;
-import cn.com.taiji.duty.model.DutyDailyReportRecord;
-import cn.com.taiji.duty.model.DutyDailyReportRecordVo;
-import cn.com.taiji.duty.model.DutySignInRecord;
+import cn.com.taiji.duty.model.*;
 import cn.com.taiji.duty.service.IDutyAccountService;
 import cn.com.taiji.duty.service.IDutyConfigService;
 import cn.com.taiji.duty.service.IDutyDailyReportRecordService;
 import cn.com.taiji.duty.service.IDutyDailyReportRecordService;
-import cn.com.taiji.duty.utils.AjaxResult;
-import cn.com.taiji.duty.utils.HttpStatus;
-import cn.com.taiji.duty.utils.JwtUtils;
-import cn.com.taiji.duty.utils.TableDataInfo;
+import cn.com.taiji.duty.utils.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -27,6 +21,8 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -76,7 +72,18 @@ public class DutyDailyReportRecordController {
 
     @ApiOperation("日志列表")
     @PostMapping("list")
-    public TableDataInfo list(@RequestBody DutyDailyReportRecordVo vo) {
+    public TableDataInfo list(HttpServletRequest request, @RequestBody DutyDailyReportRecordVo vo) {
+        String token = JwtUtils.getToken(request);
+        String username = redisTemplate.opsForValue().get(token);
+        DutyAccount account = accountService.findByUsername(username);
+        if (account != null) {
+            List<DutyRole> roles = account.getRoles();
+            List<String> stringList = roles.parallelStream().map(DutyRole::getPermissionValue).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+            String join = StringUtils.join(stringList, ",");
+            if (join.contains("ZBY")) {
+                vo.setDeptId(account.getDept().getId());
+            }
+        }
         PageHelper.startPage(vo.getPageNum(), vo.getPageSize());
         List<DutyDailyReportRecord> list = dailyReportRecordService.queryList(vo);
         TableDataInfo rspData = new TableDataInfo();

+ 16 - 9
duty-service/src/main/java/cn/com/taiji/duty/controller/DutySignInRecordController.java

@@ -1,17 +1,11 @@
 package cn.com.taiji.duty.controller;
 
 
-import cn.com.taiji.duty.model.DutyAccount;
-import cn.com.taiji.duty.model.DutyOperLog;
-import cn.com.taiji.duty.model.DutySignInRecord;
-import cn.com.taiji.duty.model.DutySignInRecordVo;
+import cn.com.taiji.duty.model.*;
 import cn.com.taiji.duty.service.IDutyAccountService;
 import cn.com.taiji.duty.service.IDutyOperLogService;
 import cn.com.taiji.duty.service.IDutySignInRecordService;
-import cn.com.taiji.duty.utils.AjaxResult;
-import cn.com.taiji.duty.utils.HttpStatus;
-import cn.com.taiji.duty.utils.JwtUtils;
-import cn.com.taiji.duty.utils.TableDataInfo;
+import cn.com.taiji.duty.utils.*;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSON;
 import com.github.pagehelper.PageHelper;
@@ -32,6 +26,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -92,7 +88,18 @@ public class DutySignInRecordController {
 
     @ApiOperation("查询签卡记录列表")
     @PostMapping("list")
-    public TableDataInfo list(@RequestBody DutySignInRecordVo signInRecordVo) {
+    public TableDataInfo list(HttpServletRequest request, @RequestBody DutySignInRecordVo signInRecordVo) {
+        String token = JwtUtils.getToken(request);
+        String username = redisTemplate.opsForValue().get(token);
+        DutyAccount account = accountService.findByUsername(username);
+        if (account != null) {
+            List<DutyRole> roles = account.getRoles();
+            List<String> stringList = roles.parallelStream().map(DutyRole::getPermissionValue).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+            String join = StringUtils.join(stringList, ",");
+            if (join.contains("ZBY")) {
+                signInRecordVo.setDeptId(account.getDept().getId());
+            }
+        }
         PageHelper.startPage(signInRecordVo.getPageNum(), signInRecordVo.getPageSize());
         List<DutySignInRecord> list = signInRecordService.queryList(signInRecordVo);
         TableDataInfo rspData = new TableDataInfo();

+ 15 - 5
duty-service/src/main/java/cn/com/taiji/duty/controller/DutyWeekReportRecordController.java

@@ -7,10 +7,7 @@ import cn.com.taiji.duty.service.IDutyAccountService;
 import cn.com.taiji.duty.service.IDutyConfigService;
 import cn.com.taiji.duty.service.IDutyWeekReportRecordService;
 import cn.com.taiji.duty.service.IDutyWeekReportRecordService;
-import cn.com.taiji.duty.utils.AjaxResult;
-import cn.com.taiji.duty.utils.HttpStatus;
-import cn.com.taiji.duty.utils.JwtUtils;
-import cn.com.taiji.duty.utils.TableDataInfo;
+import cn.com.taiji.duty.utils.*;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -26,6 +23,8 @@ import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -78,7 +77,18 @@ public class DutyWeekReportRecordController {
 
     @ApiOperation("周报列表")
     @PostMapping("list")
-    public TableDataInfo list(@RequestBody DutyWeekReportRecordVo vo) {
+    public TableDataInfo list(HttpServletRequest request, @RequestBody DutyWeekReportRecordVo vo) {
+        String token = JwtUtils.getToken(request);
+        String username = redisTemplate.opsForValue().get(token);
+        DutyAccount account = accountService.findByUsername(username);
+        if (account != null) {
+            List<DutyRole> roles = account.getRoles();
+            List<String> stringList = roles.parallelStream().map(DutyRole::getPermissionValue).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+            String join = StringUtils.join(stringList, ",");
+            if (join.contains("ZBY")) {
+                vo.setDeptId(account.getDept().getId());
+            }
+        }
         PageHelper.startPage(vo.getPageNum(), vo.getPageSize());
         List<DutyWeekReportRecord> list = weekReportRecordService.queryList(vo);
         TableDataInfo rspData = new TableDataInfo();