From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformCloudController.java | 189 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 185 insertions(+), 4 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 3ac0fde..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,15 +4,25 @@
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;
+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;
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.*;
@@ -23,7 +33,7 @@
* @author 姹熻箘韫�
* @since 2024/04/28 16:06
*/
-@Api(tags = "鏈堝彴淇℃伅琛�")
+@Api(tags = "銆愬悗绔�戞湀鍙颁俊鎭〃")
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/business/platform")
public class PlatformCloudController extends BaseController {
@@ -32,7 +42,17 @@
private PlatformService platformService;
@Autowired
+ private PlatformGroupService platformGroupService;
+
+ @Autowired
private PlatformJobService platformJobService;
+
+ @Autowired
+ private PlatformShowParamService platformShowParamService;
+
+ @Autowired
+ private WmsService wmsService;
+
@PreventRepeat
@ApiOperation("鏂板缓")
@@ -82,6 +102,12 @@
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")
@@ -103,4 +129,159 @@
public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(platformService.findById(id));
}
+
+
+ @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("鎿嶄綔鎴愬姛");
+ }
+
+
+ @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));
+ }
+
+
+ @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));
+ }
+
+
+ @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);
+ platformJobService.sendInPark(platformJob);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @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());
+ PlatformJob platformJob = platformJobService.platformCallNumber(jobOperateDTO);
+ 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);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("鏈堝彴杩囧彿")
+ @PostMapping("/platformOverNumber")
+ @CloudRequiredPermission("business:platform:update")
+ public ApiResponse platformOverNumber (@RequestBody JobOperateDTO jobOperateDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jobOperateDTO.setLoginUserInfo(getLoginUser(token));
+ 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);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @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);
+ platformJobService.cancelInPark(platformJob);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+ @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);
+ //涓嬪彂绂诲洯鏉冮檺
+ platformJobService.sendInPark(platformJob);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @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);
+ //涓嬪彂绂诲洯鏉冮檺
+ 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