From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001 From: liukangdong <898885815@qq.com> Date: 星期三, 28 八月 2024 09:22:52 +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/web/DriverPlatformController.java | 45 +++++++++++++++++++++++++++++++-------------- 1 files changed, 31 insertions(+), 14 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 9be7635..688be9f 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,19 +1,20 @@ 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.core.utils.Constants; import com.doumee.core.utils.DateUtil; -import com.doumee.dao.business.model.PlatformBooks; -import com.doumee.dao.business.model.PlatformJob; -import com.doumee.dao.business.model.Visits; +import com.doumee.dao.business.model.*; 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.*; @@ -26,6 +27,7 @@ import java.math.BigDecimal; import java.util.Date; +import java.util.List; /** * Created by IntelliJ IDEA. @@ -51,13 +53,24 @@ @Autowired private PlatformBooksService platformBooksService; + @Autowired + private PlatformReasonService platformReasonService; + + + + @ApiOperation("鍏ュ洯鍘熷洜") + @GetMapping("/platformReasonList") + public ApiResponse<List<PlatformReason>> platformReasonList (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + List<PlatformReason> platformReasons = platformReasonService.findList(null); + return ApiResponse.success(platformReasons); + } + @ApiOperation("鍙告満棣栭〉淇℃伅") @GetMapping("/driverHome") public ApiResponse<DriverHomeVO> driverHome (@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { - DriverHomeVO driverHomeVO = platformJobService.getDriverHome(getLoginUser(token).getMemberId()); + DriverHomeVO driverHomeVO = platformJobService.getDriverHome(getLoginUser(token)); return ApiResponse.success(driverHomeVO); } - @ApiOperation("鏌ヨ鍙绾﹂噺") @PostMapping("/checkSurplusNum") @@ -66,16 +79,20 @@ } @ApiOperation("鐗╂祦杞﹂绾�") - @PostMapping("/checkSurplusNum") - public ApiResponse<Integer> checkSurplusNum (@RequestBody PlatformBooksApplyDTO platformBooksApplyDTO , @RequestHeader(Constants.HEADER_USER_TOKEN) String token) { - platformBooksApplyDTO.setUserId(getLoginUser(token).getMemberId()); + @PostMapping("/apply") + public ApiResponse<Integer> apply (@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.apply(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()); return ApiResponse.success(platformBooksService.findPage(pageWrap)); } @@ -93,8 +110,7 @@ return ApiResponse.success("鎿嶄綔鎴愬姛"); } - - /******************************************************浠诲姟鎺ュ彛************************************************************************/ + /******************************************************鍙告満浠诲姟鎺ュ彛************************************************************************/ @ApiOperation("浠诲姟绛惧埌") @PostMapping("/signIn") @@ -110,9 +126,10 @@ return ApiResponse.success(platformJobService.getDetail(jobDetailDTO)); } - - - - + @ApiOperation("鏌ヨ鎺掗槦鎯呭喌") + @PostMapping("/lineUpDetail") + public ApiResponse<LineUpVO> lineUpDetail (@RequestBody LineUpDetailDTO lineUpDetailDTO, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){ + return ApiResponse.success(platformJobService.lineUpDetail(lineUpDetailDTO)); + } } -- Gitblit v1.9.3