From 4c155dc4b01f39c4c2bd06885ea202f77912a91f Mon Sep 17 00:00:00 2001
From: zj <1772600164@qq.com>
Date: Tue, 02 Apr 2024 11:42:19 +0800
Subject: [PATCH] 1

---
 /dev/null                                                                |   68 ----------------------
 .idea/git_toolbox_prj.xml                                                |   15 +++++
 websocketSerivce/src/main/java/org/example/controller/ApiController.java |   46 +++++++++++++++
 3 files changed, 60 insertions(+), 69 deletions(-)

diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
new file mode 100644
index 0000000..02b915b
--- /dev/null
+++ b/.idea/git_toolbox_prj.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/websocketSerivce/src/main/java/org/example/controller/ApiController.java b/websocketSerivce/src/main/java/org/example/controller/ApiController.java
index 4f9e6fe..e2cd1a1 100644
--- a/websocketSerivce/src/main/java/org/example/controller/ApiController.java
+++ b/websocketSerivce/src/main/java/org/example/controller/ApiController.java
@@ -2,14 +2,18 @@
 
 import cn.hutool.http.HttpUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.example.common.ServerResponse;
 import org.example.dao.JournalismMapper;
 import org.example.dao.StockMarketNewMapper;
+import org.example.dao.StockNewShareMapper;
 import org.example.enums.EStockType;
 import org.example.pojo.Journalism;
 import org.example.pojo.StockMarketNew;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * @program: webSocketProject
@@ -17,8 +21,14 @@
  * @create: 2024-03-26 21:51
  **/
 @RestController
-@RequestMapping("/api/all")
+@RequestMapping("/api/stock/")
 public class ApiController {
+
+    @Autowired
+    StockNewShareMapper stockNewShareMapper;
+
+    @Autowired
+    StockMarketNewMapper stockMarketNewMapper;
 
 
     /*查询股票日线*/
@@ -37,4 +47,38 @@
         }
         return HttpUtil.get(eStockType.stockUrl + "kline?pid=" + pid + "&interval=" + interval + "&key=" + eStockType.stockKey);
     }
+
+    @GetMapping("getStock.do")
+    public ServerResponse StockMarketNew(@RequestParam(value = "stockType", required = false) String stockType){
+        // 将输入的股票类型转换为大写
+        String upperCase = stockType.toUpperCase();
+        // 根据代码获取对应的枚举类型
+        EStockType code = EStockType.getEsByCode(upperCase);
+        if(code == null){
+            return ServerResponse.createBySuccessMsg("请输入正确的stockType");
+        }
+
+        // 根据枚举类型进行不同的操作
+        switch(code){
+            case XG:
+                // 查询新股市场数据
+                return getStockData(stockNewShareMapper);
+            case IN:
+                // 查询股票数据
+                return getStockData(stockMarketNewMapper);
+            default:
+                return ServerResponse.createBySuccessMsg("未找到对应的股票数据");
+        }
+    }
+
+    // 通用方法,根据传入的mapper查询数据
+    private <T> ServerResponse getStockData(BaseMapper<T> mapper){
+        LambdaQueryWrapper<T> wrapper = new LambdaQueryWrapper<>();
+        List<T> list = mapper.selectList(wrapper);
+        if(list.isEmpty()){
+            return ServerResponse.createByErrorMsg("查询结果为空");
+        }
+        return ServerResponse.createBySuccess(list);
+    }
+
 }
diff --git a/websocketSerivce/src/main/java/org/example/controller/StockMarketNewController.java b/websocketSerivce/src/main/java/org/example/controller/StockMarketNewController.java
deleted file mode 100644
index a03b22c..0000000
--- a/websocketSerivce/src/main/java/org/example/controller/StockMarketNewController.java
+++ /dev/null
@@ -1,31 +0,0 @@
-//package org.example.controller;
-//
-//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-//import org.example.common.ServerResponse;
-//import org.example.dao.StockMarketNewMapper;
-//import org.example.pojo.StockMarketNew;
-//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.RestController;
-//
-///**
-// * @program: webSocketProject
-// * @description:
-// * @create: 2024-03-27 14:07
-// **/
-//@RestController
-//@RequestMapping("/api/StockMarketNew")
-//public class StockMarketNewController {
-//
-//
-//    @Autowired
-//    StockMarketNewMapper stockMarketNewMapper;
-//
-//    @GetMapping("StockMarketNewAll")
-//    public ServerResponse StockMarketNew(){
-//        LambdaQueryWrapper<StockMarketNew> queryWrapper = new LambdaQueryWrapper<>();
-//        return ServerResponse.createBySuccess(stockMarketNewMapper.selectList(queryWrapper));
-//    }
-//
-//}
diff --git a/websocketSerivce/src/main/java/org/example/controller/StockNewShareController.java b/websocketSerivce/src/main/java/org/example/controller/StockNewShareController.java
deleted file mode 100644
index 217d1f7..0000000
--- a/websocketSerivce/src/main/java/org/example/controller/StockNewShareController.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.example.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.example.common.ServerResponse;
-import org.example.dao.StockMarketNewMapper;
-import org.example.dao.StockNewShareMapper;
-import org.example.enums.EStockType;
-import org.example.pojo.StockMarketNew;
-import org.example.pojo.StockNewShare;
-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 java.util.List;
-
-/**
- * @program: webSocketProject
- * @description: 新股
- * @create: 2024-03-27 15:27
- **/
-@RestController
-@RequestMapping("/api/stock")
-public class StockNewShareController {
-
-    @Autowired
-    StockNewShareMapper stockNewShareMapper;
-
-    @Autowired
-    StockMarketNewMapper stockMarketNewMapper;
-
-    @GetMapping("getStock.do")
-    public ServerResponse StockMarketNew(@RequestParam(value = "stockType", required = false) String stockType){
-        // 将输入的股票类型转换为大写
-        String upperCase = stockType.toUpperCase();
-        // 根据代码获取对应的枚举类型
-        EStockType code = EStockType.getEsByCode(upperCase);
-        if(code == null){
-            return ServerResponse.createBySuccessMsg("请输入正确的stockType");
-        }
-
-        // 根据枚举类型进行不同的操作
-        switch(code){
-            case XG:
-                // 查询新股市场数据
-                return getStockData(stockNewShareMapper);
-            case IN:
-                // 查询股票数据
-                return getStockData(stockMarketNewMapper);
-            default:
-                return ServerResponse.createBySuccessMsg("未找到对应的股票数据");
-        }
-    }
-
-    // 通用方法,根据传入的mapper查询数据
-    private <T> ServerResponse getStockData(BaseMapper<T> mapper){
-        LambdaQueryWrapper<T> wrapper = new LambdaQueryWrapper<>();
-        List<T> list = mapper.selectList(wrapper);
-        if(list.isEmpty()){
-            return ServerResponse.createByErrorMsg("查询结果为空");
-        }
-        return ServerResponse.createBySuccess(list);
-    }
-
-
-}

--
Gitblit v1.9.3