From a6f9e7d4faf7c1c536111e0db7f3317cbda9ddb1 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 30 十二月 2024 18:24:05 +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/TmsCloudController.java | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
index 287af7d..9595f70 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
@@ -3,25 +3,18 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
-import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.third.TmsService;
-import com.doumee.service.business.third.WmsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedReader;
import java.util.List;
/**
@@ -54,7 +47,7 @@
param.setParameters( new TmsOrderListParamRequest());
}
if(param.getPager() == null){
- param.setPager( new TmsOrderListPagerRequest());
+ param.setPager( new TmsPagerRequest());
}
if(param.getPager().getPage() == null){
param.getPager().setPage(1);
@@ -74,9 +67,49 @@
@LoginNoRequired
@PostMapping("/orderInfo")
public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) {
-
return ApiResponse.success(tmsService.orderInfo(request));
}
-
+ @ApiOperation("銆怲MS銆戝徃鏈哄緟鍔炰换鍔″垪琛ㄦ帴鍙�")
+ @PostMapping("/taskList")
+ public ApiResponse<TmsBasePageResponse<TmsDriveTaskListResponse>> taskList(@RequestBody TmsDriverTaskListRequest param ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ if(param == null){
+ param = new TmsDriverTaskListRequest();
+ }
+ if(param.getParameters() == null){
+ param.setParameters( new TmsDriverTaskParameterRequest());
+ }
+ if(param.getPager() == null){
+ param.setPager( new TmsPagerRequest());
+ }
+ if(param.getPager().getPage() == null){
+ param.getPager().setPage(1);
+ }
+ if(param.getPager().getRows() == null){
+ param.getPager().setRows(10);
+ }
+ /* if(StringUtils.isBlank(param.getParameters().getDriverTel())){
+ param.getParameters().setDriverTel("00000000000");//鎵嬫満鍙峰繀濉�
+ }*/
+ LoginUserInfo user = this.getLoginUser(token);
+ param.getParameters().setDriverTel(user.getUsername());
+ return ApiResponse.success(tmsService.getDriverTaskList(param));
+ }
+ @ApiOperation("銆怲MS銆戝緟鍔炰换鍔¤鎯呮帴鍙�")
+ @PostMapping("/taskDetail")
+ public ApiResponse<TmsDriveTaskInfoResponse> getDriverTaskDetail(@RequestBody TmsDriverTaskInfoRequest request ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ return ApiResponse.success(tmsService.getDriverTaskDetail(request));
+ }
+ @ApiOperation("銆怲MS銆戝徃鏈轰换鍔″惎鍔�")
+ @PostMapping("/driverStart")
+ public ApiResponse driverStart(@RequestBody TmsDriverStartAndArrivalRequest request ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ tmsService.driverStart(request);
+ return ApiResponse.success(null);
+ }
+ @ApiOperation("銆怲MS銆戝徃鏈轰换鍔″埌璐ф彁浜�")
+ @PostMapping("/driverArrival")
+ public ApiResponse driverArrival(@RequestBody TmsDriverStartAndArrivalRequest request ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ tmsService.driverArrival(request);
+ return ApiResponse.success(null);
+ }
}
--
Gitblit v1.9.3