sql modify; history search

Author: xpioneer

src/controllers/StockController.ts

@@ -65,9 +65,14 @@ class StockController {
   // }
 
   async pages1(ctx: Context) {
-    const { page = 1, pageSize = 10, code, name, market, block } = ctx.query
-    const [list, total] = await StockService.pages(page, pageSize, code, name, market, block)
-    ctx.Pages({ list, total })
+    const { page = 1, pageSize = 10, code, name, market, block, noPage } = ctx.query
+    if(!!noPage) {
+      const list= await StockService.getStockList(code, pageSize)
+      ctx.Json({ data: list })
+    } else {
+      const [list, total] = await StockService.pages(page, pageSize, code, name, market, block)
+      ctx.Pages({ list, total })
+    }
   }
 
   async pages(delta = 0, size = 10) {

src/controllers/StockHistoryController.ts

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

src/daos/StockDao.ts

@@ -14,6 +14,13 @@ class StockDao {
     return stock
   }
 
+  async getById(id: number) {
+    const stock = await getSharesRepository(Stock).findOne(id, {
+      select: ['id', 'code', 'name']
+    })
+    return stock
+  }
+
   async getByIds(ids: number[]) {
     const stocks = await getSharesRepository(Stock).findByIds(ids, {
       select: ['id', 'code', 'name']
@@ -26,6 +33,20 @@ class StockDao {
     return stock
   }
 
+  async getStockList(value: string, pageSize = 10) {
+    const list = await getSharesRepository(Stock).find({
+      where: [
+        { code: Like(`%${value}%`) },
+        { name: Like(`%${value}%`) }
+      ],
+      order: {
+        code: 'DESC'
+      },
+      take: pageSize
+    })
+    return list
+  }
+
   async pages(offset = 1, size = 10, code?: string, name?: string, market?: EMarket, block?: EBLock) {
     const where: FindConditions<Stock> = {}
     if(code) {

src/daos/StockHistoryDao.ts

@@ -20,44 +20,36 @@ class StockHistoryDao {
   }
 
   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 = []
-
-    if(stockId) {
-      const whereAnd = `
-        And sh.stockId = ?
-      `
-      sqlList += whereAnd
-      sqlTotal += whereAnd
-      parameters.push(stockId)
-    }
-    sqlList += `
-      Order By sh.timestamp Desc
-      Limit ?,?;`
-    
-    parameters.push((offset > 0 ? (offset - 1) : 0) * size, size)
-
-    const list = await getSharesManager().query(sqlList, parameters)
-    const totalRow = await getSharesManager().query(sqlTotal, parameters)
-    return [list, totalRow[0].total]
+    const [list, total] = await getSharesRepository(History).findAndCount({
+      select: [
+        'id',
+        'stockId',
+        'volume',
+        'open',
+        'high',
+        'low',
+        'close',
+        'chg',
+        'percent',
+        'turnoverrate',
+        'amount',
+        'pe',
+        'pb',
+        'ps',
+        'pcf',
+        'market_capital',
+        'timestamp'
+      ],
+      where: {
+        stockId: Equal(stockId)
+      },
+      order: {
+        timestamp: 'DESC'
+      },
+      skip: (offset > 0 ? (offset - 1) : 0) * size,
+      take: size
+    })
+    return [list as StockHistory[], total]
   }
 }
 

src/services/StockHistoryService.ts

@@ -14,10 +14,22 @@ class StockHistoryService {
     return lastestTrade
   }
 
-  async pages(offset = 1, size = 10, code: string): Promise<[StockHistory[], number]> {
-    // const stock = await StockService.getByCode(code)
-    // if(stock) {
+  async pages(offset = 1, size = 10, stockId: number): Promise<[StockHistory[], number]> {
+    if(stockId) {
+      const stock = await StockService.getById(stockId)
+      const [list, total] = await StockHistoryDao.pages(offset, size, stockId)
+      return [
+        list.map(item => {
+          item.tradeAt = formatDate(+item.timestamp, DateFormat.Date)
+          item.name = stock.name
+          item.code = stock.code
+          return item
+        }),
+        total
+      ]
+    } else {
       const [list, total] = await StockHistoryDao.pages(offset, size)
+      // set code,name; format timestamp
       const ids = list.map(item => item.stockId).reduce<number[]>((pre, cur) => {
         if(!pre.includes(cur)) {
           pre.push(cur)
@@ -38,9 +50,7 @@ class StockHistoryService {
         }),
         total
       ]
-    // } else {
-    //   return [[], 0]
-    // }
+    }
   }
 }
 

src/services/StockService.ts

@@ -7,6 +7,11 @@ import StockHistoryDao from '../daos/StockHistoryDao'
 
 class StockService {
 
+  async getById(id: number) {
+    const stock = await StockDao.getById(id);
+    return stock
+  }
+
   async getByIds(ids: number[]) {
     const stocks = await StockDao.getByIds(ids);
     return stocks
@@ -26,6 +31,11 @@ class StockService {
     return stock
   }
 
+  async getStockList(value: string, pageSize = 10) {
+    const list = await StockDao.getStockList(value)
+    return list
+  }
+
   async pages(offset = 1, size = 10, code?: string, name?: string, market?: EMarket, block?: EBLock) {
     const pages = await StockDao.pages(offset, size, code, name, market, block);
     return pages