From 02f90534bff9168fea49e60744c66a7bd8d7e10c Mon Sep 17 00:00:00 2001
From: ydj <yangsink@163.com>
Date: Tue, 11 Jun 2024 16:09:59 +0800
Subject: [PATCH] 1

---
 websocketSerivce/src/main/java/org/example/controller/ApiController.java |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/websocketSerivce/src/main/java/org/example/controller/ApiController.java b/websocketSerivce/src/main/java/org/example/controller/ApiController.java
index e7f38f8..4977157 100644
--- a/websocketSerivce/src/main/java/org/example/controller/ApiController.java
+++ b/websocketSerivce/src/main/java/org/example/controller/ApiController.java
@@ -1,5 +1,6 @@
 package org.example.controller;
 
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.http.HttpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -41,8 +42,10 @@
 
     @GetMapping("/stock-markets")
     public List JournalismAll(@RequestParam(value="key",required = true)String key){
-        DataServiceKey data = dataServiceKeyMapper.selectOne(
-                new LambdaQueryWrapper<DataServiceKey>().eq(DataServiceKey::getTokenKey,key));
+        DataServiceKey data = dataServiceKeyMapper.selectOne(new LambdaQueryWrapper<DataServiceKey>()
+                .eq(DataServiceKey::getTokenKey, key)
+                .gt(DataServiceKey::getExpirationTime, DateUtil.date())
+                .eq(DataServiceKey::getIsAvailable, 1));
         if(data == null){
             return Collections.singletonList(new ArrayList().add("key invalid"));
         }
@@ -53,7 +56,14 @@
     }
 
     @GetMapping("/list")
-    public ServerResponse StockMarketNew(){
+    public ServerResponse StockMarketNew(@RequestParam(value="key",required = true)String key){
+        DataServiceKey data = dataServiceKeyMapper.selectOne(new LambdaQueryWrapper<DataServiceKey>()
+                .eq(DataServiceKey::getTokenKey, key)
+                .gt(DataServiceKey::getExpirationTime, DateUtil.date())
+                .eq(DataServiceKey::getIsAvailable, 1));
+        if(data == null){
+            return ServerResponse.createByErrorMsg("key invalid");
+        }
         LambdaQueryWrapper<StockMarketNew> queryWrapper = new LambdaQueryWrapper<>();
         return ServerResponse.createBySuccess(stockMarketNewMapper.selectList(queryWrapper));
     }
@@ -64,9 +74,17 @@
     public String getKData(
             @RequestParam("pid") String pid,
             @RequestParam("interval") String interval,
-            @RequestParam("stockType") String stockType
+            @RequestParam("stockType") String stockType,
+            @RequestParam(value="key",required = true)String key
     ) {
         EStockType eStockType = null;
+        DataServiceKey data = dataServiceKeyMapper.selectOne(new LambdaQueryWrapper<DataServiceKey>()
+                .eq(DataServiceKey::getTokenKey, key)
+                .gt(DataServiceKey::getExpirationTime, DateUtil.date())
+                .eq(DataServiceKey::getIsAvailable, 1));
+        if(data == null){
+            return "key invalid";
+        }
         if(stockType.equals("US")){
             eStockType = EStockType.US;
         }else{
@@ -79,8 +97,14 @@
 
     @RequestMapping("/new-stock")
     @ResponseBody
-    public String newStock() {
-
+    public String newStock(@RequestParam(value="key",required = true)String key) {
+        DataServiceKey data = dataServiceKeyMapper.selectOne(new LambdaQueryWrapper<DataServiceKey>()
+                .eq(DataServiceKey::getTokenKey, key)
+                .gt(DataServiceKey::getExpirationTime, DateUtil.date())
+                .eq(DataServiceKey::getIsAvailable, 1));
+        if(data == null){
+            return "key invalid";
+        }
        return HttpClientRequest.doGet(EStockType.IN.getStockUrl()) + "/new-stock?key=" + (EStockType.IN.getStockKey() + "&country_id=14");
     }
 }

--
Gitblit v1.9.3