接口添加注解 2022/9/2

PAS/src/main/java/cn/cslg/pas/controller/CustomAnalysisItemController.java

@@ -5,6 +5,7 @@ import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.model.vo.SearchSourceDataVO;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.CustomAnalysisItem;
 import cn.cslg.pas.service.CustomAnalysisItemService;
 
@@ -39,7 +40,7 @@ public class CustomAnalysisItemController {
         return Response.success(customAnalysisItemService.getTreeList(projectId));
     }
 
-    @Permission(roles = {1, 2, 4})
+    @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/addGroup")
     @PostMapping("add")
     @Operation(summary = "新增分析项")
     public String add(@RequestBody CustomAnalysisItem customAnalysisItem) {
@@ -52,14 +53,14 @@ public class CustomAnalysisItemController {
         return Response.success(customAnalysisItemService.getItemByUid(uid));
     }
 
-    @Permission(roles = {1, 2, 4})
+    @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/groupModify")
     @PostMapping("edit")
     @Operation(summary = "编辑分析项")
     public String edit(@RequestBody CustomAnalysisItem customAnalysisItem) {
         return customAnalysisItemService.edit(customAnalysisItem);
     }
 
-    @Permission(roles = {1, 2, 4})
+    @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/groupModify")
     @PostMapping("/delete/{id}")
     @Operation(summary = "删除分析项")
     public String delete(@PathVariable Integer id) {

PAS/src/main/java/cn/cslg/pas/controller/PatentApplicantController.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.PatentApplicant;
 import cn.cslg.pas.service.PatentApplicantService;
 import cn.cslg.pas.common.utils.Response;
@@ -46,28 +47,28 @@ public class PatentApplicantController {
         return Response.success(patentApplicantService.getById(id));
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/merge/applicationMerge/add")
     @PostMapping("add")
     @Operation(summary = "选择申请人")
     public String add(@RequestBody PatentApplicant patentApplicant) {
         return patentApplicantService.add(patentApplicant);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/merge/applicationMerge/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑申请人")
     public String edit(@RequestBody PatentApplicant patentApplicant) {
         return patentApplicantService.edit(patentApplicant);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/merge/applicationMerge/delete")
     @PostMapping("delete")
     @Operation(summary = "删除申请人")
     public String delete(Integer id) {
         return patentApplicantService.delete(id);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/merge/applicationMerge/merged/remove")
     @PostMapping("/merge/delete")
     @Operation(summary = "删除申请人（合并）")
     public String deleteMerge(Integer id, Integer mergeId) {

PAS/src/main/java/cn/cslg/pas/controller/PatentController.java

@@ -3,6 +3,7 @@ package cn.cslg.pas.controller;
 import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.Patent;
 import cn.cslg.pas.common.model.vo.*;
 import cn.cslg.pas.common.utils.JsonUtils;
@@ -50,7 +51,7 @@ public class PatentController {
         return Response.success(projectPatentLinkService.getPatentReadTotal(params));
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/batchOperation/read")
     @PostMapping("/read/update")
     @Operation(summary = "修改专利阅读状态")
     public String updatePatentReadStatus(@RequestBody PatentReadVO params) {
@@ -82,6 +83,7 @@ public class PatentController {
         return Response.success(patentService.getPatentListIds(params));
     }
 
+    @checkAuth(FunId = "/workspace/folder/exportPatent")
     @PostMapping("export")
     @Operation(summary = "导出专利")
     public String export(@RequestBody PatentExportParams params) {
@@ -120,7 +122,7 @@ public class PatentController {
         return Response.success(cacheUtils.setSelectPatentIds(ids));
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/batchOperation/batchIndexing")
     @PostMapping("/batch/index")
     @Operation(summary = "批量批量专利标引")
     public String patentBatchIndex(@RequestBody PatentBatchIndexVO params) {

PAS/src/main/java/cn/cslg/pas/controller/PatentImageController.java

@@ -3,6 +3,7 @@ package cn.cslg.pas.controller;
 import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.PatentImage;
 import cn.cslg.pas.service.PatentImageService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -30,21 +31,21 @@ public class PatentImageController {
 
     private final PatentImageService patentImageService;
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/details/figureUpdata")
     @PostMapping("add")
     @Operation(summary = "新增附图")
     public String add(MultipartFile file, PatentImage patentImage) {
         return patentImageService.add(file, patentImage);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/details/figuremodify")
     @PostMapping("edit")
     @Operation(summary = "编辑附图")
     public String edit(MultipartFile file, PatentImage patentImage) {
         return patentImageService.edit(file, patentImage);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/details/figureDelete")
     @PostMapping("delete")
     @Operation(summary = "删除附图")
     public String delete(Integer id) {

PAS/src/main/java/cn/cslg/pas/controller/PatentInstructionController.java

@@ -54,7 +54,7 @@ public class PatentInstructionController {
         return Response.success(patentInstructionService.getPageList(params));
     }
 
-    @checkAuth(FunId = "/patent/instruction/batch/upload")
+    @checkAuth(FunId = "/workspace/folder/batchUploadSpecification")
     @PostMapping("/batch/upload")
     @Operation(summary = "批量上传说明书")
     public String batchUpload(String url, Integer type, String remark) throws IOException {
@@ -69,7 +69,7 @@ public class PatentInstructionController {
         return patentInstructionService.add(file, patentInstruction);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/details/updataInstruction")
     @PostMapping("edit")
     @Operation(summary = "编辑说明书")
     public String edit(MultipartFile file, PatentInstruction patentInstruction) {

PAS/src/main/java/cn/cslg/pas/controller/PatentInventorController.java

@@ -5,6 +5,7 @@ import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.model.vo.PatentApplicantVO;
 import cn.cslg.pas.common.model.vo.PatentInventorVO;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.PatentApplicant;
 import cn.cslg.pas.domain.PatentInventor;
 import cn.cslg.pas.service.PatentApplicantService;
@@ -43,21 +44,21 @@ public class PatentInventorController {
         return Response.success(patentInventorService.getById(id));
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/merge/inventorMerge/add")
     @PostMapping("add")
     @Operation(summary = "新增发明人")
     public String add(@RequestBody PatentInventor patentInventor) {
         return patentInventorService.add(patentInventor);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/merge/inventorMerge/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑发明人")
     public String edit(@RequestBody PatentInventor patentInventor) {
         return patentInventorService.edit(patentInventor);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/merge/inventorMerge/delete")
     @PostMapping("delete")
     @Operation(summary = "删除发明人")
     public String delete(Integer id) {

PAS/src/main/java/cn/cslg/pas/controller/PatentLabelController.java

@@ -5,6 +5,7 @@ import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.model.vo.PatentCustomFieldSettingVO;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.service.PatentLabelService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -32,7 +33,7 @@ public class PatentLabelController {
 
     private final PatentLabelService patentLabelService;
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/details/addLabel")
     @PostMapping
     @Operation(summary = "更新标签")
     public String update(@RequestBody PatentCustomFieldSettingVO params) {

PAS/src/main/java/cn/cslg/pas/controller/ProjectController.java

@@ -48,14 +48,14 @@ public class ProjectController {
 
 
     @PostMapping("list")
-    @checkAuth(FunId = "/project/list")
+    @checkAuth(FunId = "/workspace/project/check")
     @Operation(summary = "专题库列表")
     public String getPageList(@RequestBody ProjectVO params) {
 
         return Response.success(projectService.getPageList(params));
     }
 
-    @checkAuth(FunId = "/project/add")
+    @checkAuth(FunId = "/workspace/project/add")
     @PostMapping("add")
     @Operation(summary = "新增专题库")
     public String add(@RequestBody Project project) {
@@ -66,7 +66,7 @@ public class ProjectController {
         return projectService.add(project);
     }
 
-    @checkAuth(FunId = "/project/edit")
+    @checkAuth(FunId = "/workspace/project/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑专题库")
     public String edit(@RequestBody Project project) {
@@ -74,7 +74,7 @@ public class ProjectController {
     }
 
     @PostMapping("delete")
-    @checkAuth(FunId = "/project/delete")
+    @checkAuth(FunId = "/workspace/project/delete")
     @Operation(summary = "删除专题库")
     public String delete(Integer id) {
         return projectService.delete(id);
@@ -117,20 +117,20 @@ public class ProjectController {
     }
 
     @PostMapping("share")
-    @checkAuth(FunId = "/project/share")
+    @checkAuth(FunId = "/workspace/project/project_share")
     @Operation(summary = "分享专题库")
     public String share(Integer id, @RequestBody List<Integer> userIds) {
         return projectService.share(id, userIds);
     }
 
-    @checkAuth(FunId ="/project/importExcel")
+    @checkAuth(FunId ="/workspace/project/import/Excel_template")
     @PostMapping("importExcel")
     @Operation(summary = "根据模板导入专题库信息")
     public String importExcel(MultipartFile file) {
         return projectService.importExcel(file);
     }
 
-    @checkAuth(FunId = "/project/export/list")
+    @checkAuth(FunId = "/workspace/project/export_list")
     @PostMapping("/export/list")
     @Operation(summary = "导出专题库信息列表")
     public void exportProjectList(HttpServletResponse response) {

PAS/src/main/java/cn/cslg/pas/controller/ProjectExportController.java

@@ -9,6 +9,7 @@ import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.Project;
 import cn.cslg.pas.domain.ProjectExport;
 import cn.cslg.pas.domain.User;
@@ -60,7 +61,7 @@ public class ProjectExportController {
         return Response.success(projectExportService.getPageList(params));
     }
 
-    @Permission(roles = {2})
+    @checkAuth(FunId = "/workspace/folder/topicLibraryExport/delete")
     @PostMapping("delete")
     @Operation(summary = "删除导出记录")
     public String deleteExport(Integer id) {

PAS/src/main/java/cn/cslg/pas/controller/ProjectFieldController.java

@@ -8,6 +8,7 @@ import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.service.ProjectFieldService;
 import cn.cslg.pas.domain.ProjectField;
 import cn.cslg.pas.common.model.vo.ProjectFieldVO;
@@ -37,28 +38,28 @@ public class ProjectFieldController {
     private final ProjectFieldService projectFieldService;
     private final CacheUtils cacheUtils;
     private final LoginUtils loginUtils;
-
+    @checkAuth(FunId = "/workspace/common/customField/check")
     @GetMapping("list")
     @Operation(summary = "自定义字段列表")
     public String getPageList(ProjectFieldVO params) {
         return Response.success(projectFieldService.getPageList(params));
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/common/customField/add")
     @PostMapping("add")
     @Operation(summary = "新增自定义字段")
     public String add(@RequestBody ProjectField projectField) {
         return projectFieldService.add(projectField);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/common/customField/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑自定义字段")
     public String edit(@RequestBody ProjectField projectField) {
         return projectFieldService.edit(projectField);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/common/customField/delete")
     @PostMapping("delete")
     @Operation(summary = "删除自定义字段")
     public String delete(Integer id) {
@@ -83,7 +84,7 @@ public class ProjectFieldController {
         return Response.success(projectFieldService.getProjectCustomField(projectId));
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/common/customField/import")
     @PostMapping("import")
     @Operation(summary = "从一个专题库导入一个自定义字段")
     public String importProjectField(String id, Integer projectId) {
@@ -91,7 +92,7 @@ public class ProjectFieldController {
         return Response.success(true);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/common/customField/copy")
     @PostMapping("copy")
     @Operation(summary = "将自定义字段复制到一个专题库中")
     public String copyProjectField(Integer id, String projectId) {

PAS/src/main/java/cn/cslg/pas/controller/ProjectFieldOptionController.java

@@ -4,6 +4,7 @@ import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.model.vo.ProjectFieldOptionVO;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.ProjectFieldOption;
 import cn.cslg.pas.domain.ProjectFieldTree;
 import cn.cslg.pas.service.ProjectFieldOptionService;
@@ -35,6 +36,7 @@ public class ProjectFieldOptionController {
     private final ProjectFieldOptionService projectFieldOptionService;
     private final ProjectFieldTextService projectFieldTextService;
 
+
     @GetMapping("list")
     @Operation(summary = "选项列表")
     public String getList(ProjectFieldOptionVO params) {
@@ -77,7 +79,7 @@ public class ProjectFieldOptionController {
         return Response.success(true);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/common/customField/managementOptions")
     @PostMapping("update")
     @Operation(summary = "更新选项")
     public String update(@RequestBody ProjectFieldOption projectFieldOption) {

PAS/src/main/java/cn/cslg/pas/controller/ProjectFileController.java

@@ -38,21 +38,21 @@ public class ProjectFileController {
         return Response.success(projectFileService.getPageList(params));
     }
 
-    @checkAuth(FunId = "/project/file/add")
+    @checkAuth(FunId = "/workspace/project/report_manage/add")
     @PostMapping("add")
     @Operation(summary = "新增附件")
     public String add(ProjectFile projectFile, MultipartFile file) {
         return projectFileService.add(projectFile, file);
     }
 
-    @checkAuth(FunId = "/project/file/edit")
+    @checkAuth(FunId = "/workspace/project/report_manage/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑附件")
     public String edit(ProjectFile projectFile, MultipartFile file) {
         return projectFileService.edit(projectFile, file);
     }
 
-    @checkAuth(FunId = "/project/file/delete")
+    @checkAuth(FunId = "/workspace/project/report_manage/delete")
     @PostMapping("delete")
     @Operation(summary = "删除附件")
     public String delete(Integer id) {

PAS/src/main/java/cn/cslg/pas/controller/ProjectFolderController.java

@@ -4,6 +4,7 @@ import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.StringUtils;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.ProjectFolder;
 import cn.cslg.pas.common.model.vo.ProjectFolderPatentVO;
 import cn.cslg.pas.common.model.vo.ProjectFolderVO;
@@ -70,7 +71,7 @@ public class ProjectFolderController {
         return Response.success(true);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/batchOperation/copy")
     @PostMapping("patent")
     @Operation(summary = "文件夹批量移动、复制专利")
     public String updateProjectFolderPatent(@RequestBody ProjectFolderPatentVO params) {

PAS/src/main/java/cn/cslg/pas/controller/ProjectImportController.java

@@ -80,7 +80,7 @@ public class ProjectImportController {
         return Response.success(projectImportStatusService.getProjectImportByImportId(importId));
     }
 
-    @checkAuth(FunId = "/project/import")
+    @checkAuth(FunId = "/workspace/project/patent_import")
     @PostMapping
     @Operation(summary = "数据导入")
     public String importData(String url, ProjectImportVO params) {
@@ -95,7 +95,6 @@ public class ProjectImportController {
         return Response.success(importId);
     }
 
-    @checkAuth(FunId = "/project/import/ongoing")
     @GetMapping("ongoing")
     @Operation(summary = "获取用户是否存在导入中的任务")
     public String getProjectImportOngoing() {

PAS/src/main/java/cn/cslg/pas/controller/ProjectUserController.java

@@ -35,21 +35,21 @@ public class ProjectUserController {
         return Response.success(projectUserService.getPageList(params));
     }
 
-    @checkAuth(FunId = "/project/user/add")
+    @checkAuth(FunId = "/workspace/project/assign_participants/add")
     @PostMapping("add")
     @Operation(summary = "新增成员")
     public String add(@RequestBody ProjectUser projectUser) {
         return projectUserService.add(projectUser);
     }
 
-    @checkAuth(FunId = "/project/user/edit")
+    @checkAuth(FunId = "/workspace/project/assign_participants/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑成员")
     public String edit(@RequestBody ProjectUser projectUser) {
         return projectUserService.edit(projectUser);
     }
 
-    @checkAuth(FunId = "/project/user/delete")
+    @checkAuth(FunId = "/workspace/project/assign_participants/remove")
     @PostMapping("delete")
     @Operation(summary = "删除成员")
     public String delete(Integer id) {

PAS/src/main/java/cn/cslg/pas/controller/ReportController.java

@@ -7,6 +7,7 @@ import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.ResponseEnum;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.Report;
 import cn.cslg.pas.common.model.vo.ReportVO;
 import cn.cslg.pas.service.ReportService;
@@ -42,7 +43,7 @@ public class ReportController {
         return Response.success(reportService.getReportById(id));
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/analyticSystem/generateReport")
     @PostMapping("add")
     @Operation(summary = "创建报告")
     public String add(@RequestBody Report report) {

PAS/src/main/java/cn/cslg/pas/controller/ReportTemplateController.java

@@ -4,6 +4,7 @@ package cn.cslg.pas.controller;
 import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.ReportTemplate;
 import cn.cslg.pas.common.model.vo.TemplateConditionVO;
 import cn.cslg.pas.service.ReportTemplateService;
@@ -30,7 +31,7 @@ import org.springframework.web.multipart.MultipartFile;
 public class ReportTemplateController {
 
     private final ReportTemplateService reportTemplateService;
-
+    @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManager/check")
     @GetMapping("list")
     @Operation(summary = "模板列表")
     public String getList(TemplateConditionVO params) {
@@ -43,21 +44,21 @@ public class ReportTemplateController {
         return Response.success(reportTemplateService.getTemplateById(id));
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManager/add")
     @PostMapping("add")
     @Operation(summary = "选择模板")
     public String add(MultipartFile file, ReportTemplate reportTemplate) {
         return reportTemplateService.add(file, reportTemplate);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManager/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑模板")
     public String edit(MultipartFile file, ReportTemplate reportTemplate) {
         return reportTemplateService.edit(file, reportTemplate);
     }
 
-    @Permission(roles = {1, 2})
+    @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManag")
     @PostMapping("delete")
     @Operation(summary = "删除模板")
     public String delete(Integer id) {