From da045f4ac67ac3d4f55b2dd34e9a59fb7afc0c58 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 19 二月 2025 10:40:30 +0800 Subject: [PATCH] jtt808初始化 --- server/web/src/main/java/com/doumee/api/web/BusinessApi.java | 88 ++++++++++++++++++++++++++++++++++++++------ 1 files changed, 76 insertions(+), 12 deletions(-) diff --git a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java index 9ca214a..ec79bef 100644 --- a/server/web/src/main/java/com/doumee/api/web/BusinessApi.java +++ b/server/web/src/main/java/com/doumee/api/web/BusinessApi.java @@ -1,17 +1,21 @@ package com.doumee.api.web; +//import com.doumee.api.Repeat.RepeatSubmit; +import com.doumee.biz.system.SystemDictDataBiz; import com.doumee.core.annotation.LoginRequired; +import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.annotation.trace.Trace; import com.doumee.core.constants.Constants; import com.doumee.core.model.ApiResponse; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; -import com.doumee.dao.business.model.BaseParam; -import com.doumee.dao.business.model.MemberRides; -import com.doumee.dao.business.model.RentSite; -import com.doumee.dao.business.model.Transactions; +import com.doumee.dao.business.model.*; +import com.doumee.dao.business.web.request.BackElecBikeRequest; import com.doumee.dao.business.web.request.RepairRequest; +import com.doumee.dao.business.web.response.MemberRidesDetailResponse; import com.doumee.dao.business.web.response.RidesDetailResponse; +import com.doumee.dao.system.model.SystemDictData; +import com.doumee.jtt808.web.service.Jtt808Service; import com.doumee.service.business.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -20,6 +24,9 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import org.yzh.commons.model.APIResult; +import org.yzh.protocol.t808.T0201_0500; +import org.yzh.protocol.t808.T8500; import java.util.List; @@ -39,6 +46,8 @@ @Autowired private GoodsorderService goodsorderService; + @Autowired + private Jtt808Service jtt808Service; @Autowired private RentSiteService rentSiteService; @@ -55,6 +64,10 @@ @Autowired private MemberRidesService memberRidesService; + @Autowired + private SystemDictDataBiz systemDictDataBiz; + + @PreventRepeat @LoginRequired @ApiOperation(value = "鎶奸噾鏀粯", notes = "灏忕▼搴忕") @GetMapping("/createGoodsOrderPay") @@ -64,7 +77,6 @@ public ApiResponse<Object> createGoodsOrderPay() { return ApiResponse.success("鎿嶄綔鎴愬姛",goodsorderService.createGoodsOrderPay(getMemberId())); } - @LoginRequired @ApiOperation(value = "楠戣鏄庣粏", notes = "灏忕▼搴忕") @@ -76,8 +88,6 @@ public ApiResponse<RidesDetailResponse> ridesDetail(@RequestParam String goodsOrderId) { return ApiResponse.success("鏌ヨ鎴愬姛",goodsorderService.getRidesDetailResponse(goodsOrderId)); } - - @LoginRequired @ApiOperation(value = "绉熻溅鐐瑰垪琛�", notes = "灏忕▼搴忕") @@ -91,7 +101,6 @@ rentSite.setStatus(Constants.ZERO); return ApiResponse.success("鏌ヨ鎴愬姛",rentSiteService.findList(rentSite)); } - @LoginRequired @ApiOperation("娑堣垂鏄庣粏") @@ -124,7 +133,7 @@ @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) }) - public ApiResponse<String> onlineBike() { + public ApiResponse<MemberRides> onlineBike() { return ApiResponse.success("鏌ヨ鎴愬姛",memberRidesService.getOnlineBike(getMemberId())); } @@ -134,16 +143,71 @@ @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true) }) - public ApiResponse transactionsPage (@RequestBody RepairRequest repairRequest) { + public ApiResponse transactionsPage (@RequestBody RepairRequest repairRequest) throws Exception{ repairRequest.setMemberId(getMemberId()); bikeRepairService.saveRepair(repairRequest); return ApiResponse.success("鎿嶄綔鎴愬姛"); } + @PreventRepeat + @LoginRequired + @ApiOperation(value = "鎵爜瑙i攣", notes = "灏忕▼搴忕") + @GetMapping("/openLock") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "code", value = "閿佸ご鐮�", required = true) + }) + public ApiResponse<MemberRidesDetailResponse> openLock(@RequestParam String code) { + return ApiResponse.success("鎿嶄綔鎴愬姛",memberRidesService.openLock(code,getMemberId())); + } + @LoginRequired + @ApiOperation(value = "鍒锋柊瑙i攣鎯呭喌", notes = "灏忕▼搴忕") + @GetMapping("/refreshLock") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "id", value = "楠戣璁板綍涓婚敭", required = true) + }) + public ApiResponse<MemberRidesDetailResponse> refreshLock(@RequestParam String id) { + return ApiResponse.success("鎿嶄綔鎴愬姛",memberRidesService.refreshLock(id)); + } + @LoginRequired + @PreventRepeat + @ApiOperation(value = "璁㈠崟缁撶畻", notes = "灏忕▼搴忕") + @GetMapping("/goodsOrderSettlement") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + }) + public ApiResponse goodsOrderSettlement() { + goodsorderService.goodsOrderSettlement(getMemberId()); + return ApiResponse.success("鎿嶄綔鎴愬姛"); + } + @LoginRequired + @ApiOperation(value = "鑾峰彇瀛楀吀鍊间俊鎭�", notes = "灏忕▼搴忕") + @GetMapping("/getSysDict") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "dicCode", value = "瀛楀吀缂栫爜", required = true), + @ApiImplicitParam(paramType = "query", dataType = "String", name = "label", value = "瀛楀吀鏁板�肩紪鐮�", required = true) + }) + public ApiResponse<SystemDictData> getSysDict(@RequestParam String dicCode, @RequestParam String label) { + return ApiResponse.success("鏌ヨ鎴愬姛",systemDictDataBiz.queryByCode(dicCode,label)); + } - - + @ApiOperation(value = "鐢佃溅绔欑偣杩樿溅", notes = "鐢佃溅绔欑偣杩樿溅") + @PostMapping("/backElecBike") + public ApiResponse backElecBike(@RequestBody BackElecBikeRequest param) { + param.setMemberId(getMemberId()); + jtt808Service.backElecBike(param); + return ApiResponse.success( null); + } + @ApiOperation(value = "鐢佃溅涓存椂鍋滆溅", notes = "鐢佃溅涓存椂鍋滆溅") + @PostMapping("/pauseElecBike") + public ApiResponse pauseElecBike(@RequestBody BackElecBikeRequest param) { + param.setMemberId(getMemberId()); + jtt808Service.pauseElecBike(param); + return ApiResponse.success( null); + } } -- Gitblit v1.9.3