Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

3 天以前 48d06fac940e6f28d599eb7fbf05c2cce41ecb30

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java

@@ -2,6 +2,8 @@

import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
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;
@@ -33,13 +35,14 @@
    @ApiOperation("【TMS】电子锁上锁时间接口")
    @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("【TMS】合同列表接口")
    @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,18 +58,19 @@
        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("【TMS】合同详情接口")
    @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("【TMS】司机待办任务列表接口")
@@ -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));
    }