2/14 lrj

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

@@ -41,7 +41,7 @@ public class CustomAnalysisItemController {
     }
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/moreMenu/saveAs")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "新增分析项")
     public String add(@RequestBody CustomAnalysisItem customAnalysisItem) {
@@ -55,7 +55,7 @@ public class CustomAnalysisItemController {
     }
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/moreMenu/save")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("edit")
     @Operation(summary = "编辑分析项")
     public String edit(@RequestBody CustomAnalysisItem customAnalysisItem) {
@@ -63,7 +63,7 @@ public class CustomAnalysisItemController {
     }
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/chartAnalysis/groupModify")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("/delete/{id}")
     @Operation(summary = "删除分析项")
     public String delete(@PathVariable Integer id) {

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

@@ -31,7 +31,7 @@ public class PatentAnnotationController {
     private final PatentAnnotationService patentAnnotationService;
 
     @checkAuth(FunId = "/workspace/details/notes/list")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @GetMapping("list")
     @Operation(summary = "注释列表")
     public String getPageList(PatentAnnotationVO params) {
@@ -39,7 +39,7 @@ public class PatentAnnotationController {
     }
 
     @checkAuth(FunId = "/workspace/details/notes/add")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "选择注释")
     public String add(@RequestBody PatentAnnotation patentAnnotation) {
@@ -47,7 +47,7 @@ public class PatentAnnotationController {
     }
 
     @checkAuth(FunId = "/workspace/details/notes/modify")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("edit")
     @Operation(summary = "编辑注释")
     public String edit(@RequestBody PatentAnnotation patentAnnotation) {
@@ -55,7 +55,7 @@ public class PatentAnnotationController {
     }
 
     @checkAuth(FunId = "/workspace/details/notes/delete")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("delete")
     @Operation(summary = "删除注释")
     public String delete(Integer id) {

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

@@ -48,7 +48,7 @@ public class PatentApplicantController {
     }
 
     @checkAuth(FunId = "/workspace/folder/merge/applicationMerge/add")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "选择申请人")
     public String add(@RequestBody PatentApplicant patentApplicant) {

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

@@ -60,7 +60,7 @@ public class PatentController {
     }
 
     @checkAuth(FunId = "/workspace/folder/isRead")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("/read/update")
     @Operation(summary = "修改专利阅读状态")
     public String updatePatentReadStatus(@RequestBody PatentReadVO params) {
@@ -140,7 +140,7 @@ public class PatentController {
     }
 
     @checkAuth(FunId = "/workspace/folder/batchOperation/batchIndexing")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("/batch/index")
     @Operation(summary = "批量批量专利标引")
     public String patentBatchIndex(@RequestBody PatentBatchIndexVO params) {
@@ -161,7 +161,7 @@ public class PatentController {
     }
 
     @checkAuth(FunId = "/workspace/details/indexing")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("/index/setting")
     @Operation(summary = "修改专利标引")
     public String updatePatentIndexSetting(@RequestBody PatentIndexSettingVO params) {

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

@@ -45,7 +45,7 @@ public class PatentInventorController {
     }
 
     @checkAuth(FunId = "/workspace/folder/merge/inventorMerge/add")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "新增发明人")
     public String add(@RequestBody PatentInventor patentInventor) {

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

@@ -34,7 +34,7 @@ public class PatentLabelController {
     private final PatentLabelService patentLabelService;
 
     @checkAuth(FunId = "/workspace/details/addLabel")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping
     @Operation(summary = "更新标签")
     public String update(@RequestBody PatentCustomFieldSettingVO params) {

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

@@ -38,7 +38,7 @@ public class ProjectFieldController {
     private final ProjectFieldService projectFieldService;
     private final CacheUtils cacheUtils;
     private final LoginUtils loginUtils;
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/customField/check")
     @GetMapping("list")
     @Operation(summary = "自定义字段列表")
@@ -46,7 +46,7 @@ public class ProjectFieldController {
         return Response.success(projectFieldService.getPageList(params));
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/customField/add")
     @PostMapping("add")
     @Operation(summary = "新增自定义字段")
@@ -54,7 +54,7 @@ public class ProjectFieldController {
         return projectFieldService.add(projectField);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/customField/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑自定义字段")
@@ -62,7 +62,7 @@ public class ProjectFieldController {
         return projectFieldService.edit(projectField);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/customField/delete")
     @PostMapping("delete")
     @Operation(summary = "删除自定义字段")
@@ -96,7 +96,7 @@ public class ProjectFieldController {
         return Response.success(true);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/customField/copy")
     @PostMapping("copy")
     @Operation(summary = "将自定义字段复制到一个专题库中")

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

@@ -38,7 +38,7 @@ public class ProjectFileController {
         return Response.success(projectFileService.getPageList(params));
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/project/report_manage/add")
     @PostMapping("add")
     @Operation(summary = "新增附件")
@@ -46,7 +46,7 @@ public class ProjectFileController {
         return projectFileService.add(projectFile, file);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/project/report_manage/modify")
     @PostMapping("edit")
     @Operation(summary = "编辑附件")
@@ -54,7 +54,7 @@ public class ProjectFileController {
         return projectFileService.edit(projectFile, file);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/project/report_manage/delete")
     @PostMapping("delete")
     @Operation(summary = "删除附件")

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

@@ -41,7 +41,7 @@ public class ProjectFolderController {
         return Response.success(projectFolderService.getList(params));
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/folder_manage/add")
     @PostMapping("add")
     @Operation(summary = "新增文件夹")
@@ -49,14 +49,14 @@ public class ProjectFolderController {
         return projectFolderService.add(projectFolder);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("edit")
     @Operation(summary = "编辑文件夹")
     public String edit(@RequestBody List<ProjectFolder> folderList, String projectId) {
         return projectFolderService.edit(folderList, Integer.parseInt(projectId));
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/common/folder_manage/delete")
     @PostMapping("delete")
     @Operation(summary = "删除文件夹")
@@ -73,7 +73,7 @@ public class ProjectFolderController {
         return Response.success(true);
     }
 
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @checkAuth(FunId = "/workspace/folder/batchOperation/copy")
     @PostMapping("patent")
     @Operation(summary = "文件夹批量移动、复制专利")

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

@@ -53,7 +53,7 @@ public class ReportController {
 
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/generateReport")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "创建报告")
     public String add(@RequestBody Report report) {

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

@@ -31,7 +31,7 @@ public class ReportTemplateController {
     private final ReportTemplateService reportTemplateService;
     
 //    @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManager/check")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @GetMapping("list")
     @Operation(summary = "模板列表")
     public String getList(TemplateConditionVO params) {
@@ -45,7 +45,7 @@ public class ReportTemplateController {
     }
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManager/add")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @PostMapping("add")
     @Operation(summary = "选择模板")
     public String add(MultipartFile file, ReportTemplate reportTemplate) {
@@ -54,7 +54,7 @@ public class ReportTemplateController {
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManager/modify")
     @PostMapping("edit")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @Operation(summary = "编辑模板")
     public String edit(MultipartFile file, ReportTemplate reportTemplate) {
         return reportTemplateService.edit(file, reportTemplate);
@@ -62,7 +62,7 @@ public class ReportTemplateController {
 
     @checkAuth(FunId = "/workspace/folder/analyticSystem/templateManager/delete")
     @PostMapping("delete")
-    @Permission(roles = {1})
+    @Permission(roles = {2})
     @Operation(summary = "删除模板")
     public String delete(Integer id) {
         return reportTemplateService.delete(id);

PAS/src/main/resources/application-prod2.yml

@@ -23,4 +23,4 @@ spring:
         login-password: 123456
       web-stat-filter:
         exclusions: "*.js,*.gif,*.jpg,*.png,*.css,*.ico,/druid/*"
-PCS: http://139.224.24.90:83/
+authorUrl: http://localhost:8871

PAS/src/main/resources/application.yml

@@ -2,7 +2,7 @@ server:
   servlet:
     context-path: /
   port: 8877
-#sa-token:
+#  sa-token:
 #  activity-timeout: 18000
 #  token-name: token
 #  token-style: tik
@@ -44,7 +44,4 @@ mybatis-plus:
     map-underscore-to-camel-case: true
     cache-enabled: false
   mapper-locations: classpath:mapper/*.xml
-authorUrl: http://localhost:8871
-
-