From 39fc2d6754953e41a7334a2166347baacfcfb40a Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 11 十月 2025 18:21:18 +0800
Subject: [PATCH] 对接口
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java | 31 +++++++++++++++++++------------
1 files changed, 19 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 649ab9c..520f2b3 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
@@ -2,12 +2,14 @@
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.constants.ResponseStatus;
+import com.doumee.core.exception.BusinessException;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.core.utils.Constants;
import com.doumee.service.business.third.TmsService;
+import com.doumee.service.business.third.model.request.*;
+import com.doumee.service.business.third.model.response.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -33,13 +35,14 @@
@ApiOperation("銆怲MS銆戠數瀛愰攣涓婇攣鏃堕棿鎺ュ彛")
@LoginNoRequired
@PostMapping("/lockStatusQuery")
- public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(@RequestBody TmsLockStatusQueryRequest request ) {
+ public TmsBaseResponse<List<TmsLockStatusQueryResponse>> lockStatusQuery(@RequestBody TmsLockStatusQueryRequest request, @RequestHeader(Constants.HEADER_USER_TOKEN) String token ) {
return tmsService.lockStatusQuery(request);
}
@ApiOperation("銆怲MS銆戝悎鍚屽垪琛ㄦ帴鍙�")
- @LoginNoRequired
+// @LoginNoRequired
@PostMapping("/orderList")
- public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest param ) {
+ public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest param , @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = this.getLoginUser(token);
if(param == null){
param = new TmsOrderListRequest();
}
@@ -55,23 +58,24 @@
if(param.getPager().getRows() == null){
param.getPager().setRows(10);
}
- if(StringUtils.isBlank(param.getParameters().getPhoneNumber())){
+ param.getParameters().setPhoneNumber(user.getMobile());
+ /* if(StringUtils.isBlank(param.getParameters().getPhoneNumber())){
param.getParameters().setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
- }
+ }*/
if(param.getParameters().getContractNumbers()==null || param.getParameters().getContractNumbers().size()==0){
param.getParameters().setContractNumbers(null);
}
return ApiResponse.success(tmsService.orderList(param));
}
@ApiOperation("銆怲MS銆戝悎鍚岃鎯呮帴鍙�")
- @LoginNoRequired
+// @LoginNoRequired
@PostMapping("/orderInfo")
- public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request ) {
+ public ApiResponse<TmsOrderInfoResponse> ordreInfo(@RequestBody TmsOrderInfoRequest request , @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
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) {
+ public ApiResponse<TmsBasePageResponse<TmsDriveTaskListResponse>> taskList(@RequestBody TmsDriverTaskListRequest param , @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
if(param == null){
param = new TmsDriverTaskListRequest();
}
@@ -91,6 +95,9 @@
param.getParameters().setDriverTel("00000000000");//鎵嬫満鍙峰繀濉�
}*/
LoginUserInfo user = this.getLoginUser(token);
+ if(user ==null){
+ throw new BusinessException(ResponseStatus.NO_LOGIN);
+ }
param.getParameters().setDriverTel(user.getUsername());
return ApiResponse.success(tmsService.getDriverTaskList(param));
}
--
Gitblit v1.9.3