From 7a62afb5cec9a5c7caf6babc1c63706d8fe516dc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 30 九月 2024 10:33:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
index 150a642..8cc607e 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java
@@ -128,18 +128,21 @@
@ApiOperation("鑾峰彇鏈堝彴缁勪俊鎭�")
@PostMapping("/getPlatformGroupList")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<List<PlatformGroup>> getPlatformGroupList (@RequestBody PlatformDataDTO platformDataDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(platformGroupService.getAllPlatformGroup(platformDataDTO,getLoginUser(token)));
}
@ApiOperation("鑾峰彇鏈堝彴浠诲姟淇℃伅")
@GetMapping("/getPlatformWorkData")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PlatformWorkVO> getPlatformWorkData (@RequestParam Integer platformId, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(platformJobService.getPlatformWorkVOById(platformId));
}
@ApiOperation("鏇存柊鏈堝彴閰嶇疆淇℃伅")
@GetMapping("/updUserPlatformConfig")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse updUserPlatformConfig (@RequestParam List<Integer> ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
platformShowParamService.updUserConfig(ids,getLoginUser(token));
return ApiResponse.success("鎿嶄綔鎴愬姛");
@@ -148,6 +151,7 @@
@ApiOperation("杞﹁締鎺掗槦鎯呭喌")
@PostMapping("/platformLineUpPage")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PageData<PlatformJob>> platformLineUpPage (@RequestBody PageWrap<PlatformJob> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(platformJobService.platformCallList(pageWrap));
}
@@ -155,6 +159,7 @@
@ApiOperation("鍙彿鍒楄〃")
@PostMapping("/platformCallList")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PageData<PlatformJob>> platformCallList (@RequestBody PageWrap<PlatformJob> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(platformJobService.platformCallList(pageWrap));
}
@@ -162,6 +167,7 @@
@ApiOperation("鍙彿鍏ュ洯")
@PostMapping("/platformInPark")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformInPark (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.platformInPark(jobOperateDTO);
@@ -171,6 +177,7 @@
@ApiOperation("鏈堝彴鍙彿")
@PostMapping("/platformCallNumber")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformCallNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob oldPlatformJob = platformJobService.findById(jobOperateDTO.getJobId());
@@ -184,6 +191,7 @@
@ApiOperation("杞Щ鏈堝彴")
@PostMapping("/platformMove")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformMove (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
platformJobService.platformMove(jobOperateDTO);
@@ -192,6 +200,7 @@
@ApiOperation("鏈堝彴杩囧彿")
@PostMapping("/platformOverNumber")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformOverNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
platformJobService.platformOverNumber(jobOperateDTO);
@@ -200,6 +209,7 @@
@ApiOperation("寮傚父鎸傝捣")
@PostMapping("/platformErr")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse platformErr (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
platformJobService.platformErr(jobOperateDTO);
@@ -208,6 +218,7 @@
@ApiOperation("鎵嬪姩寮�濮嬩綔涓�")
@PostMapping("/beginWork")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse beginWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.beginWork(jobOperateDTO);
@@ -218,6 +229,7 @@
@ApiOperation("瀹屾垚浣滀笟")
@PostMapping("/finishWork")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse finishWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.finishWork(jobOperateDTO);
@@ -228,14 +240,18 @@
@ApiOperation("鎺堟潈绂诲満")
@PostMapping("/powerLevel")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse powerLevel (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
- platformJobService.powerLevel(jobOperateDTO);
+ PlatformJob platformJob = platformJobService.powerLevel(jobOperateDTO);
+ //涓嬪彂绂诲洯鏉冮檺
+ platformJobService.sendInPark(platformJob);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@ApiOperation("鑾峰彇鏈堝彴缁� 绛夊緟涓庡紓甯告寕璧锋暟鎹�")
@GetMapping("/getPlatformGroupWork")
+ @CloudRequiredPermission("business:platform:query")
public ApiResponse<PlatformGroupWorkVO> getPlatformGroupWork (@RequestParam Integer platformGroupId, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(platformGroupService.getPlatformGroupWork(platformGroupId));
}
--
Gitblit v1.9.3