diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollTaskController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollTaskController.java
index 3c61ebd..b1d9200 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollTaskController.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/PollTaskController.java
@@ -42,7 +42,7 @@ public class PollTaskController {
* 查询任务列表
*/
@GetMapping("/list")
-// @RequiresPermissions("store:task:list")
+ @RequiresPermissions("store:task:list")
public AjaxResult findList(TaskQuery taskQuery) {
return AjaxResult.success(pollingTaskService.findList(taskQuery));
}
@@ -51,7 +51,6 @@ public class PollTaskController {
* 查询顶级任务列表
*/
@GetMapping("/list/top")
-// @RequiresPermissions("store:task:top")
public AjaxResult findTopList(){
return AjaxResult.success(pollingTaskService.findTopList(CommonParam.buildPageRequest()));
}
@@ -60,7 +59,6 @@ public class PollTaskController {
* 查询顶级任务配置
*/
@GetMapping("/config/{taskId}")
-// @RequiresPermissions("store:task:config")
public AjaxResult findTaskConfig(@PathVariable Long taskId) {
return AjaxResult.success(pollingTaskService.findTaskConfig(taskId));
}
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java
index ff2b3c9..ada9c50 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/TemplateController.java
@@ -50,7 +50,7 @@ public class TemplateController {
* 模板列表页面
*/
@GetMapping(value = "/page")
-// @RequiresPermissions(value = "ins:template:page")
+ @RequiresPermissions(value = "ins:template:page")
public AjaxResult pageList(Template template){
return AjaxResult.success(tbTemplateService.pageList(template));
}
@@ -59,7 +59,7 @@ public class TemplateController {
*/
@SysLog(value = "模板", businessType = BusinessType.INSERT)
@PostMapping(value = "/save")
-// @RequiresPermissions(value = "ins:template:save")
+ @RequiresPermissions(value = "ins:template:save")
public AjaxResult save(@RequestBody@Validated(Create.class) Template template){
return AjaxResult.success(tbTemplateService.saveTemplate(template));
}
@@ -68,7 +68,7 @@ public class TemplateController {
*/
@SysLog(value = "模板", businessType = BusinessType.UPDATE)
@PostMapping(value = "/update")
-// @RequiresPermissions(value = "ins:template:update")
+ @RequiresPermissions(value = "ins:template:update")
public AjaxResult update(@RequestBody@Validated(Create.class) Template template){
return AjaxResult.success(tbTemplateService.updateTemplate(template));
}
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java
index 658fed4..4f95db6 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/project/controller/WrkProjectController.java
@@ -74,7 +74,7 @@ public class WrkProjectController {
* 修改 项目
*/
@PostMapping(value = "/update")
- @RequiresPermissions("inspection:project:save")
+ @RequiresPermissions("inspection:project:update")
@SysLog(value = "项目",businessType = BusinessType.UPDATE)
public AjaxResult update(@RequestBody @Validated(Update.class) ProjectDTO project){
Long projectId = project.getProjectId();
@@ -148,7 +148,7 @@ public class WrkProjectController {
* 根据 项目Id 获取
*/
@GetMapping(value = "/payMentData")
- @RequiresPermissions("inspection:contract:list")
+ @RequiresPermissions("inspection:caiwu:data")
public AjaxResult payMentData(WrkProjectPayment query)
{
CommonParam commonParam = CommonParam.buildPageRequest();
@@ -195,7 +195,7 @@ public class WrkProjectController {
* 人工数据
*/
@GetMapping(value = "/emp/data")
-// @RequiresPermissions("inspection:project:info")
+ @RequiresPermissions("inspection:emp:data")
public AjaxResult empData(ProjectQuery projectQuery)
{
return AjaxResult.success(projectService.empData(projectQuery));
@@ -217,7 +217,7 @@ public class WrkProjectController {
*/
@SysLog(value = "项目数据", businessType = BusinessType.EXPORT)
@GetMapping(value = "/emp/data/export")
-// @RequiresPermissions("inspection:project:export")
+ @RequiresPermissions("inspection:emp:export")
public AjaxResult empDataExport(ProjectQuery projectQuery)
{
return AjaxResult.success("人员数据导出成功, 请在后台任务中查看, 任务id: ["+ projectService.projectDataExport(projectQuery) +"]");
@@ -229,7 +229,7 @@ public class WrkProjectController {
*/
@SysLog(value = "财务数据", businessType = BusinessType.EXPORT)
@GetMapping(value = "/payMentData/data/export")
-// @RequiresPermissions("inspection:project:export")
+ @RequiresPermissions("inspection:caiwu:export")
public AjaxResult payMentDataExport(ProjectQuery projectQuery)
{
return AjaxResult.success("财务数据导出成功, 请在后台任务中查看, 任务id: ["+ projectService.projectDataExport(projectQuery) +"]");
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java
index d205eed..f9c6542 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoController.java
@@ -229,7 +229,7 @@ public class WrkInfoController {
* 撤回
*/
@PostMapping("/withdraw")
- @RequiresPermissions("wrk:withdraw")
+ @RequiresPermissions("wrk:info:withdraw")
@SysLog(value = "工单撤回", businessType = BusinessType.DELETE)
public AjaxResult withdraw(@RequestBody @Validated Delete delete) throws Exception{
wrkInfoService.withdraw(delete.getIds());
@@ -240,7 +240,7 @@ public class WrkInfoController {
* 工单数据
*/
@GetMapping(value = "/data")
-// @RequiresPermissions("wrk:info:data")
+ @RequiresPermissions("wrk:info:data")
public AjaxResult wrkData(WrkDataQuery wrkDataQuery)
{
return AjaxResult.success(wrkInfoService.wrkData(wrkDataQuery));
@@ -251,7 +251,7 @@ public class WrkInfoController {
* @param wrkDataQuery 查询条件
*/
@GetMapping(value = "/data/export")
-// @RequiresPermissions("wrk:data:export")
+ @RequiresPermissions("wrk:data:export")
public AjaxResult wrkDataExport(WrkDataQuery wrkDataQuery)
{
return AjaxResult.success("工单数据导出成功, 请在后台任务中查看, 任务id: ["+ wrkInfoService.wrkDataExport(wrkDataQuery) +"]");
diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoTerminalRecordController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoTerminalRecordController.java
index 6b5fcff..44cb2af 100644
--- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoTerminalRecordController.java
+++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkInfoTerminalRecordController.java
@@ -32,7 +32,7 @@ public class WrkInfoTerminalRecordController {
*/
@SysLog(value = "我的终端池", businessType = BusinessType.QUERY)
@GetMapping("/mine/page")
-// @RequiresPermissions("ins:terminal:mine")
+ @RequiresPermissions("ins:terminal:mine")
public AjaxResult minePageList(@Validated TerminalQuery query) {
// 获取当前用户的
query.setUserId(SecurityUtils.getUserId());
diff --git a/pom.xml b/pom.xml
index a8bd9d7..f6d23fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
cloud
cloud
- 192.168.1.168:16000,192.168.1.169:16000,192.168.1.98:16000
+ 119.97.184.163:16000,119.97.184.169:16000
11c67dc3-423c-4195-b945-ace6cb2323a1
DEFAULT_GROUP
nacos