From 3af254f1b36e7722673fcebe110da524b276105c Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 30 十二月 2024 17:56:04 +0800 Subject: [PATCH] 最新版本541200007 --- server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/web/DriverPlatformController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 51 insertions(+), 1 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..9db2a06 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 @@ -12,6 +12,7 @@ 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; @@ -56,6 +57,9 @@ @Autowired private PlatformReasonService platformReasonService; + @Autowired + private PlatformWmsJobService platformWmsJobService; + @ApiOperation("鍏ュ洯鍘熷洜") @@ -87,12 +91,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 +125,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 +153,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