From c977f0e2fd86ca3e9e3ad3961f702206c41d2767 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 19 二月 2025 10:41:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/web/src/main/java/com/doumee/api/web/HomeApi.java | 33 +++++++++++++--------------------
1 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/server/web/src/main/java/com/doumee/api/web/HomeApi.java b/server/web/src/main/java/com/doumee/api/web/HomeApi.java
index 6f71c5e..dcc0139 100644
--- a/server/web/src/main/java/com/doumee/api/web/HomeApi.java
+++ b/server/web/src/main/java/com/doumee/api/web/HomeApi.java
@@ -1,10 +1,12 @@
package com.doumee.api.web;
import com.doumee.core.annotation.LoginRequired;
+import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.dao.business.web.response.HomeResponse;
import com.doumee.dao.business.web.response.RidesDetailResponse;
+import com.doumee.jtt808.web.service.Jtt808Service;
import com.doumee.service.business.GoodsorderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -12,10 +14,11 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.yzh.commons.model.APIResult;
+import org.yzh.protocol.t808.T0201_0500;
+import org.yzh.protocol.t808.T0805;
+import org.yzh.protocol.t808.T8500;
/**
* Created by IntelliJ IDEA.
@@ -33,7 +36,8 @@
@Autowired
private GoodsorderService goodsorderService;
-
+ @Autowired
+ private Jtt808Service jtt808Service;
@LoginRequired
@ApiOperation(value = "棣栭〉淇℃伅", notes = "棣栭〉淇℃伅")
@@ -46,21 +50,10 @@
return ApiResponse.success("鏌ヨ鎴愬姛",homeResponse);
}
-
- @LoginRequired
- @ApiOperation(value = "楠戣鏄庣粏", notes = "楠戣鏄庣粏")
- @GetMapping("/rideDetail")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "String", name = "goodsOrderId", value = "璁㈠崟涓婚敭", required = true)
- })
- public ApiResponse<RidesDetailResponse> rideDetail(@RequestParam String goodsOrderId) {
- RidesDetailResponse ridesDetailResponse = new RidesDetailResponse();
- return ApiResponse.success("鏌ヨ鎴愬姛",ridesDetailResponse);
+ @ApiOperation(value = "娴嬭瘯鐢垫睜鎺у埗", notes = "娴嬭瘯鐢垫睜鎺у埗")
+ @PostMapping("/testControl")
+ public ApiResponse<APIResult<T0201_0500>> testControl(@RequestBody T8500 param) {
+ return ApiResponse.success( jtt808Service.bikeControl(param));
}
-
-
-
-
}
--
Gitblit v1.9.3