From dca4aae965647cf8411931ed44d7cdfff92e386f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 26 九月 2024 17:59:41 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 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 0b34061..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
@@ -164,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("鎿嶄綔鎴愬姛");
}
@@ -172,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("鎿嶄綔鎴愬姛");
}
@@ -205,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("鎿嶄綔鎴愬姛");
}
@@ -214,7 +220,9 @@
@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("鎿嶄綔鎴愬姛");
}
@@ -222,7 +230,9 @@
@PostMapping("/powerLevel")
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("鎿嶄綔鎴愬姛");
}
--
Gitblit v1.9.3