巡检

platform-rest/src/main/java/com/platform/rest/controller/fill/FillGatherTaskController.java

@@ -147,6 +147,7 @@ public class FillGatherTaskController {
      */
     @SysLog("暂停巡检任务")
     @PutMapping("/pause/{id}")
+    @PreAuthorize("@pms.hasPermission('fill-tasks-pause')")
     public R pause(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody FillGatherTaskDTO fillGatherTaskDTO) {
         fillGatherTaskService.handlePauseTask(fillGatherTaskDTO);
         return new R<>();
@@ -159,6 +160,7 @@ public class FillGatherTaskController {
      */
     @SysLog("延时巡检任务")
     @PutMapping("/overtime/{id}")
+    @PreAuthorize("@pms.hasPermission('fill-tasks-overtime')")
     public R overtime(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody FillGatherTaskDTO fillGatherTaskDTO) {
         fillGatherTaskService.overTimeTask(fillGatherTaskDTO);
         return new R<>();
@@ -171,6 +173,7 @@ public class FillGatherTaskController {
      */
     @SysLog("转派巡检任务")
     @PutMapping("/dispatch/{id}")
+    @PreAuthorize("@pms.hasPermission('fill-tasks-dispatch')")
     public R dispatch(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody FillGatherTaskDTO fillGatherTaskDTO) {
         fillGatherTaskService.dispatchTask(fillGatherTaskDTO);
         return new R<>();

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.cache.ConfigCache;
 import com.platform.common.constant.RedisKeyConstants;
+import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
 import com.platform.dao.dto.fill.FillGatherTaskDTO;
@@ -17,6 +18,7 @@ import com.platform.dao.enums.*;
 import com.platform.dao.mapper.fill.*;
 import com.platform.dao.mapper.upms.SysUserMapper;
 import com.platform.dao.util.MessageTemplateUtil;
+import com.platform.dao.vo.SysRoleVO;
 import com.platform.dao.vo.query.fill.FillGatherTaskVO;
 import com.platform.dao.vo.query.fill.FillInfoVO;
 import com.platform.service.base.impl.BaseServiceImpl;
@@ -62,6 +64,22 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
     @Override
     public AbstractPageResultBean<FillGatherTaskVO> selectPageList(FillGatherTaskDTO record, int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+        UserInfo userInfo = SecurityUtils.getUserInfo();
+        String userId = userInfo.getUserId();
+        record.setCreatedUserId(userId);
+        // 获取当前用户角色
+        StringBuilder roleCodes = new StringBuilder();
+        userInfo.getRoleCodes().forEach(item-> {
+            roleCodes.append(item).append(",");
+        });
+        String roleArray = roleCodes.toString();
+        if(roleArray.contains(SysRoleCodeEnum.FILL_CHECKER_LEADER.name())){
+            record.setCreatedUserId(null);
+            record.setCheckLeader(userId);
+        }else if(roleArray.contains(SysRoleCodeEnum.FILL_CHECKER.name())){
+            record.setCreatedUserId(null);
+            record.setChecker(userId);
+        }
         return new MyPage(mapper.selectList(record));
     }