From c5cc7da07c7f202f336468c0cd0d2789b4775b03 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 09 十月 2024 11:31:15 +0800
Subject: [PATCH] 最新版本
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java | 86 +++++++++++++++++++++++++++++++++++--------
1 files changed, 70 insertions(+), 16 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
index bee4a37..5b7db0f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/PdaPlatformController.java
@@ -1,6 +1,7 @@
package com.doumee.cloud.web;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
@@ -12,6 +13,7 @@
import com.doumee.dao.web.reqeust.*;
import com.doumee.dao.web.response.DriverHomeVO;
import com.doumee.dao.web.response.LineUpVO;
+import com.doumee.dao.web.response.PlatformWorkVO;
import com.doumee.service.business.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -54,85 +56,137 @@
@Autowired
private PlatformService platformService;
+ @Autowired
+ private PlatformWmsJobService platformWmsJobService;
+
@ApiOperation("鑾峰彇鏈堝彴缁勪俊鎭�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "queryType", dataType = "Integer", value = "0=鍏ㄩ儴鏈堝彴锛�1=鍚敤鏈堝彴 2=閰嶇疆鏄剧ず鏈堝彴", required = false)
- })
- @GetMapping("/getPlatformGroupList")
- public ApiResponse<List<PlatformGroup>> getPlatformGroupList (@RequestParam Integer queryType, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- return ApiResponse.success(platformGroupService.getAllPlatformGroup(queryType,getLoginUser(token)));
+ @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("鏇存柊鏈堝彴閰嶇疆淇℃伅")
- @PostMapping("/updUserPlatformConfig")
- public ApiResponse updUserPlatformConfig (@RequestBody List<Integer> ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ @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("/updPlatformStatus")
+ @CloudRequiredPermission("business:platform:update")
public ApiResponse updPlatformStatus (@RequestBody Platform platform, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ platform.setLoginUserInfo(getLoginUser(token));
platformService.updateStatusById(platform);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
@ApiOperation("杞﹁締鎺掗槦鎯呭喌")
@PostMapping("/platformLineUpPage")
- public ApiResponse<PageData<PlatformJob>> platformLineUpPage (@RequestBody PageWrap<PlatformJob> pageWrap) {
- return ApiResponse.success(platformJobService.findPage(pageWrap));
+ @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));
- platformJobService.platformInPark(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("鎿嶄綔鎴愬姛");
}
@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.platformInPark(jobOperateDTO);
+ 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));
- platformJobService.platformInPark(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.platformInPark(jobOperateDTO);
+ 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));
- platformJobService.platformInPark(jobOperateDTO);
+ PlatformJob platformJob = platformJobService.beginWork(jobOperateDTO);
+ platformJobService.cancelInPark(platformJob);
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));
- platformJobService.platformInPark(jobOperateDTO);
+ PlatformJob platformJob = platformJobService.finishWork(jobOperateDTO);
+ //涓嬪彂绂诲洯鏉冮檺
+ platformJobService.sendInPark(platformJob);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+ @ApiOperation("WMS杩愯緭鍗曡鎯�")
+ @GetMapping("/wmsJobDetail")
+ @CloudRequiredPermission("business:platform:query")
+ public ApiResponse<PlatformWmsJob> wmsJobDetail(@RequestParam Integer id) {
+ return ApiResponse.success(platformWmsJobService.findByDetailId(id));
+ }
+
+
}
--
Gitblit v1.9.3