From 962c41d912d60f54f21df739596e61c5888684d9 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Mon, 14 Jul 2025 20:55:08 +0800
Subject: [PATCH] APP大宗交易接口

---
 src/main/java/com/nq/service/impl/PriceServicesImpl.java |   71 ++++++++++-------------------------
 1 files changed, 20 insertions(+), 51 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..6091b18 100644
--- a/src/main/java/com/nq/service/impl/PriceServicesImpl.java
+++ b/src/main/java/com/nq/service/impl/PriceServicesImpl.java
@@ -1,9 +1,10 @@
 package com.nq.service.impl;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
 import com.nq.dao.StockDzMapper;
 import com.nq.dao.StockMapper;
 import com.nq.dao.StockSettingMapper;
@@ -11,22 +12,14 @@
 import com.nq.pojo.*;
 import com.nq.service.IPriceServices;
 import com.nq.service.IStockConfigServices;
-import com.nq.utils.http.HttpClientRequest;
 import com.nq.utils.redis.RedisKeyUtil;
-import com.nq.utils.timeutil.TimeUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.lang.reflect.Type;
 import java.math.BigDecimal;
-import  java.io.BufferedReader;
-import  java.io.InputStreamReader;
-import  java.net.HttpURLConnection;
-import  java.net.URL;
-import java.util.HashMap;
+import java.util.Collections;
+import java.util.Date;
 import java.util.Map;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -51,25 +44,32 @@
     @Override
     public BigDecimal getNowPrice(String stockCode) {
         Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code",stockCode));
+        if(null == stock){
+            return BigDecimal.ZERO;
+        }
         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{
-                    String s = doGet(stock.getStockCode());
+                    String s = RedisKeyUtil.doPost(stock.getStockCode(), stock.getStockType());
                     if(null != s){
                         Map<String, Object> stringObjectMap = jsonToMap(s);
-                        return   new BigDecimal(stringObjectMap.get("last").toString()).multiply(new BigDecimal(stockSetting.getPrice()));
+                        return   new BigDecimal(stringObjectMap.get("Last").toString()).multiply(new BigDecimal(stockSetting.getPrice()));
                     }
                 }
             }
         }
 
-        String s = doGet(stock.getStockCode());
+        String s = RedisKeyUtil.doPost(stock.getStockCode(), stock.getStockType());
         if(null != s) {
             Map<String, Object> stringObjectMap = jsonToMap(s);
-            return  new BigDecimal(stringObjectMap.get("last").toString());
+            return  new BigDecimal(stringObjectMap.get("Last").toString());
         }
         return BigDecimal.ZERO;
     }
@@ -77,7 +77,7 @@
     @Override
     public Map<String, Object> getNewStock(String stockCode) {
         Stock stock = stockMapper.selectOne(new QueryWrapper<Stock>().eq("stock_code",stockCode));
-        String s = doGet(stock.getStockCode());
+        String s = RedisKeyUtil.doPost(stock.getStockCode(), stock.getStockType());
         if(null != s){
             Map<String, Object> stringObjectMap = jsonToMap(s);
             return   stringObjectMap;
@@ -91,6 +91,9 @@
         ObjectMapper objectMapper = new ObjectMapper();
         try {
             Object[] array = objectMapper.readValue(json, Object[].class);
+            if (array.length == 0) {
+                return Collections.emptyMap();
+            }
             Gson gson = new Gson();
             String s = gson.toJson(array[0]);
             Map<String, Object> map = objectMapper.readValue(s, Map.class);
@@ -100,41 +103,7 @@
         }
     }
 
-    public String doGet(String pid){
-        String  apiUrl  =  "http://api-in-2.js-stock.top/stock?pid="+pid+"&key=eVKtHt7aG4m6ozwWL9qG";
-        try  {
-            URL  url  =  new  URL(apiUrl);
-            HttpURLConnection  connection  =  (HttpURLConnection)  url.openConnection();
-            connection.setRequestMethod("GET");
 
-            BufferedReader in  =  new  BufferedReader(new InputStreamReader(connection.getInputStream()));
-            String  inputLine;
-            StringBuffer  response  =  new  StringBuffer();
-
-            while  ((inputLine  =  in.readLine())  !=  null)  {
-                response.append(inputLine);
-            }
-            in.close();
-            return response.toString();
-        }  catch  (Exception  e)  {
-            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
     public boolean isLimitUpBuy(String stockCode) {

--
Gitblit v1.9.3