From 5e5a317f936e4e333809298930fb771fc0bdc9ac Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 12 九月 2025 16:32:34 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 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 0baf391..667f14a 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
@@ -4,9 +4,9 @@
import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Platform;
import com.doumee.dao.business.model.PlatformGroup;
@@ -19,8 +19,10 @@
import com.doumee.service.business.PlatformJobService;
import com.doumee.service.business.PlatformService;
import com.doumee.service.business.PlatformShowParamService;
+import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -47,6 +49,10 @@
@Autowired
private PlatformShowParamService platformShowParamService;
+
+ @Autowired
+ private WmsService wmsService;
+
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -103,7 +109,6 @@
return ApiResponse.success(platformService.platformWorkReportList(platform));
}
-
@ApiOperation("鏍规嵁鏈堝彴缁勮幏鍙栨湀鍙板垪琛ㄤ俊鎭�")
@GetMapping("/listByGroupId")
@CloudRequiredPermission("business:platform:query")
@@ -128,18 +133,27 @@
@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("鑾峰彇鏈堝彴缁勪俊鎭�(骞冲彴绔級")
+ @PostMapping("/getPlatformGroupListNew")
+ @CloudRequiredPermission("business:platform:query")
+ public ApiResponse<List<PlatformGroup>> getPlatformGroupListNew (@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 +162,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 +170,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 +178,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 +188,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());
@@ -178,12 +196,18 @@
if(Constants.equalsInteger(oldPlatformJob.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
platformJobService.sendInPark(platformJob);
}
+ if(!Constants.equalsInteger(platformJob.getType(),Constants.FOUR)
+ && StringUtils.isNotBlank(platformJob.getBillCode())){
+ //閫氱煡WMS缁戝畾鏈堝彴淇℃伅
+ wmsService.orderPlatformBind(platformJob);
+ }
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@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,14 +216,17 @@
@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);
+ PlatformJob platformJob = platformJobService.platformOverNumber(jobOperateDTO);
+ platformJobService.cancelInPark(platformJob);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@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 +235,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);
@@ -216,8 +244,19 @@
}
+ @ApiOperation("鎭㈠浣滀笟")
+ @PostMapping("/restoreWork")
+ @CloudRequiredPermission("business:platform:update")
+ public ApiResponse restoreWork (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jobOperateDTO.setLoginUserInfo(getLoginUser(token));
+ PlatformJob platformJob = platformJobService.restoreWork(jobOperateDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
@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,6 +267,7 @@
@ApiOperation("鎺堟潈绂诲満")
@PostMapping("/powerLevel")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse powerLevel (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jobOperateDTO.setLoginUserInfo(getLoginUser(token));
PlatformJob platformJob = platformJobService.powerLevel(jobOperateDTO);
@@ -238,6 +278,7 @@
@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