From b82a5aa7d6167748cce7e94f53b6a3b1fbc201b3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期四, 26 九月 2024 17:13:52 +0800
Subject: [PATCH] 代码初始化
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 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 5acfa7d..0baf391 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
@@ -13,6 +13,7 @@
import com.doumee.dao.business.model.PlatformJob;
import com.doumee.dao.web.reqeust.JobOperateDTO;
import com.doumee.dao.web.reqeust.PlatformDataDTO;
+import com.doumee.dao.web.response.PlatformGroupWorkVO;
import com.doumee.dao.web.response.PlatformWorkVO;
import com.doumee.service.business.PlatformGroupService;
import com.doumee.service.business.PlatformJobService;
@@ -95,6 +96,13 @@
return ApiResponse.success(platformService.findPage(pageWrap));
}
+ @ApiOperation("鏈堝彴浣滀笟缁熻")
+ @PostMapping("/platformWorkReportPage")
+ @CloudRequiredPermission("business:platform:query")
+ public ApiResponse<List<Platform>> platformWorkReportPage (@RequestBody Platform platform,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(platformService.platformWorkReportList(platform));
+ }
+
@ApiOperation("鏍规嵁鏈堝彴缁勮幏鍙栨湀鍙板垪琛ㄤ俊鎭�")
@GetMapping("/listByGroupId")
@@ -116,8 +124,6 @@
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(platformService.findById(id));
}
-
-
@ApiOperation("鑾峰彇鏈堝彴缁勪俊鎭�")
@@ -158,7 +164,8 @@
@PostMapping("/platformInPark")
public ApiResponse platformInPark (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
- platformJobService.platformInPark(jobOperateDTO);
+ PlatformJob platformJob = platformJobService.platformInPark(jobOperateDTO);
+ platformJobService.sendInPark(platformJob);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -166,7 +173,11 @@
@PostMapping("/platformCallNumber")
public ApiResponse platformCallNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
- platformJobService.platformCallNumber(jobOperateDTO);
+ PlatformJob oldPlatformJob = platformJobService.findById(jobOperateDTO.getJobId());
+ PlatformJob platformJob = platformJobService.platformCallNumber(jobOperateDTO);
+ if(Constants.equalsInteger(oldPlatformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
+ platformJobService.sendInPark(platformJob);
+ }
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -199,7 +210,8 @@
@PostMapping("/beginWork")
public ApiResponse beginWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
- platformJobService.beginWork(jobOperateDTO);
+ PlatformJob platformJob = platformJobService.beginWork(jobOperateDTO);
+ platformJobService.cancelInPark(platformJob);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@@ -208,10 +220,27 @@
@PostMapping("/finishWork")
public ApiResponse finishWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
- platformJobService.finishWork(jobOperateDTO);
+ PlatformJob platformJob = platformJobService.finishWork(jobOperateDTO);
+ //涓嬪彂绂诲洯鏉冮檺
+ platformJobService.sendInPark(platformJob);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @ApiOperation("鎺堟潈绂诲満")
+ @PostMapping("/powerLevel")
+ public ApiResponse powerLevel (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jobOperateDTO.setLoginUserInfo(getLoginUser(token));
+ PlatformJob platformJob = platformJobService.powerLevel(jobOperateDTO);
+ //涓嬪彂绂诲洯鏉冮檺
+ platformJobService.sendInPark(platformJob);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("鑾峰彇鏈堝彴缁� 绛夊緟涓庡紓甯告寕璧锋暟鎹�")
+ @GetMapping("/getPlatformGroupWork")
+ public ApiResponse<PlatformGroupWorkVO> getPlatformGroupWork (@RequestParam Integer platformGroupId, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(platformGroupService.getPlatformGroupWork(platformGroupId));
+ }
}
--
Gitblit v1.9.3