修改权限字符

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusMrpBaseController.java

@@ -141,7 +141,7 @@ public class BusMrpBaseController extends BaseController {
     /**
      * 导入物资需求批次计划
      */
-    @SaCheckPermission("cailiaoshebei:mrpBase:add")
+    @SaCheckPermission("cailiaoshebei:mrpBase:import")
     @Log(title = "物资-批次需求计划基础信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/import")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseDocController.java

@@ -81,7 +81,7 @@ public class BusPurchaseDocController extends BaseController {
     /**
      * 根据主键导出物资-采购联系单
      */
-    @SaCheckPermission("cailiaoshebei:purchaseDoc:downloadWord")
+    @SaCheckPermission("cailiaoshebei:purchaseDoc:exportWord")
     @Log(title = "物资-采购联系单", businessType = BusinessType.EXPORT)
     @PostMapping("/export/word")
     public void exportWordById(@NotNull(message = "主键不能为空") Long id,
@@ -106,7 +106,7 @@ public class BusPurchaseDocController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("cailiaoshebei:purchaseDoc:queryPdf")
+    @SaCheckPermission("cailiaoshebei:purchaseDoc:pdf")
     @GetMapping("/pdf/{id}")
     public R<String> getPic(@NotNull(message = "主键不能为空")
                             @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/cailiaoshebei/controller/BusPurchaseUserController.java

@@ -107,7 +107,7 @@ public class BusPurchaseUserController extends BaseController {
     /**
      * 新增或修改物资采购人员
      */
-    @SaCheckPermission("cailiaoshebei:purchaseUser:add")
+    @SaCheckPermission("cailiaoshebei:purchaseUser:addOrUpdate")
     @Log(title = "物资采购人员", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/addOrUpdate")
@@ -121,7 +121,7 @@ public class BusPurchaseUserController extends BaseController {
      *
      * @param projectId 项目id
      */
-    @SaCheckPermission("cailiaoshebei:purchaseUser:query")
+    @SaCheckPermission("cailiaoshebei:purchaseUser:byProject")
     @GetMapping("/byProject/{projectId}")
     public R<BusPurchaseUserVo> getInfoByProject(@NotNull(message = "主键不能为空")
                                         @PathVariable Long projectId) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserController.java

@@ -53,7 +53,7 @@ public class SubConstructionUserController extends BaseController {
     /**
      * 查询每个施工人员总的考勤列表
      */
-    @SaCheckPermission(value = {"contractor:constructionUser:list", "project:attendance:list"})
+    @SaCheckPermission(value = {"contractor:constructionUser:listAttendanceTotal", "project:attendance:listAttendanceTotal"})
     @GetMapping("/list/attendance/total")
     public TableDataInfo<SubConstructionUserAttendanceTotalVo> listAttendanceTotal(SubConstructionUserAttendanceQueryReq req,
                                                                                    PageQuery pageQuery) {
@@ -63,7 +63,7 @@ public class SubConstructionUserController extends BaseController {
     /**
      * 查询施工人员月份考勤列表
      */
-    @SaCheckPermission("contractor:constructionUser:list")
+    @SaCheckPermission("contractor:constructionUser:listAttendanceMonth")
     @GetMapping("/list/attendance/month")
     public R<List<SubConstructionUserAttendanceMonthVo>> listAttendanceMonth(SubConstructionUserAttendanceMonthReq req) {
         return R.ok(constructionUserService.queryAttendanceMonthList(req));
@@ -95,7 +95,7 @@ public class SubConstructionUserController extends BaseController {
     /**
      * 查询大屏施工人员信息
      */
-    @SaCheckPermission("contractor:constructionUser:query")
+    @SaCheckPermission("contractor:constructionUser:gis")
     @GetMapping("/gis")
     public R<SubConstructionUserGisVo> getGisData(SubConstructionUserGisReq req) {
         return R.ok(constructionUserService.getGisData(req));
@@ -126,7 +126,7 @@ public class SubConstructionUserController extends BaseController {
     /**
      * 修改施工人员工资
      */
-    @SaCheckPermission("contractor:constructionUser:edit")
+    @SaCheckPermission("contractor:constructionUser:salary")
     @Log(title = "施工人员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/salary")
@@ -137,7 +137,7 @@ public class SubConstructionUserController extends BaseController {
     /**
      * 修改施工人员打卡状态
      */
-    @SaCheckPermission("contractor:constructionUser:edit")
+    @SaCheckPermission("contractor:constructionUser:clock")
     @Log(title = "施工人员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/clock")
@@ -148,7 +148,7 @@ public class SubConstructionUserController extends BaseController {
     /**
      * 批量修改施工人员状态
      */
-    @SaCheckPermission("contractor:constructionUser:edit")
+    @SaCheckPermission("contractor:constructionUser:batchStatus")
     @Log(title = "施工人员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/batch/status")
@@ -159,7 +159,7 @@ public class SubConstructionUserController extends BaseController {
     /**
      * 根据项目id批量修改施工人员打卡状态
      */
-    @SaCheckPermission("contractor:constructionUser:edit")
+    @SaCheckPermission("contractor:constructionUser:batchClock")
     @Log(title = "施工人员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/batch/clock")
@@ -170,7 +170,7 @@ public class SubConstructionUserController extends BaseController {
     /**
      * 施工人员迁移
      */
-    @SaCheckPermission("contractor:constructionUser:migration")
+    @SaCheckPermission("contractor:constructionUser:changeProject")
     @Log(title = "施工人员", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/change/project")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/controller/SubConstructionUserFileController.java

@@ -59,7 +59,7 @@ public class SubConstructionUserFileController extends BaseController {
     /**
      * 下载施工人员文件存储模板
      */
-    @SaCheckPermission(value = {"project:constructionUserFile:download", "contractor:constructionUserFile:download"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"project:constructionUserFile:exportFileTemplate", "contractor:constructionUserFile:exportFileTemplate"}, mode = SaMode.OR)
     @Log(title = "施工人员文件存储", businessType = BusinessType.EXPORT)
     @RepeatSubmit()
     @PostMapping("/exportFileTemplate")
@@ -70,7 +70,7 @@ public class SubConstructionUserFileController extends BaseController {
     /**
      * 上传施工人员文件压缩包，批量导入存储施工人员文件
      */
-    @SaCheckPermission(value = {"project:constructionUserFile:upload", "contractor:constructionUserFile:upload"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"project:constructionUserFile:uploadZip", "contractor:constructionUserFile:uploadZip"}, mode = SaMode.OR)
     @Log(title = "施工人员文件存储", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/upload/zip")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrExpensesContractController.java

@@ -1,32 +1,33 @@
 package org.dromara.ctr.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ctr.domain.bo.CtrExpensesContractBo;
 import org.dromara.ctr.domain.bo.CtrFileBo;
+import org.dromara.ctr.domain.vo.CtrExpensesContractVo;
 import org.dromara.ctr.domain.vo.CtrFileVo;
+import org.dromara.ctr.service.ICtrExpensesContractService;
 import org.dromara.ctr.service.ICtrFileService;
 import org.dromara.tender.domain.bo.BusBiddingPlanBo;
 import org.dromara.tender.domain.vo.BusBiddingPlanVo;
 import org.dromara.tender.service.IBusBiddingPlanService;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.springframework.web.bind.annotation.*;
-import org.dromara.common.log.annotation.Log;
+
-import org.dromara.common.web.core.BaseController;
+import java.util.List;
-import org.dromara.common.mybatis.core.page.PageQuery;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
-import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.ctr.domain.vo.CtrExpensesContractVo;
-import org.dromara.ctr.domain.bo.CtrExpensesContractBo;
-import org.dromara.ctr.service.ICtrExpensesContractService;
-import org.dromara.common.mybatis.core.page.TableDataInfo;
 
 /**
  * 支出合同
@@ -74,7 +75,7 @@ public class CtrExpensesContractController extends BaseController {
     @SaCheckPermission("ctr:expensesContract:query")
     @GetMapping("/{id}")
     public R<CtrExpensesContractVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
+                                            @PathVariable Long id) {
         return R.ok(ctrExpensesContractService.queryById(id));
     }
 
@@ -116,7 +117,7 @@ public class CtrExpensesContractController extends BaseController {
     /**
      * 查询附件列表
      */
-    @SaCheckPermission("ctr:expensesContract:query")
+    @SaCheckPermission("ctr:expensesContract:fileList")
     @GetMapping("/file/list")
     public TableDataInfo<CtrFileVo> list(CtrFileBo bo, PageQuery pageQuery) {
         return fileService.queryPageList(bo, pageQuery);
@@ -126,12 +127,11 @@ public class CtrExpensesContractController extends BaseController {
     /**
      * 招标计划选择列表
      */
-    @SaCheckPermission("ctr:expensesContract:add")
+    @SaCheckPermission("ctr:expensesContract:tenderList")
     @GetMapping("/tender/list")
     public R<List<BusBiddingPlanVo>> list(BusBiddingPlanBo bo) {
         return R.ok(biddingPlanService.queryList(bo));
     }
 
 
-
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/ctr/controller/CtrIncomeContractController.java

@@ -1,29 +1,30 @@
 package org.dromara.ctr.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.dromara.ctr.domain.bo.CtrFileBo;
+import jakarta.servlet.http.HttpServletResponse;
-import org.dromara.ctr.domain.vo.CtrFileVo;
+import jakarta.validation.constraints.NotEmpty;
-import org.dromara.ctr.service.ICtrFileService;
+import jakarta.validation.constraints.NotNull;
-import org.springframework.web.bind.annotation.*;
+import lombok.RequiredArgsConstructor;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.ctr.domain.vo.CtrIncomeContractVo;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.ctr.domain.bo.CtrIncomeContractBo;
+import org.dromara.common.log.annotation.Log;
-import org.dromara.ctr.service.ICtrIncomeContractService;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.ctr.domain.bo.CtrFileBo;
+import org.dromara.ctr.domain.bo.CtrIncomeContractBo;
+import org.dromara.ctr.domain.vo.CtrFileVo;
+import org.dromara.ctr.domain.vo.CtrIncomeContractVo;
+import org.dromara.ctr.service.ICtrFileService;
+import org.dromara.ctr.service.ICtrIncomeContractService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 收入合同
@@ -69,7 +70,7 @@ public class CtrIncomeContractController extends BaseController {
     @SaCheckPermission("ctr:incomeContract:query")
     @GetMapping("/{id}")
     public R<CtrIncomeContractVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
+                                          @PathVariable Long id) {
         return R.ok(ctrIncomeContractService.queryById(id));
     }
 
@@ -112,7 +113,7 @@ public class CtrIncomeContractController extends BaseController {
     /**
      * 查询附件列表
      */
-    @SaCheckPermission("ctr:incomeContract:query")
+    @SaCheckPermission("ctr:incomeContract:fileList")
     @GetMapping("/file/list")
     public TableDataInfo<CtrFileVo> list(CtrFileBo bo, PageQuery pageQuery) {
         return fileService.queryPageList(bo, pageQuery);

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacBoxTransformerController.java

@@ -86,7 +86,7 @@ public class FacBoxTransformerController extends BaseController {
     /**
      * 通过GeoJson新增设施-箱变
      */
-    @SaCheckPermission("facility:boxTransformer:add")
+    @SaCheckPermission("facility:boxTransformer:geoJson")
     @Log(title = "设施-箱变", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/geoJson")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacInverterController.java

@@ -86,7 +86,7 @@ public class FacInverterController extends BaseController {
     /**
      * 通过GeoJson新增设施-逆变器
      */
-    @SaCheckPermission("facility:inverter:add")
+    @SaCheckPermission("facility:inverter:geoJson")
     @Log(title = "设施-逆变器", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/geoJson")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacMatrixController.java

@@ -74,7 +74,7 @@ public class FacMatrixController extends BaseController {
     /**
      * 获取大屏方阵详情
      */
-    @SaCheckPermission("facility:matrix:query")
+    @SaCheckPermission("facility:matrix:gis")
     @GetMapping("/gis")
     public R<FacMatrixDetailGisVo> getMatrixDetailGis(FacMatrixDetailGisReq req) {
         return R.ok(facMatrixService.getMatrixDetailGis(req));
@@ -83,7 +83,7 @@ public class FacMatrixController extends BaseController {
     /**
      * 获取设施-方阵大屏位置详情
      */
-    @SaCheckPermission("facility:matrix:query")
+    @SaCheckPermission("facility:matrix:gisPosition")
     @GetMapping("/gis/position")
     public R<List<FacFacilityPositionGisVo>> getPositionGis(FacFacilityPositionGisReq req) {
         return R.ok(facMatrixService.getPositionGis(req));
@@ -92,7 +92,7 @@ public class FacMatrixController extends BaseController {
     /**
      * 通过GeoJson新增设施-方阵
      */
-    @SaCheckPermission("facility:matrix:add")
+    @SaCheckPermission("facility:matrix:geoJson")
     @Log(title = "设施-方阵", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/geoJson")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/facility/controller/FacPhotovoltaicPanelController.java

@@ -86,7 +86,7 @@ public class FacPhotovoltaicPanelController extends BaseController {
     /**
      * 通过GeoJson新增设施-光伏板
      */
-    @SaCheckPermission("facility:photovoltaicPanel:add")
+    @SaCheckPermission("facility:photovoltaicPanel:geoJson")
     @Log(title = "设施-光伏板", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/geoJson")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusEnterRoadController.java

@@ -126,8 +126,8 @@ public class BusEnterRoadController extends BaseController {
     }
 
 
-    @SaCheckPermission("land:enterRoad:add")
+    @SaCheckPermission("land:enterRoad:upload")
-    @PostMapping("upload/{projectId}")
+    @PostMapping("/upload/{projectId}")
     public R<Boolean> upload(MultipartFile file, @NotNull(message = "所属项目不明确")
     @PathVariable Long projectId) {
         try {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandBlockController.java

@@ -18,8 +18,8 @@ import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
-import org.dromara.common.web.core.BaseController;
 import org.dromara.common.utils.listener.excel.GenericExcelListener;
+import org.dromara.common.web.core.BaseController;
 import org.dromara.land.domain.BusLandBlock;
 import org.dromara.land.domain.bo.BusLandBlockBo;
 import org.dromara.land.domain.bo.BusLandBlockImportBo;
@@ -117,10 +117,10 @@ public class BusLandBlockController extends BaseController {
         return toAjax(busLandBlockService.deleteWithValidByIds(List.of(ids), true));
     }
 
-    @SaCheckPermission("land:landBlock:uploadProjectId")
+    @SaCheckPermission("land:landBlock:upload")
-    @PostMapping("upload/{projectId}")
+    @PostMapping("/upload/{projectId}")
-    public R<Boolean> upload(MultipartFile file,@NotNull(message = "所属项目不明确")
+    public R<Boolean> upload(MultipartFile file, @NotNull(message = "所属项目不明确")
-                             @PathVariable Long projectId) {
+    @PathVariable Long projectId) {
         try {
             GenericExcelListener<BusLandBlockImportBo, Long> listener = new GenericExcelListener<>(
                 (productList, supId) -> {
@@ -154,6 +154,7 @@ public class BusLandBlockController extends BaseController {
         }
         return R.ok();
     }
+
     public String getLandCode() {
         return "TD-DL-" + UUID.randomUUID().toString().replace("-", "").substring(0, 12).toUpperCase();
         //return "TD-DK-"+ System.currentTimeMillis() + ThreadLocalRandom.current().nextInt(1000, 9999);

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandBlockUnitProjectController.java

@@ -20,14 +20,7 @@ import org.dromara.land.domain.bo.LandUnitBo;
 import org.dromara.land.domain.vo.BusLandBlockUnitProjectVo;
 import org.dromara.land.service.IBusLandBlockUnitProjectService;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -73,7 +66,7 @@ public class BusLandBlockUnitProjectController extends BaseController {
     @SaCheckPermission("land:landBlockUnitProject:query")
     @GetMapping("/{id}")
     public R<BusLandBlockUnitProjectVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
+                                                @PathVariable Long id) {
         return R.ok(busLandBlockUnitProjectService.queryById(id));
     }
 
@@ -113,7 +106,7 @@ public class BusLandBlockUnitProjectController extends BaseController {
     }
 
 
-    @SaCheckPermission("land:landBlockUnitProject:add")
+    @SaCheckPermission("land:landBlockUnitProject:LandUnit")
     @Log(title = "地块关联方阵", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/LandUnit")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusLandTransferLedgerController.java

@@ -20,14 +20,7 @@ import org.dromara.land.domain.vo.BusLandTransferLedgerCountVo;
 import org.dromara.land.domain.vo.BusLandTransferLedgerVo;
 import org.dromara.land.service.IBusLandTransferLedgerService;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -82,7 +75,7 @@ public class BusLandTransferLedgerController extends BaseController {
     @SaCheckPermission("land:landTransferLedger:query")
     @GetMapping("/{id}")
     public R<BusLandTransferLedgerVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
+                                              @PathVariable Long id) {
         return R.ok(busLandTransferLedgerService.queryById(id));
     }
 
@@ -122,10 +115,10 @@ public class BusLandTransferLedgerController extends BaseController {
     }
 
 
-    @SaCheckPermission("land:landTransferLedger:list")
+    @SaCheckPermission("land:landTransferLedger:count")
     @GetMapping("/count/{projectId}")
     public R<BusLandTransferLedgerCountVo> count(@NotNull(message = "项目不能为空")
-                                              @PathVariable Long projectId) {
+                                                 @PathVariable Long projectId) {
         return R.ok(busLandTransferLedgerService.countByProjectId(projectId));
     }
 }

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/land/controller/BusNonTransferLedgerController.java

@@ -19,14 +19,7 @@ import org.dromara.land.domain.bo.BusNonTransferLedgerBo;
 import org.dromara.land.domain.vo.BusNonTransferLedgerVo;
 import org.dromara.land.service.IBusNonTransferLedgerService;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
@@ -72,7 +65,7 @@ public class BusNonTransferLedgerController extends BaseController {
     @SaCheckPermission("land:nonTransferLedger:query")
     @GetMapping("/{id}")
     public R<BusNonTransferLedgerVo> getInfo(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
+                                             @PathVariable Long id) {
         return R.ok(busNonTransferLedgerService.queryById(id));
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/machinery/controller/EqpMachineryController.java

@@ -19,8 +19,8 @@ import org.dromara.machinery.domain.dto.machinery.EqpMachineryCreateReq;
 import org.dromara.machinery.domain.dto.machinery.EqpMachineryGisReq;
 import org.dromara.machinery.domain.dto.machinery.EqpMachineryQueryReq;
 import org.dromara.machinery.domain.dto.machinery.EqpMachineryUpdateReq;
-import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
 import org.dromara.machinery.domain.vo.machinery.EqpMachineryGisVo;
+import org.dromara.machinery.domain.vo.machinery.EqpMachineryVo;
 import org.dromara.machinery.service.IEqpMachineryService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -64,7 +64,7 @@ public class EqpMachineryController extends BaseController {
     /**
      * 查询大屏机械列表
      */
-    @SaCheckPermission("machinery:machinery:list")
+    @SaCheckPermission("machinery:machinery:listGis")
     @GetMapping("/list/gis")
     public R<List<EqpMachineryGisVo>> queryGisList(EqpMachineryGisReq req) {
         return R.ok(machineryService.queryGisList(req));

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialIssueController.java

@@ -12,14 +12,11 @@ import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
-import org.dromara.materials.domain.MatMaterialsInventory;
 import org.dromara.materials.domain.dto.materialissue.MatMaterialIssueCreateReq;
 import org.dromara.materials.domain.dto.materialissue.MatMaterialIssueQueryReq;
 import org.dromara.materials.domain.dto.materialissue.MatMaterialIssueUpdateReq;
 import org.dromara.materials.domain.vo.materialissue.MatMaterialIssueVo;
-import org.dromara.materials.domain.vo.materialreceiveitem.MatMaterialReceiveItemVo;
 import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryListVo;
-import org.dromara.materials.domain.vo.materialsinventory.MatMaterialsInventoryVo;
 import org.dromara.materials.service.IMatMaterialIssueService;
 import org.dromara.materials.service.IMatMaterialsInventoryService;
 import org.springframework.validation.annotation.Validated;
@@ -41,7 +38,7 @@ public class MatMaterialIssueController extends BaseController {
     @Resource
     private IMatMaterialIssueService matMaterialIssueService;
     @Resource
-    private  IMatMaterialsInventoryService materialsInventoryService;
+    private IMatMaterialsInventoryService materialsInventoryService;
 
     /**
      * 查询物料领料单列表
@@ -55,7 +52,7 @@ public class MatMaterialIssueController extends BaseController {
     /**
      * 根据主键导出物料领料单详细信息
      */
-    @SaCheckPermission("materials:materialIssue:export")
+    @SaCheckPermission("materials:materialIssue:exportWord")
     @Log(title = "物料领料单", businessType = BusinessType.EXPORT)
     @PostMapping("/export/word")
     public void exportWordById(@NotNull(message = "主键不能为空") Long id,
@@ -115,7 +112,7 @@ public class MatMaterialIssueController extends BaseController {
      */
     @GetMapping("/inventory/list/{projectId}")
     public R<List<MatMaterialsInventoryListVo>> inventoryList(@NotNull(message = "项目不能为空")
-                                                               @PathVariable Long projectId) {
+                                                              @PathVariable Long projectId) {
         return R.ok(matMaterialIssueService.inventoryList(projectId));
     }
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialReceiveController.java

@@ -53,7 +53,7 @@ public class MatMaterialReceiveController extends BaseController {
     /**
      * 根据主键导出物料接收单详细信息
      */
-    @SaCheckPermission("materials:materialReceive:export")
+    @SaCheckPermission("materials:materialReceive:exportWord")
     @Log(title = "物料接收单", businessType = BusinessType.EXPORT)
     @PostMapping("/export/word")
     public void exportWordById(@NotNull(message = "主键不能为空") Long id,
@@ -112,7 +112,7 @@ public class MatMaterialReceiveController extends BaseController {
     /**
      * 支出合同列表
      */
-    @SaCheckPermission("materials:materialReceive:add")
+    @SaCheckPermission("materials:materialReceive:ctrList")
     @GetMapping("/ctrList")
     public TableDataInfo<CtrExpensesContractVo> list(CtrExpensesContractBo bo, PageQuery pageQuery) {
         return ctrExpensesContractService.queryPageList(bo, pageQuery);

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/controller/MatMaterialsController.java

@@ -65,7 +65,7 @@ public class MatMaterialsController extends BaseController {
     /**
      * 查询大屏材料信息
      */
-    @SaCheckPermission("materials:materials:list")
+    @SaCheckPermission("materials:materials:listGis")
     @GetMapping("/list/gis")
     public R<List<MatMaterialsGisVo>> queryGisList(MatMaterialsGisReq req) {
         return R.ok(materialsService.queryGisList(req));

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/message/controller/MsgNotificationController.java

@@ -38,7 +38,7 @@ public class MsgNotificationController extends BaseController {
     /**
      * 查询当前登录用户发送的消息通知列表
      */
-    @SaCheckPermission("message:notification:listLoginSend")
+    @SaCheckPermission("message:notification:listSendLogin")
     @GetMapping("/list/send/login")
     public TableDataInfo<MsgNotificationVo> listByLoginSend(MsgNotificationQueryReq req, PageQuery pageQuery) {
         Long userId = LoginHelper.getUserId();
@@ -49,7 +49,7 @@ public class MsgNotificationController extends BaseController {
     /**
      * 查询当前登录用户接收的消息通知列表
      */
-    @SaCheckPermission("message:notification:listLoginRecipient")
+    @SaCheckPermission("message:notification:listRecipientLogin")
     @GetMapping("/list/recipient/login")
     public TableDataInfo<MsgNotificationVo> listByLoginRecipient(MsgNotificationQueryReq req, PageQuery pageQuery) {
         Long userId = LoginHelper.getUserId();

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

@@ -97,7 +97,7 @@ public class OthDevicePresetController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("other:devicePreset:edit")
+    @SaCheckPermission("other:devicePreset:move")
     @Log(title = "摄像头预置位", businessType = BusinessType.UPDATE)
     @PutMapping("/move/{id}")
     public R<Void> move(@NotNull(message = "主键不能为空")

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

@@ -59,7 +59,7 @@ public class OthYs7DeviceController extends BaseController {
     /**
      * 根据项目查询萤石摄像头列表
      */
-    @SaCheckPermission("other:ys7Device:list")
+    @SaCheckPermission("other:ys7Device:listProject")
     @GetMapping("/list/project")
     public TableDataInfo<OthYs7DeviceVo> listByProject(Long projectId, PageQuery pageQuery) {
         return othYs7DeviceService.queryPageListByProject(projectId, pageQuery);
@@ -102,7 +102,7 @@ public class OthYs7DeviceController extends BaseController {
     /**
      * 修改萤石摄像头所属项目
      */
-    @SaCheckPermission("other:ys7Device:edit")
+    @SaCheckPermission("other:ys7Device:withProject")
     @Log(title = "萤石摄像头", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/with/project")
@@ -113,7 +113,7 @@ public class OthYs7DeviceController extends BaseController {
     /**
      * 修改萤石摄像头视频加密
      */
-    @SaCheckPermission("other:ys7Device:edit")
+    @SaCheckPermission("other:ys7Device:videoEncrypted")
     @Log(title = "萤石摄像头", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/video/encrypted")
@@ -137,7 +137,7 @@ public class OthYs7DeviceController extends BaseController {
     /**
      * 获取 token
      */
-    @SaCheckPermission("other:ys7Device:query")
+    @SaCheckPermission("other:ys7Device:getToken")
     @GetMapping("/get/token")
     public R<String> getToken() {
         return R.ok("操作成功", ys7Manager.getToken());

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/out/controller/OutMonthPlanController.java

@@ -1,30 +1,30 @@
 package org.dromara.out.controller;
 
-import java.util.List;
-
-import lombok.RequiredArgsConstructor;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.validation.constraints.*;
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import org.dromara.out.domain.BusProcurement;
+import jakarta.servlet.http.HttpServletResponse;
-import org.dromara.out.domain.bo.PurchaseValueAReq;
+import jakarta.validation.constraints.NotEmpty;
-import org.dromara.out.domain.bo.PurchaseValueAupReq;
+import jakarta.validation.constraints.NotNull;
-import org.dromara.out.domain.vo.PurchaseValueARes;
+import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.validation.annotation.Validated;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.common.log.annotation.Log;
-import org.dromara.common.web.core.BaseController;
-import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.validate.AddGroup;
 import org.dromara.common.core.validate.EditGroup;
-import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.excel.utils.ExcelUtil;
-import org.dromara.out.domain.vo.OutMonthPlanVo;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
-import org.dromara.out.domain.bo.OutMonthPlanBo;
+import org.dromara.common.log.annotation.Log;
-import org.dromara.out.service.IOutMonthPlanService;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.out.domain.BusProcurement;
+import org.dromara.out.domain.bo.OutMonthPlanBo;
+import org.dromara.out.domain.bo.PurchaseValueAReq;
+import org.dromara.out.domain.bo.PurchaseValueAupReq;
+import org.dromara.out.domain.vo.OutMonthPlanVo;
+import org.dromara.out.service.IOutMonthPlanService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 月度产值计划
@@ -75,7 +75,7 @@ public class OutMonthPlanController extends BaseController {
     /**
      * 根据项目id和月份和类型获取月度产值计划详细信息
      */
-    @SaCheckPermission("out:monthPlan:query")
+    @SaCheckPermission("out:monthPlan:info")
     @GetMapping("/info")
     public R<OutMonthPlanVo> getInfoByBo(OutMonthPlanBo bo) {
         return R.ok(outMonthPlanService.getInfoByBo(bo));
@@ -122,21 +122,21 @@ public class OutMonthPlanController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("out:monthPlan:query")
+    @SaCheckPermission("out:monthPlan:isSubmit")
     @GetMapping("/isSubmit/{id}")
     public R<Boolean> isSubmit(@NotNull(message = "主键不能为空")
-                                     @PathVariable Long id) {
+                               @PathVariable Long id) {
         return R.ok(outMonthPlanService.isSubmit(id));
     }
 
     /**
      * 获取该月份3种类型计划产值
      */
-    @SaCheckPermission("out:monthPlan:query")
+    @SaCheckPermission("out:monthPlan:monthInfo")
     @GetMapping("/monthInfo")
     public R<List<OutMonthPlanVo>> infoByPlanMonth(@NotNull(message = "项目ID不能为空") Long projectId,
                                                    @NotNull(message = "计划月份不能为空") String planMonth) {
-        return R.ok(outMonthPlanService.infoByPlanMonth(projectId,planMonth));
+        return R.ok(outMonthPlanService.infoByPlanMonth(projectId, planMonth));
     }
 
 

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/progress/controller/PgsProgressPlanDetailController.java

@@ -38,14 +38,14 @@ public class PgsProgressPlanDetailController extends BaseController {
      */
     @SaCheckPermission("progress:progressPlanDetail:list")
     @GetMapping("/list")
-    public TableDataInfo<PgsProgressPlanDetailVo> list(PgsProgressPlanDetailQueryReq req, PageQuery pageQuery){
+    public TableDataInfo<PgsProgressPlanDetailVo> list(PgsProgressPlanDetailQueryReq req, PageQuery pageQuery) {
         return pgsProgressPlanDetailService.queryPageList(req, pageQuery);
     }
 
     /**
      * 新增进度计划详情（普通设施）
      */
-    @SaCheckPermission("progress:progressPlanDetail:insert")
+    @SaCheckPermission("progress:progressPlanDetail:insertDetail")
     @RepeatSubmit()
     @PostMapping("/insert/detail")
     public R<Void> insertFinishedDetail(@Validated @RequestBody PgsProgressPlanDetailFinishedCreateReq req) {
@@ -55,7 +55,7 @@ public class PgsProgressPlanDetailController extends BaseController {
     /**
      * 新增进度计划详情（百分比设施）
      */
-    @SaCheckPermission("progress:progressPlanDetail:insert")
+    @SaCheckPermission("progress:progressPlanDetail:insertPercentage")
     @RepeatSubmit()
     @PostMapping("/insert/percentage")
     public R<Void> insertPercentageDetail(@Validated @RequestBody PgsProgressPlanDetailPercentageCreateReq req) {
@@ -67,7 +67,7 @@ public class PgsProgressPlanDetailController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("progress:progressPlanDetail:query")
+    @SaCheckPermission("progress:progressPlanDetail:detailFinished")
     @GetMapping("/detail/finished/{id}")
     public TableDataInfo<PgsProgressPlanDetailFinishedVo> getFinishedDetail(@NotNull(message = "主键不能为空")
                                                                             @PathVariable Long id,
@@ -80,7 +80,7 @@ public class PgsProgressPlanDetailController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("progress:progressPlanDetail:query")
+    @SaCheckPermission("progress:progressPlanDetail:detailUnFinish")
     @GetMapping("/detail/unFinish/{id}")
     public TableDataInfo<PgsProgressPlanDetailUnFinishVo> getUnFinishDetail(@NotNull(message = "主键不能为空")
                                                                             @PathVariable Long id,
@@ -91,7 +91,7 @@ public class PgsProgressPlanDetailController extends BaseController {
     /**
      * 删除进度计划详情
      */
-    @SaCheckPermission("progress:progressPlanDetail:remove")
+    @SaCheckPermission("progress:progressPlanDetail:removeDetail")
     @RepeatSubmit()
     @DeleteMapping("/remove/detail")
     public R<Void> removeDetail(@Validated PgsProgressPlanDetailRemoveReq req) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusLeaveController.java

@@ -71,7 +71,7 @@ public class BusLeaveController extends BaseController {
     /**
      * 管理员审核施工人员请假申请
      */
-    @SaCheckPermission("project:leave:edit")
+    @SaCheckPermission("project:leave:reviewManager")
     @Log(title = "施工人员请假申请", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/review/manager")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectController.java

@@ -62,7 +62,7 @@ public class BusProjectController extends BaseController {
     /**
      * 查询项目下的子项目列表
      */
-    @SaCheckPermission("project:project:list")
+    @SaCheckPermission("project:project:listSub")
     @GetMapping("/list/sub/{id}")
     public R<List<BusSubProjectVo>> listSubProject(@NotNull(message = "项目id不能为空")
                                                    @PathVariable Long id) {
@@ -72,7 +72,7 @@ public class BusProjectController extends BaseController {
     /**
      * 查询项目下的子项目方阵列表
      */
-    @SaCheckPermission("project:project:list")
+    @SaCheckPermission("project:project:listSubMatrix")
     @GetMapping("/list/sub/matrix/{id}")
     public R<List<BusSubProjectMatrixVo>> listSubProjectMatrix(@NotNull(message = "项目id不能为空")
                                                                @PathVariable Long id) {
@@ -117,7 +117,7 @@ public class BusProjectController extends BaseController {
     /**
      * 查询项目以及项目下的分包公司列表
      */
-    @SaCheckPermission("project:project:query")
+    @SaCheckPermission("project:project:listProjectContractorList")
     @GetMapping("/list/project/contractorList")
     public R<List<BusProjectContractorListVo>> listProjectContractorList() {
         return R.ok(projectService.queryProjectContractorList());
@@ -140,7 +140,7 @@ public class BusProjectController extends BaseController {
     /**
      * 新增子项目
      */
-    @SaCheckPermission("project:project:add")
+    @SaCheckPermission("project:project:sub")
     @Log(title = "项目", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/sub")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectFileController.java

@@ -86,7 +86,7 @@ public class BusProjectFileController extends BaseController {
     /**
      * 上传 dxf 文件并解析为 json
      */
-    @SaCheckPermission("project:projectFile:add")
+    @SaCheckPermission("project:projectFile:uploadDxf")
     @Log(title = "项目文件存储", businessType = BusinessType.IMPORT)
     @PostMapping("/upload/dxf")
     public R<Void> uploadDxf2Json(@RequestParam("file") MultipartFile file, BusProjectFileUploadDxfReq req) {
@@ -98,7 +98,7 @@ public class BusProjectFileController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("project:projectFile:query")
+    @SaCheckPermission("project:projectFile:json")
     @GetMapping("/json/{id}")
     public R<JSONObject> getJSONFile(@NotNull(message = "主键不能为空")
                                      @PathVariable Long id) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusProjectTeamController.java

@@ -50,7 +50,7 @@ public class BusProjectTeamController extends BaseController {
     /**
      * 根据项目id查询项目班组班组长信息列表
      */
-    @SaCheckPermission("project:projectTeam:list")
+    @SaCheckPermission("project:projectTeam:listForeman")
     @GetMapping("/listForeman/{projectId}")
     public R<List<BusProjectTeamForemanVo>> listForeman(@NotNull(message = "项目id不能为空")
                                                         @PathVariable Long projectId) {

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusReissueCardController.java

@@ -71,7 +71,7 @@ public class BusReissueCardController extends BaseController {
     /**
      * 管理员审核施工人员补卡申请
      */
-    @SaCheckPermission("project:reissueCard:edit")
+    @SaCheckPermission("project:reissueCard:reviewManager")
     @Log(title = "施工人员补卡申请", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/review/manager")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/controller/BusUserProjectRelevancyController.java

@@ -63,7 +63,7 @@ public class BusUserProjectRelevancyController extends BaseController {
     /**
      * 查询登录用户与项目关联分页
      */
-    @SaCheckPermission("project:projectRelevancy:list")
+    @SaCheckPermission("project:projectRelevancy:loginPage")
     @GetMapping("/login/page")
     public TableDataInfo<BusUserProjectRelevancyVo> pageByLoginUser(BusUserProjectRelevancyQueryReq req, PageQuery pageQuery) {
         Long userId = LoginHelper.getUserId();
@@ -107,7 +107,7 @@ public class BusUserProjectRelevancyController extends BaseController {
     /**
      * 新增用户与项目列表关联
      */
-    @SaCheckPermission("project:projectRelevancy:add")
+    @SaCheckPermission("project:projectRelevancy:addProjectList")
     @Log(title = "系统用户与项目关联", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/add/project/list")
@@ -119,7 +119,7 @@ public class BusUserProjectRelevancyController extends BaseController {
     /**
      * 移除用户与项目列表关联
      */
-    @SaCheckPermission("project:projectRelevancy:remove")
+    @SaCheckPermission("project:projectRelevancy:removeProjectList")
     @Log(title = "系统用户与项目关联", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @DeleteMapping("/remove/project/list")

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

@@ -15,8 +15,8 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.quality.domain.dto.knowledgedocument.QltKnowledgeDocumentFileCreateReq;
 import org.dromara.quality.domain.dto.knowledgedocument.QltKnowledgeDocumentFileQueryReq;
-import org.dromara.quality.domain.dto.knowledgedocument.QltKnowledgeDocumentQueryReq;
 import org.dromara.quality.domain.dto.knowledgedocument.QltKnowledgeDocumentFileUpdateReq;
+import org.dromara.quality.domain.dto.knowledgedocument.QltKnowledgeDocumentQueryReq;
 import org.dromara.quality.domain.vo.knowledgedocument.QltKnowledgeDocumentVo;
 import org.dromara.quality.service.IQltKnowledgeDocumentService;
 import org.springframework.validation.annotation.Validated;
@@ -42,7 +42,7 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 分页查询质量知识库文件列表
      */
-    @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 +51,7 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 查询质量知识库文件列表
      */
-    @SaCheckPermission("quality:knowledgeDocument:list")
+    @SaCheckPermission("quality:knowledgeDocument:fileList")
     @GetMapping("/file/list/{folderId}")
     public R<List<QltKnowledgeDocumentVo>> queryFileListByFolderId(@NotNull(message = "主键不能为空")
                                                                    @PathVariable Long folderId) {
@@ -61,7 +61,7 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 查询质量知识库文件树列表
      */
-    @SaCheckPermission("quality:knowledgeDocument:list")
+    @SaCheckPermission("quality:knowledgeDocument:folderTreeList")
     @GetMapping("/folder/tree/list")
     public R<List<Tree<Long>>> queryFolderTreeList(QltKnowledgeDocumentQueryReq req) {
         List<Tree<Long>> list = qltKnowledgeDocumentService.queryFolderTreeList(req);
@@ -71,7 +71,7 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 查询质量知识库回收站文件列表
      */
-    @SaCheckPermission("quality:knowledgeDocument:list")
+    @SaCheckPermission("quality:knowledgeDocument:recycleBinList")
     @GetMapping("/recycleBin/list")
     public TableDataInfo<QltKnowledgeDocumentVo> queryRecycleBinPageList(QltKnowledgeDocumentQueryReq req, PageQuery pageQuery) {
         return qltKnowledgeDocumentService.queryRecycleBinPageList(req, pageQuery);
@@ -92,7 +92,7 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 新增质量知识库文件
      */
-    @SaCheckPermission("quality:knowledgeDocument:add")
+    @SaCheckPermission("quality:knowledgeDocument:file")
     @Log(title = "质量知识库", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/file")
@@ -103,7 +103,7 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 修改质量知识库
      */
-    @SaCheckPermission("quality:knowledgeDocument:edit")
+    @SaCheckPermission("quality:knowledgeDocument:file")
     @Log(title = "质量知识库", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/file")
@@ -116,7 +116,7 @@ public class QltKnowledgeDocumentController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("quality:knowledgeDocument:remove")
+    @SaCheckPermission("quality:knowledgeDocument:file")
     @Log(title = "质量知识库", businessType = BusinessType.DELETE)
     @DeleteMapping("/file/{id}")
     public R<Void> remove(@NotNull(message = "主键不能为空")
@@ -129,7 +129,7 @@ public class QltKnowledgeDocumentController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("quality:knowledgeDocument:remove")
+    @SaCheckPermission("quality:knowledgeDocument:fileRecycleBin")
     @Log(title = "质量知识库", businessType = BusinessType.DELETE)
     @DeleteMapping("/file/recycleBin/{ids}")
     public R<Void> removeRecycleBin(@NotNull(message = "主键不能为空")
@@ -151,7 +151,7 @@ public class QltKnowledgeDocumentController extends BaseController {
     /**
      * 畅写在线修改保存回调
      */
-    @SaCheckPermission("quality:knowledgeDocument:edit")
+    @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/QltQualityConstructionLogController.java

@@ -62,7 +62,7 @@ public class QltQualityConstructionLogController extends BaseController {
     /**
      * 根据主键导出质量-施工日志
      */
-    @SaCheckPermission("quality:qualityConstructionLog:export")
+    @SaCheckPermission("quality:qualityConstructionLog:exportWord")
     @Log(title = "质量-施工日志", businessType = BusinessType.EXPORT)
     @PostMapping("/export/word")
     public void exportWordById(@NotNull(message = "主键不能为空") Long id,

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

@@ -70,7 +70,7 @@ public class QltQualityInspectionController extends BaseController {
     /**
      * 根据主键导出质量-检查工单
      */
-    @SaCheckPermission("quality:qualityInspection:export")
+    @SaCheckPermission("quality:qualityInspection:exportWord")
     @Log(title = "质量-检查工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export/word")
     public void exportWordById(@NotNull(message = "主键不能为空") Long id,

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseDocumentSafetyMeetingController.java

@@ -14,8 +14,8 @@ import org.dromara.common.web.core.BaseController;
 import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingCreateFileReq;
 import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingCreateFolderReq;
 import org.dromara.safety.domain.dto.documentsafetymeeting.HseDocumentSafetyMeetingQueryReq;
-import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingVo;
 import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingRecycleBinVo;
+import org.dromara.safety.domain.vo.documentsafetymeeting.HseDocumentSafetyMeetingVo;
 import org.dromara.safety.service.IHseDocumentSafetyMeetingService;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -49,7 +49,7 @@ public class HseDocumentSafetyMeetingController extends BaseController {
     /**
      * 查询安全会议纪要回收站列表
      */
-    @SaCheckPermission("safety:documentSafetyMeeting:list")
+    @SaCheckPermission("safety:documentSafetyMeeting:recycleBinList")
     @GetMapping("/recycleBin/list")
     public TableDataInfo<HseDocumentSafetyMeetingRecycleBinVo> list(HseDocumentSafetyMeetingQueryReq req, PageQuery pageQuery) {
         return documentSafetyMeetingService.queryRecycleBinPageList(req, pageQuery);
@@ -70,7 +70,7 @@ public class HseDocumentSafetyMeetingController extends BaseController {
     /**
      * 新增安全会议纪要文件夹
      */
-    @SaCheckPermission("safety:documentSafetyMeeting:add")
+    @SaCheckPermission("safety:documentSafetyMeeting:folder")
     @Log(title = "安全会议纪要", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/folder")
@@ -81,7 +81,7 @@ public class HseDocumentSafetyMeetingController extends BaseController {
     /**
      * 新增安全会议纪要文件
      */
-    @SaCheckPermission("safety:documentSafetyMeeting:add")
+    @SaCheckPermission("safety:documentSafetyMeeting:file")
     @Log(title = "安全会议纪要", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/file")
@@ -94,7 +94,7 @@ public class HseDocumentSafetyMeetingController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("safety:documentSafetyMeeting:edit")
+    @SaCheckPermission("safety:documentSafetyMeeting:recovery")
     @Log(title = "安全会议纪要", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/recovery/{ids}")
@@ -121,7 +121,7 @@ public class HseDocumentSafetyMeetingController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("safety:documentSafetyMeeting:remove")
+    @SaCheckPermission("safety:documentSafetyMeeting:completelyDelete")
     @Log(title = "安全会议纪要", businessType = BusinessType.DELETE)
     @DeleteMapping("/completelyDelete/{ids}")
     public R<Void> completelyDelete(@NotEmpty(message = "主键不能为空")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseKnowledgeDocumentController.java

@@ -15,8 +15,8 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.safety.domain.dto.knowledgedocument.HseKnowledgeDocumentFileCreateReq;
 import org.dromara.safety.domain.dto.knowledgedocument.HseKnowledgeDocumentFileQueryReq;
-import org.dromara.safety.domain.dto.knowledgedocument.HseKnowledgeDocumentQueryReq;
 import org.dromara.safety.domain.dto.knowledgedocument.HseKnowledgeDocumentFileUpdateReq;
+import org.dromara.safety.domain.dto.knowledgedocument.HseKnowledgeDocumentQueryReq;
 import org.dromara.safety.domain.vo.knowledgedocument.HseKnowledgeDocumentVo;
 import org.dromara.safety.service.IHseKnowledgeDocumentService;
 import org.springframework.validation.annotation.Validated;
@@ -42,7 +42,7 @@ public class HseKnowledgeDocumentController extends BaseController {
     /**
      * 分页查询安全知识库文件列表
      */
-    @SaCheckPermission("safety:knowledgeDocument:list")
+    @SaCheckPermission("safety:knowledgeDocument:filePage")
     @GetMapping("/file/page")
     public TableDataInfo<HseKnowledgeDocumentVo> queryFilePageList(HseKnowledgeDocumentFileQueryReq req, PageQuery pageQuery) {
         return hseKnowledgeDocumentService.queryFilePageByFolderId(req, pageQuery);
@@ -51,7 +51,7 @@ public class HseKnowledgeDocumentController extends BaseController {
     /**
      * 查询安全知识库文件列表
      */
-    @SaCheckPermission("safety:knowledgeDocument:list")
+    @SaCheckPermission("safety:knowledgeDocument:fileList")
     @GetMapping("/file/list/{folderId}")
     public R<List<HseKnowledgeDocumentVo>> queryFileListByFolderId(@NotNull(message = "主键不能为空")
                                                                    @PathVariable Long folderId) {
@@ -61,7 +61,7 @@ public class HseKnowledgeDocumentController extends BaseController {
     /**
      * 查询安全知识库文件树列表
      */
-    @SaCheckPermission("safety:knowledgeDocument:list")
+    @SaCheckPermission("safety:knowledgeDocument:folderTreeList")
     @GetMapping("/folder/tree/list")
     public R<List<Tree<Long>>> queryFolderTreeList(HseKnowledgeDocumentQueryReq req) {
         List<Tree<Long>> list = hseKnowledgeDocumentService.queryFolderTreeList(req);
@@ -71,7 +71,7 @@ public class HseKnowledgeDocumentController extends BaseController {
     /**
      * 查询安全知识库回收站文件列表
      */
-    @SaCheckPermission("safety:knowledgeDocument:list")
+    @SaCheckPermission("safety:knowledgeDocument:recycleBinList")
     @GetMapping("/recycleBin/list")
     public TableDataInfo<HseKnowledgeDocumentVo> queryRecycleBinPageList(HseKnowledgeDocumentQueryReq req, PageQuery pageQuery) {
         return hseKnowledgeDocumentService.queryRecycleBinPageList(req, pageQuery);
@@ -92,7 +92,7 @@ public class HseKnowledgeDocumentController extends BaseController {
     /**
      * 新增安全知识库文件
      */
-    @SaCheckPermission("safety:knowledgeDocument:add")
+    @SaCheckPermission("safety:knowledgeDocument:file")
     @Log(title = "安全知识库", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/file")
@@ -103,7 +103,7 @@ public class HseKnowledgeDocumentController extends BaseController {
     /**
      * 修改安全知识库
      */
-    @SaCheckPermission("safety:knowledgeDocument:edit")
+    @SaCheckPermission("safety:knowledgeDocument:file")
     @Log(title = "安全知识库", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping("/file")
@@ -116,7 +116,7 @@ public class HseKnowledgeDocumentController extends BaseController {
      *
      * @param id 主键
      */
-    @SaCheckPermission("safety:knowledgeDocument:remove")
+    @SaCheckPermission("safety:knowledgeDocument:file")
     @Log(title = "安全知识库", businessType = BusinessType.DELETE)
     @DeleteMapping("/file/{id}")
     public R<Void> remove(@NotNull(message = "主键不能为空")
@@ -129,7 +129,7 @@ public class HseKnowledgeDocumentController extends BaseController {
      *
      * @param ids 主键串
      */
-    @SaCheckPermission("safety:knowledgeDocument:remove")
+    @SaCheckPermission("safety:knowledgeDocument:fileRecycleBin")
     @Log(title = "安全知识库", businessType = BusinessType.DELETE)
     @DeleteMapping("/file/recycleBin/{ids}")
     public R<Void> removeRecycleBin(@NotNull(message = "主键不能为空")
@@ -151,7 +151,7 @@ public class HseKnowledgeDocumentController extends BaseController {
     /**
      * 畅写在线修改保存回调
      */
-    @SaCheckPermission("safety:knowledgeDocument:edit")
+    @SaCheckPermission("safety: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/safety/controller/HseQuestionUserAnswerController.java

@@ -64,7 +64,7 @@ public class HseQuestionUserAnswerController extends BaseController {
     /**
      * 批量下载用户试卷存储
      */
-    @SaCheckPermission("safety:questionUserAnswer:export")
+    @SaCheckPermission("safety:questionUserAnswer:exportFile")
     @Log(title = "用户试卷存储", businessType = BusinessType.EXPORT)
     @RepeatSubmit()
     @PostMapping("/exportFile")
@@ -99,7 +99,7 @@ public class HseQuestionUserAnswerController extends BaseController {
     /**
      * 上传线下考试试卷存储
      */
-    @SaCheckPermission("safety:questionUserAnswer:add")
+    @SaCheckPermission("safety:questionUserAnswer:uploadZip")
     @Log(title = "用户试卷存储", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/upload/zip")

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseSafetyInspectionController.java

@@ -62,7 +62,7 @@ public class HseSafetyInspectionController extends BaseController {
     /**
      * 根据主键导出安全巡检工单
      */
-    @SaCheckPermission("safety:safetyInspection:export")
+    @SaCheckPermission("safety:safetyInspection:exportWord")
     @Log(title = "安全巡检工单", businessType = BusinessType.EXPORT)
     @PostMapping("/export/word")
     public void exportWordById(@NotNull(message = "主键不能为空") Long id,

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/controller/HseViolationRecordController.java

@@ -58,7 +58,7 @@ public class HseViolationRecordController extends BaseController {
     /**
      * 新增违规记录处理人
      */
-    @SaCheckPermission("safety:violationRecord:insertHandler")
+    @SaCheckPermission("safety:violationRecord:handler")
     @Log(title = "违规记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/handler")

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

@@ -68,18 +68,6 @@ public class SysDeptController extends BaseController {
         return R.ok(deptService.selectDeptById(deptId));
     }
 
-//    /**
-//     * 根据部门编号获取详细信息
-//     *
-//     */
-//    @SaCheckPermission("system:dept:informationRetrieval")
-//    @GetMapping(value = "informationRetrieval")
-//    public R<SysDeptBo> getInfo(SysDeptBo dept) {
-//        deptService.checkDeptDataScope(dept.getDeptId());
-//        return R.ok(deptService.selectDeptByIdBo(dept));
-//    }
-
-
     /**
      * 新增部门
      */

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

@@ -59,7 +59,7 @@ public class SysUserFileController extends BaseController {
     /**
      * 根据用户id获取用户文件关联列表
      */
-    @SaCheckPermission("system:userFile:query")
+    @SaCheckPermission("system:userFile:user")
     @GetMapping("/user/{userId}")
     public R<List<SysUserFileVo>> getInfoByUserId(@NotNull(message = "用户id不能为空")
                                                   @PathVariable Long userId) {
@@ -69,7 +69,7 @@ public class SysUserFileController extends BaseController {
     /**
      * 获取登录用户文件关联列表
      */
-    @SaCheckPermission("system:userFile:query")
+    @SaCheckPermission("system:userFile:loginUser")
     @GetMapping("/login/user")
     public R<List<SysUserFileVo>> getInfoByLoginUser() {
         return R.ok(userFileService.queryListByLoginUser());