From 832e40a8249ae15a5b2a7f01c78da4edc06cd55e Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 13 十月 2025 15:54:57 +0800
Subject: [PATCH] 定时自动叫号 与 WMS获取车辆是否在园接口开发
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java | 67 ++++++++++++++++++++++++++++-----
1 files changed, 56 insertions(+), 11 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
index 688be9f..f4128ad 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java
@@ -1,27 +1,23 @@
package com.doumee.cloud.web;
-import cn.hutool.http.useragent.Platform;
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
-import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-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.LoginUserInfo;
+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.core.utils.DateUtil;
import com.doumee.dao.business.model.*;
+import com.doumee.dao.business.vo.LargeScreenDataVO;
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.MemberVO;
-import com.doumee.dao.web.response.VisitRecordVO;
import com.doumee.service.business.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -41,7 +37,7 @@
@RestController
@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/driverPlatform")
@Slf4j
-@LoginNoRequired
+//@LoginNoRequired
public class DriverPlatformController extends BaseController {
@Autowired
@@ -55,6 +51,9 @@
@Autowired
private PlatformReasonService platformReasonService;
+
+ @Autowired
+ private PlatformWmsJobService platformWmsJobService;
@@ -87,12 +86,22 @@
return ApiResponse.success(platformBooksService.apply(platformBooksApplyDTO));
}
+
+ @ApiOperation("鐗╂祦杞﹂绾︿慨鏀�")
+ @PostMapping("/applyEdit")
+ public ApiResponse<Integer> applyEdit (@RequestBody PlatformBooksApplyDTO platformBooksApplyDTO , @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo loginUserInfo = getLoginUser(token);
+ platformBooksApplyDTO.setUserId(loginUserInfo.getMemberId());
+ platformBooksApplyDTO.setDriverId(loginUserInfo.getMemberId());
+ return ApiResponse.success(platformBooksService.edit(platformBooksApplyDTO));
+ }
+
@ApiOperation("鐗╂祦杞﹂绾﹁褰�")
@PostMapping("/page")
public ApiResponse<PageData<PlatformBooks>> findPage (@RequestBody PageWrap<PlatformBooks> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
LoginUserInfo loginUserInfo = this.getLoginUser(token);
pageWrap.getModel().setQueryDate(DateUtil.getBeforDay(new Date(),30));
- pageWrap.getModel().setDriverPhone(loginUserInfo.getMobile());
+ pageWrap.getModel().setDriverId(loginUserInfo.getMemberId());
return ApiResponse.success(platformBooksService.findPage(pageWrap));
}
@@ -111,6 +120,13 @@
}
/******************************************************鍙告満浠诲姟鎺ュ彛************************************************************************/
+ @ApiOperation("浠诲姟纭")
+ @PostMapping("/confirmTask")
+ public ApiResponse confirmTask (@RequestBody ConfirmTaskDTO confirmTaskDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ confirmTaskDTO.setLoginUserInfo(getLoginUser(token));
+ platformJobService.confirmTask(confirmTaskDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
@ApiOperation("浠诲姟绛惧埌")
@PostMapping("/signIn")
@@ -132,4 +148,33 @@
return ApiResponse.success(platformJobService.lineUpDetail(lineUpDetailDTO));
}
+
+ @ApiOperation("WMS杩愯緭鍗曡鎯�")
+ @GetMapping("/wmsJobDetail")
+ public ApiResponse<PlatformWmsJob> wmsJobDetail(@RequestParam Integer id) {
+ return ApiResponse.success(platformWmsJobService.findByDetailId(id));
+ }
+
+
+ @LoginNoRequired
+ @ApiOperation("绛惧埌澶у睆鏁版嵁")
+ @GetMapping("/getLargeScreenData")
+ public ApiResponse<LargeScreenDataVO> getLargeScreenData() {
+ return ApiResponse.success(platformJobService.getLargeScreenData());
+ }
+
+ @LoginNoRequired
+ @ApiOperation("鏈堝彴浠诲姟娴嬭瘯瀹氭椂鏂规硶")
+ @GetMapping("/testTimer")
+ public ApiResponse testTimer(Integer type) {
+ if(Constants.equalsInteger(type ,1)){
+ platformJobService.timeOutWork();
+ }else if(Constants.equalsInteger(type ,2)){
+ platformJobService.timeOutCallIn();
+ }else if(Constants.equalsInteger(type ,3)){
+ platformJobService.timeOutReport();
+ }
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3