fix

Author: xpioneer

src/controllers/StockHistoryController.ts

@@ -148,9 +148,9 @@ class SharesController {
 
   async pages(ctx: Context) {
     const { code, page = 1, pageSize = 10 } = ctx.query
-    if(!code) {
-      throw new Error('code参数缺失')
-    }
+    // if(!code) {
+    //   throw new Error('code参数缺失')
+    // }
     const [list, total] = await StockHistoryService.pages(Number(page), Number(pageSize), code)
     ctx.Pages({list, total})
   }

src/daos/StockDao.ts

@@ -14,9 +14,11 @@ class StockDao {
     return stock
   }
 
-  async getCodeByIds(ids: number[]) {
-    const stock = await getSharesRepository(Stock).findByIds(ids)
-    return stock
+  async getByIds(ids: number[]) {
+    const stocks = await getSharesRepository(Stock).findByIds(ids, {
+      select: ['id', 'code', 'name']
+    })
+    return stocks
   }
 
   async getByCode(code: string) {

src/daos/StockHistoryDao.ts

@@ -19,11 +19,25 @@ class StockHistoryDao {
     return lastestTrade
   }
 
-  async pages(offset = 1, size = 10, stockId: number): Promise<[StockHistory[], number]> {
-    let sqlList = `
-      Select sh.*, s.code, s.name From stock_history_new sh Left Join stocks s On sh.stockId = s.id
-      Where 1 = 1`
-    let sqlTotal = `Select count(sh.id) total From stock_history_new sh Where 1 = 1`
+  async pages(offset = 1, size = 10, stockId?: number): Promise<[StockHistory[], number]> {
+    let sqlList = `Select
+      id,
+      stockId,
+      volume,
+      open,
+      high,
+      low,
+      close,
+      chg,
+      percent,
+      turnoverrate,
+      amount,
+      pe,
+      pb,
+      ps,
+      pcf,
+      market_capital From stock_history_new sh`
+    let sqlTotal = `Select count(sh.id) total From stock_history_new sh`
 
     const parameters = []
 

src/services/StockHistoryService.ts

@@ -1,4 +1,5 @@
 import { StockHistory } from '../entities/mysql/shares/stockHistory'
+import { Stock } from '../entities/mysql/shares/stock'
 import StockService from './StockService'
 import StockHistoryDao from '../daos/StockHistoryDao'
 import { formatDate } from "../utils/tools";
@@ -14,19 +15,32 @@ class StockHistoryService {
   }
 
   async pages(offset = 1, size = 10, code: string): Promise<[StockHistory[], number]> {
-    const stock = await StockService.getByCode(code)
-    if(stock) {
-      const [list, total] = await StockHistoryDao.pages(offset, size, stock.id)
+    // const stock = await StockService.getByCode(code)
+    // if(stock) {
+      const [list, total] = await StockHistoryDao.pages(offset, size)
+      const ids = list.map(item => item.stockId).reduce<number[]>((pre, cur) => {
+        if(!pre.includes(cur)) {
+          pre.push(cur)
+        }
+        return pre
+      }, [])
+      const stocks = await StockService.getByIds(ids)
+      const stockNameObj = stocks.reduce<Record<number, Stock>>((pre, cur) => {
+        return {...pre, ...{[cur.id]: cur}}
+      }, {})
       return [
         list.map(item => {
           item.tradeAt = formatDate(+item.timestamp, DateFormat.Date)
+          const stock = stockNameObj[item.stockId]
+          item.name = stock.name
+          item.code = stock.code
           return item
         }),
         total
       ]
-    } else {
-      return [[], 0]
-    }
+    // } else {
+    //   return [[], 0]
+    // }
   }
 }
 

src/services/StockService.ts

@@ -7,6 +7,11 @@ import StockHistoryDao from '../daos/StockHistoryDao'
 
 class StockService {
 
+  async getByIds(ids: number[]) {
+    const stocks = await StockDao.getByIds(ids);
+    return stocks
+  }
+
   async getCode(id: number) {
     const stock = await StockDao.getCode(id);
     const lastestTrade = await StockHistoryDao.getLastestTrade(stock.id)