From 31a7044804b7092fa262b6a9137cc95e8d740455 Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Wed, 12 Mar 2025 16:25:41 +0800
Subject: [PATCH] 1
---
src/main/java/com/nq/service/impl/PriceServicesImpl.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/nq/service/impl/PriceServicesImpl.java b/src/main/java/com/nq/service/impl/PriceServicesImpl.java
index 71345ac..f5a88cf 100644
--- a/src/main/java/com/nq/service/impl/PriceServicesImpl.java
+++ b/src/main/java/com/nq/service/impl/PriceServicesImpl.java
@@ -1,5 +1,8 @@
package com.nq.service.impl;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.http.HttpUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.google.gson.Gson;
@@ -8,6 +11,7 @@
import com.nq.dao.StockMapper;
import com.nq.dao.StockSettingMapper;
import com.nq.enums.EConfigKey;
+import com.nq.enums.EStockType;
import com.nq.pojo.*;
import com.nq.service.IPriceServices;
import com.nq.service.IStockConfigServices;
@@ -26,6 +30,7 @@
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -53,7 +58,11 @@
Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code",stockCode));
StockSetting stockSetting = stockSettingMapper.selectOne(new QueryWrapper<StockSetting>().eq("stock_code",stockCode));
if(stockSetting != null){
- if(TimeUtil.isTradingHour(stockSetting.getStartTime(),stockSetting.getEndTime())){
+ Date newDate = new Date();
+ DateTime startTime = DateUtil.parseDateTime(stockSetting.getStartTime());
+ DateTime endTime = DateUtil.parseDateTime(stockSetting.getEndTime());
+ if(newDate.after(startTime) && newDate.before(endTime)){
+// if(TimeUtil.isTradingHour(stockSetting.getStartTime(),stockSetting.getEndTime())){
if(stockSetting.getType().equals("0")){
return new BigDecimal(stockSetting.getPrice());
}else{
@@ -101,7 +110,8 @@
}
public String doGet(String pid){
- String apiUrl = "http://api-in-2.js-stock.top/stock?pid="+pid+"&key=eVKtHt7aG4m6ozwWL9qG";
+ EStockType eStockType = EStockType.getEStockTypeByCode("IN");
+ String apiUrl = eStockType.stockUrl+"?pid="+pid+"&key="+eStockType.stockKey;
try {
URL url = new URL(apiUrl);
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
@@ -120,20 +130,6 @@
e.printStackTrace();
}
return null;
- }
-
- @Override
- public BigDecimal getNowPrice(String stockCode, String stockType) {
- BigDecimal nowPrice = getNowPrice(stockCode);
- if (!stockType.equals("DZ")){
- return nowPrice;
- }
- QueryWrapper queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("stock_code",stockCode);
- StockDz stockDz = stockDZMapper.selectOne(queryWrapper);
- if(stockDz == null){
- return nowPrice;}
- return nowPrice.multiply(stockDz.getDiscount());
}
@Override
--
Gitblit v1.9.3