权限字符修改

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/bidding/controller/BusBiddingUserController.java

@@ -2,6 +2,7 @@ package org.dromara.bidding.controller;
 
 import java.util.List;
 
+import cn.dev33.satoken.annotation.SaMode;
 import lombok.RequiredArgsConstructor;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.*;
@@ -50,7 +51,7 @@ public class BusBiddingUserController extends BaseController {
     /**
      * 查询招投标人员列表
      */
-    @SaCheckPermission("bidding:biddingUser:getUser")
+    @SaCheckPermission(value = {"bidding:biddingUser:list","bidding:biddingUser:query","bidding:biddingUser:add"},mode = SaMode.OR)
     @GetMapping("/getUser")
     public R<List<SysUser>> getUser() {
         return R.ok(busBiddingUserService.getUser());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/gps/controller/GpsEquipmentController.java

@@ -3,6 +3,7 @@ package org.dromara.gps.controller;
 import java.util.List;
 import java.util.Map;
 
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import jakarta.annotation.Resource;
@@ -17,10 +18,13 @@ import org.dromara.contractor.domain.dto.constructionuser.SubConstructionUserQue
 import org.dromara.contractor.domain.exportvo.BusConstructionUserExportVo;
 import org.dromara.contractor.domain.vo.constructionuser.SubConstructionUserVo;
 import org.dromara.contractor.service.ISubConstructionUserService;
+import org.dromara.gps.domain.bo.GpsEquipmentSonBo;
 import org.dromara.gps.domain.vo.*;
+import org.dromara.gps.service.IGpsEquipmentSonService;
 import org.dromara.project.service.IBusProjectService;
 import org.dromara.system.domain.SysUser;
 import org.dromara.system.domain.vo.SysUserVo;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
@@ -57,6 +61,22 @@ public class GpsEquipmentController extends BaseController {
     private final IBusProjectService projectService;
 
 
+    @Lazy
+    private final IGpsEquipmentSonService gpsEquipmentSonService;
+
+
+
+
+    /**
+     * 查询GPS设备定位信息列表
+     */
+    @SaCheckPermission(value = {"gps:equipment:list","gps:equipment:query","gps:equipment:add","gps:equipment:edit"}, mode = SaMode.OR)
+    @GetMapping("/getGpsList")
+    public R<List<GpsEquipmentSonVo>> getGpsList(GpsEquipmentSonBo bo) {
+        return R.ok(gpsEquipmentSonService.queryList(bo));
+    }
+
+
     /**
      * 获取用户打卡数据
      * @param jsonData
@@ -106,7 +126,8 @@ public class GpsEquipmentController extends BaseController {
     /**
      * 查询GPS设备用户列表
      */
-    @SaCheckPermission("gps:equipment:getUserList")
+//    @SaCheckPermission("gps:equipment:getUserList")
+    @SaCheckPermission(value = {"gps:equipment:list","gps:equipment:query","gps:equipment:add","gps:equipment:edit"}, mode = SaMode.OR)
     @GetMapping("/getUserList")
     public R<List<GpsUserVo>> getUserList(GpsEquipmentBo bo) {
         return R.ok(gpsEquipmentService.getUserList(bo));
@@ -160,7 +181,8 @@ public class GpsEquipmentController extends BaseController {
     /**
      * 项目列表
      */
-    @SaCheckPermission("gps:equipment:getProjectList")
+//    @SaCheckPermission("gps:equipment:getProjectList")
+    @SaCheckPermission(value = {"gps:equipment:list","gps:equipment:query","gps:equipment:add","gps:equipment:edit"}, mode = SaMode.OR)
     @GetMapping("/getProjectList")
     public R<List<GpsProjectVo>> getProjectList() {
         return R.ok(gpsEquipmentService.getProjectList());
@@ -171,7 +193,8 @@ public class GpsEquipmentController extends BaseController {
     /**
      * GPS人机关联绑定
      */
-    @SaCheckPermission("gps:equipment:bindManmachine")
+//    @SaCheckPermission("gps:equipment:bindManmachine")
+    @SaCheckPermission("gps:equipment:edit")
     @Log(title = "GPS设备详细", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/bindManmachine")
@@ -186,7 +209,8 @@ public class GpsEquipmentController extends BaseController {
     /**
      * 查询施工人员列表
      */
-    @SaCheckPermission("gps:equipment:userList")
+//    @SaCheckPermission("gps:equipment:userList")
+    @SaCheckPermission(value = {"gps:equipment:list","gps:equipment:query","gps:equipment:add","gps:equipment:edit"}, mode = SaMode.OR)
     @GetMapping("/userList")
     public R<List<ConstructionUser>> list(SubConstructionUserQueryReq req) {
         List<SubConstructionUser> list = constructionUserService.list(Wrappers.<SubConstructionUser>lambdaQuery()
@@ -199,7 +223,8 @@ public class GpsEquipmentController extends BaseController {
     /**
      * GPS人机关联解绑
      */
-    @SaCheckPermission("gps:equipment:unbindManmachine")
+//    @SaCheckPermission("gps:equipment:unbindManmachine")
+    @SaCheckPermission("gps:equipment:edit")
     @Log(title = "GPS设备详细", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PostMapping("/unbindManmachine")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/other/controller/OthYs7DeviceController.java

@@ -1,6 +1,7 @@
 package org.dromara.other.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import cn.hutool.json.JSONUtil;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletResponse;
@@ -59,7 +60,8 @@ public class OthYs7DeviceController extends BaseController {
     /**
      * 根据项目查询萤石摄像头列表
      */
-    @SaCheckPermission("other:ys7Device:listProject")
+//    @SaCheckPermission("other:ys7Device:listProject")
+    @SaCheckPermission(value = {"other:ys7Device:list","other:ys7Device:edit","other:ys7Device:query"},mode = SaMode.OR)
     @GetMapping("/list/project")
     public TableDataInfo<OthYs7DeviceVo> listByProject(Long projectId, PageQuery pageQuery) {
         return othYs7DeviceService.queryPageListByProject(projectId, pageQuery);
@@ -137,7 +139,8 @@ public class OthYs7DeviceController extends BaseController {
     /**
      * 获取 token
      */
-    @SaCheckPermission("other:ys7Device:getToken")
+//    @SaCheckPermission("other:ys7Device:getToken")
+    @SaCheckPermission(value = {"other:ys7Device:list","other:ys7Device:edit","other:ys7Device:query"},mode = SaMode.OR)
     @GetMapping("/get/token")
     public R<String> getToken() {
         return R.ok("操作成功", ys7Manager.getToken());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltFileFolderController.java

@@ -42,7 +42,8 @@ public class QltFileFolderController extends BaseController {
     /**
      * 查询会议纪要列表
      */
-    @SaCheckPermission("quality:fileFolder:listAll")
+//    @SaCheckPermission("quality:fileFolder:listAll")
+    @SaCheckPermission("quality:fileFolder:list")
     @GetMapping("/list-all")
     public R<List<QltFileFolderVo>> listAll(QltListQueryDto dto) {
         return R.ok(qltFileFolderService.listAll(dto));
@@ -96,7 +97,8 @@ public class QltFileFolderController extends BaseController {
     /**
      * 创建文件或文件夹
      */
-    @SaCheckPermission("quality:fileFolder:create")
+//    @SaCheckPermission("quality:fileFolder:create")
+    @SaCheckPermission("quality:fileFolder:add")
     @PostMapping("/create")
     public R<QltFileFolder> create(@RequestBody QltFileFolderCreateDTO dto) {
         return R.ok(qltFileFolderService.createFileOrFolder(dto));
@@ -105,7 +107,8 @@ public class QltFileFolderController extends BaseController {
     /**
      * 删除文件或文件夹（级联删除子项）
      */
-    @SaCheckPermission("quality:fileFolder:delete")
+//    @SaCheckPermission("quality:fileFolder:delete")
+    @SaCheckPermission("quality:fileFolder:remove")
     @DeleteMapping("/{ids}")
     @Transactional
     public R<Boolean> delete(@PathVariable List<Long> ids) {
@@ -118,7 +121,8 @@ public class QltFileFolderController extends BaseController {
     /**
      * 移动文件或文件夹到指定目录
      */
-    @SaCheckPermission("quality:fileFolder:move")
+//    @SaCheckPermission("quality:fileFolder:move")
+    @SaCheckPermission("quality:fileFolder:edit")
     @PostMapping("/move")
     @Transactional
     public R<Boolean> move(@RequestBody QltFileFolderMoveDTO dto) {
@@ -154,7 +158,8 @@ public class QltFileFolderController extends BaseController {
     }
 
 
-    @SaCheckPermission("quality:fileFolder:reName")
+//    @SaCheckPermission("quality:fileFolder:reName")
+    @SaCheckPermission("quality:fileFolder:edit")
     @PutMapping("/reName")
     public R<Boolean> reName(@RequestParam("id") Long id,
                              @RequestParam("name") String name) {
@@ -162,7 +167,8 @@ public class QltFileFolderController extends BaseController {
     }
 
 
-    @SaCheckPermission("quality:fileFolder:download")
+//    @SaCheckPermission("quality:fileFolder:download")
+    @SaCheckPermission("quality:fileFolder:edit")
     @GetMapping("/download/{id}")
     public void download(@PathVariable Long id, HttpServletResponse response) throws IOException {
         qltFileFolderService.download(id, response);

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltKnowledgeDocumentController.java

@@ -42,7 +42,8 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 分页查询质量知识库文件列表
      */
-    @SaCheckPermission("quality:knowledgeDocument:filePage")
+    @SaCheckPermission("quality:knowledgeDocument:list")
+//    @SaCheckPermission("quality:knowledgeDocument:filePage")
     @GetMapping("/file/page")
     public TableDataInfo<QltKnowledgeDocumentVo> queryFilePageList(QltKnowledgeDocumentFileQueryReq req, PageQuery pageQuery) {
         return qltKnowledgeDocumentService.queryFilePageByFolderId(req, pageQuery);
@@ -51,7 +52,8 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 查询质量知识库文件列表
      */
-    @SaCheckPermission("quality:knowledgeDocument:fileList")
+//    @SaCheckPermission("quality:knowledgeDocument:fileList")
+    @SaCheckPermission("quality:knowledgeDocument:list")
     @GetMapping("/file/list/{folderId}")
     public R<List<QltKnowledgeDocumentVo>> queryFileListByFolderId(@NotNull(message = "主键不能为空")
                                                                    @PathVariable Long folderId) {
@@ -61,7 +63,7 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 查询质量知识库文件树列表
      */
-    @SaCheckPermission("quality:knowledgeDocument:folderTreeList")
+    @SaCheckPermission("quality:knowledgeDocument:list")
     @GetMapping("/folder/tree/list")
     public R<List<Tree<Long>>> queryFolderTreeList(QltKnowledgeDocumentQueryReq req) {
         List<Tree<Long>> list = qltKnowledgeDocumentService.queryFolderTreeList(req);
@@ -71,7 +73,8 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 查询质量知识库回收站文件列表
      */
-    @SaCheckPermission("quality:knowledgeDocument:recycleBinList")
+//    @SaCheckPermission("quality:knowledgeDocument:recycleBinList")
+    @SaCheckPermission("quality:knowledgeDocument:list")
     @GetMapping("/recycleBin/list")
     public TableDataInfo<QltKnowledgeDocumentVo> queryRecycleBinPageList(QltKnowledgeDocumentQueryReq req, PageQuery pageQuery) {
         return qltKnowledgeDocumentService.queryRecycleBinPageList(req, pageQuery);
@@ -140,7 +143,8 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 根据主键id批量恢复
      */
-    @SaCheckPermission("quality:knowledgeDocument:recovery")
+//    @SaCheckPermission("quality:knowledgeDocument:recovery")
+    @SaCheckPermission("quality:knowledgeDocument:edit")
     @Log(title = "质量知识库", businessType = BusinessType.UPDATE)
     @PostMapping("/recovery/{ids}")
     public R<Void> recoveryBatchById(@NotNull(message = "主键不能为空")
@@ -151,7 +155,7 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 畅写在线修改保存回调
      */
-    @SaCheckPermission("quality:knowledgeDocument:changxieCallback")
+//    @SaCheckPermission("quality:knowledgeDocument:changxieCallback")
     @PostMapping("/changxie/callback/{id}")
     public void singleFileUploads(@NotNull(message = "主键不能为空")
                                   @PathVariable Long id, HttpServletRequest request, HttpServletResponse response) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/controller/QltQualityInspectionController.java

@@ -1,6 +1,7 @@
 package org.dromara.quality.controller;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import cn.dev33.satoken.annotation.SaMode;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotEmpty;
 import jakarta.validation.constraints.NotNull;
@@ -132,6 +133,7 @@ public class QltQualityInspectionController extends BaseController {
     /**
      * 整改人选择列表
      */
+    @SaCheckPermission(value = {"quality:qualityInspection:edit","quality:qualityInspection:add","quality:qualityInspection:query","quality:qualityInspection:list"},mode = SaMode.OR)
     @GetMapping("/listForeman/{projectId}")
     public R<List<BusProjectTeamForemanVo>> listForeman(@NotNull(message = "项目id不能为空")
                                                         @PathVariable Long projectId) {