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

jiangping

2025-03-18 cc6ab7021c3aef6ca3bbf05f8bcb5bfe0e6f6096

 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));
    }





}