From 8bab64e794d8c874d2b243aaaa4f5af71d28f416 Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Thu, 28 May 2020 23:59:20 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/modules/symbols/controller/SymbolsController.java | 24 +++++++++--
src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java | 2 +
src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java | 7 +++
src/main/java/com/xcong/excoin/modules/symbols/parameter/dto/KlineDetailDto.java | 33 ++++++++++++++++
4 files changed, 60 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/modules/symbols/controller/SymbolsController.java b/src/main/java/com/xcong/excoin/modules/symbols/controller/SymbolsController.java
index f5e87f8..9268da6 100644
--- a/src/main/java/com/xcong/excoin/modules/symbols/controller/SymbolsController.java
+++ b/src/main/java/com/xcong/excoin/modules/symbols/controller/SymbolsController.java
@@ -1,22 +1,23 @@
package com.xcong.excoin.modules.symbols.controller;
import com.xcong.excoin.common.response.Result;
+import com.xcong.excoin.modules.symbols.parameter.dto.KlineDetailDto;
import com.xcong.excoin.modules.symbols.service.SymbolsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.validation.Valid;
/**
* @author wzy
* @date 2020-05-28
**/
-@Api(value = "币种相关轮询接口类", tags = "币种相关轮询接口类")
+@Api(value = "K线以及币种相关轮询接口类", tags = "K线以及币种相关轮询接口类")
@Slf4j
@RestController
@RequestMapping(value = "/api/symbols")
@@ -27,7 +28,20 @@
@ApiOperation(value = "轮询获取app首页币种交易信息", notes = "轮询获取app首页币种交易信息")
@GetMapping(value = "/homeSymbols")
- public Result homeSymbols(Integer type) {
+ public Result homeSymbols(@ApiParam(name = "type", value = "类型1-币币2-合约3-自选", required = true, example = "1") Integer type) {
return symbolsService.homeSymbols(type);
}
+
+ @ApiOperation(value = "根据币种查询币种当前各种数据", notes = "根据币种查询币种当前各种数据")
+ @GetMapping(value = "/findSymbolData")
+ public Result findSymbolData(@ApiParam(name = "symbol", value="币种", required = true, example = "BTC/USDT") String symbol) {
+ return symbolsService.findSymbolData(symbol);
+ }
+
+ @ApiOperation(value = "查询历史K线数据", notes = "查询历史K线数据")
+ @PostMapping(value = "/klineDetail")
+ public Result klineDetail(@RequestBody @Valid KlineDetailDto klineDetailDto) {
+ return null;
+ }
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/symbols/parameter/dto/KlineDetailDto.java b/src/main/java/com/xcong/excoin/modules/symbols/parameter/dto/KlineDetailDto.java
new file mode 100644
index 0000000..5281ea8
--- /dev/null
+++ b/src/main/java/com/xcong/excoin/modules/symbols/parameter/dto/KlineDetailDto.java
@@ -0,0 +1,33 @@
+package com.xcong.excoin.modules.symbols.parameter.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ *
+ * @Author wzy
+ * @Date 2020/5/28
+ **/
+@Data
+@ApiModel(value = "KlineDetailDto", description = "请求K线类")
+public class KlineDetailDto {
+
+ @NotNull
+ @ApiModelProperty(value = "币种", example = "BTC/USDT")
+ private String symbol;
+
+ @NotNull
+ @ApiModelProperty(value = "", example = "5min")
+ private String period;
+
+ @NotNull
+ @ApiModelProperty(value = "", example = "150")
+ private Integer size;
+
+ @NotNull
+ @ApiModelProperty(value = "", example = "1")
+ private Integer type;
+}
diff --git a/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java b/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java
index 3d8ffb3..2cad3b9 100644
--- a/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java
+++ b/src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java
@@ -13,4 +13,6 @@
public Result homeSymbols(Integer type);
+ public Result findSymbolData(String symbol);
+
}
diff --git a/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java b/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java
index 2298cb9..b6ba34e 100644
--- a/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java
+++ b/src/main/java/com/xcong/excoin/modules/symbols/service/impl/SymbolsServiceImpl.java
@@ -53,7 +53,6 @@
return client;
}
-
@Override
public void updateSymbolsKine(String time) {
synchronized (this) {
@@ -115,6 +114,12 @@
return Result.ok(list);
}
+ @Override
+ public Result findSymbolData(String symbol) {
+ HomeSymbolsVo homeSymbolsVo = getSymbolReturnData(symbol);
+ return Result.ok(homeSymbolsVo);
+ }
+
public HomeSymbolsVo getSymbolReturnData(String symbol) {
PlatformCnyUsdtExchangeEntity cnyUsdtExchange = platformCnyUsdtExchangeDao.getCNYAndUSDTOne();
// 获取当日k线数据
--
Gitblit v1.9.1