stock history page

Author: xpioneer

src/controllers/StockHistoryController.ts

@@ -1,4 +1,3 @@
-import { Equal, Like, Between, FindManyOptions} from "typeorm";
 import { Context } from '@core/koa'
 import { StockHistory, History, KeyofHistory } from '../entities/mysql/shares/stockHistory'
 import { Guid } from "../utils/tools";
@@ -92,25 +91,6 @@ class SharesController {
     }
   }
 
-  static async insert(args: Partial<StockHistory>) {
-    let model = new StockHistory()
-    model.uuid = Guid()
-    model.tradeAt = args.tradeAt
-    model.open = args.open
-    model.close = args.close
-    model.high = args.high
-    model.low = args.low
-    model.total = args.total
-    model.totalAmt = args.totalAmt
-    model.amplitude = args.amplitude
-    model.rasingRatio = args.rasingRatio
-    model.rasingPrice = args.rasingPrice
-    model.exchangeRatio = args.exchangeRatio
-    const result = await getSharesManager().save(model)
-    console.log(result.id)
-    return result.id
-  }
-
   static async add(data: History) {
     let model = new History()
     model.stockId = data.stockId
@@ -169,24 +149,24 @@ class SharesController {
   async pages(ctx: Context) {
     const { code, page = 1, pageSize = 10 } = ctx.query
     if(!code) {
-      ctx.Json({msg: 'code参数缺失', status: 400})
+      throw new Error('code参数缺失')
     }
-    const [list, total] = await StockService.pages(page, pageSize, code)
+    const [list, total] = await StockHistoryService.pages(Number(page), Number(pageSize), code)
     ctx.Pages({list, total})
   }
 
   async updateHistory(ctx: Context) {
     const { code } = ctx.fields
     const stock = await StockService.getByCode(code)
-    const [list, total] = await StockHistoryService.pages(1, 10, stock.id)
-    let lastestDate = 0
-    if(total > 0) {
-      lastestDate = list[total - 1].timestamp
-      const today = new Date
-      // const 
-    } else {
-      // 
-    }
+    // const [list, total] = await StockHistoryService.pages(1, 10, stock.id)
+    // let lastestDate = 0
+    // if(total > 0) {
+    //   lastestDate = list[total - 1].timestamp
+    //   const today = new Date
+    //   // const 
+    // } else {
+    //   // 
+    // }
     return stock
   }
 }

src/daos/StockDao.ts

@@ -0,0 +1,41 @@
+import { Equal, Like, Between, FindManyOptions, FindConditions} from "typeorm";
+import { Context } from '@core/koa'
+import { Stock } from '../entities/mysql/shares/stock'
+import { EMarket, EBLock } from '../models/Stocks'
+import { getSharesManager, getSharesRepository } from '../database/dbUtils';
+
+
+
+class StockDao {
+
+  async getByCode(code: string) {
+    const stock = await getSharesRepository(Stock).findOne({code})
+    return stock
+  }
+
+  async pages(offset = 1, size = 10, code?: string, name?: string, market?: EMarket, block?: EBLock) {
+    const where: FindConditions<Stock> = {}
+    if(code) {
+      where.code = Like(`%${code}%`)
+    }
+    if(name) {
+      where.name = Like(`%${name}%`)
+    }
+    if(market) {
+      where.market = Equal(market)
+    }
+    if(block) {
+      where.block = Equal(block)
+    }
+    const options: FindManyOptions<Stock> = {
+      skip: (offset > 0 ? (offset - 1) : 0) * size,
+      take: size,
+      order: { id: 'ASC'},
+      where
+    }
+    const pages = await getSharesRepository(Stock).findAndCount(options)
+    return pages
+  }
+}
+
+export default new StockDao

src/daos/StockHistoryDao.ts

@@ -0,0 +1,39 @@
+import { Equal, Like, Between, FindManyOptions} from "typeorm";
+import { StockHistory } from '../entities/mysql/shares/stockHistory'
+import { getSharesManager, getSharesRepository } from '../database/dbUtils';
+
+
+
+class StockHistoryDao {
+
+  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 Left Join stocks s On sh.stockId = s.id
+      Where 1 = 1`
+    
+    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]
+  }
+}
+
+export default new StockHistoryDao

src/entities/mysql/shares/shareEntites.ts

@@ -1,11 +1,10 @@
 import { GJRecord } from './GJRecord'
 import { Stock } from './stock'
-import { StockHistory, History } from './stockHistory'
+import { History } from './stockHistory'
 
 
 export const ShareEntities = [
   GJRecord,
   Stock,
-  StockHistory,
   History
 ]

src/entities/mysql/shares/stockHistory.ts

@@ -1,5 +1,6 @@
 import 'reflect-metadata'
 import { Entity, Column, PrimaryColumn} from "typeorm";
+import { Stock } from './stock';
 
 export type KeyofHistory = keyof History
 
@@ -84,48 +85,7 @@ export class History {
   net_volume_hk: number
 }
 
-@Entity('stock_history_5')
-export class StockHistory {
-  @PrimaryColumn({ unique: true })
-  id: number
-
-  @Column()
-  uuid: string
-
-  @Column()
-  stockId: number
-
-  @Column()
-  open: number
-
-  @Column()
-  close: number
-
-  @Column()
-  low: number
-
-  @Column()
-  high: number
-
-  @Column()
-  rasingPrice: number
-
-  @Column()
-  rasingRatio: number
-
-  @Column()
-  total: number
-
-  @Column()
-  totalAmt: number
-
-  @Column()
-  exchangeRatio: number
-
-  @Column()
-  amplitude: number
-
-  @Column()
-  tradeAt: number
 
+export type StockHistory = History & Stock & {
+  tradeAt: string
 }

src/routes/index.ts

@@ -8,6 +8,8 @@ import LogsCtrl from '../controllers/LogsController'
 import ServerAPI from '../controllers/ServerAPIController'
 import DoubleColorBallController from '../controllers/DoubleColorBallController'
 import SharesCtrl from '../controllers/SharesController'
+import StockCtrl from '../controllers/StockController'
+import StockHistoryCtrl from '../controllers/StockHistoryController'
 
 const _PROD_ = process.env.NODE_ENV === 'production'
 
@@ -25,6 +27,8 @@ router
   .get('/api/log-errors', LogsCtrl.errorsPages)
   .post('/api/batchShares', SharesCtrl.batchInsert)
   .post('/api/upload', FileCtrl.upload)
+  .get('/api/stocks', StockCtrl.pages1)
+  .get('/api/stockhistory', StockHistoryCtrl.pages)
   .get('/graphql', KoaGraphql({
     schema: RootSchema,
     graphql: _PROD_ ? false : true

src/services/StockHistoryService.ts

@@ -1,24 +1,27 @@
-import { Equal, Like, Between, FindManyOptions} from "typeorm";
-import { Context } from '@core/koa'
-import { History } from '../entities/mysql/shares/stockHistory'
-import { Guid } from "../utils/tools";
-import { getSharesManager, getSharesRepository } from '../database/dbUtils';
+import { StockHistory } from '../entities/mysql/shares/stockHistory'
+import StockService from './StockService'
+import StockHistoryDao from '../daos/StockHistoryDao'
+import { formatDate } from "../utils/tools";
+import { DateFormat } from "../types/base";
 
 
 
 class StockHistoryService {
 
-  async pages(offset = 1, size = 10, stockId: number, code?: string, name?: string) {
-    const options: FindManyOptions<History> = {
-      skip: (offset > 0 ? (offset - 1) : 0) * size,
-      take: size,
-      order: { timestamp: 'DESC' },
-      where: {
-        stockId: Equal(stockId)
-      }
+  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)
+      return [
+        list.map(item => {
+          item.tradeAt = formatDate(+item.timestamp, DateFormat.Date)
+          return item
+        }),
+        total
+      ]
+    } else {
+      return [[], 0]
     }
-    const pages = await getSharesRepository(History).findAndCount(options)
-    return pages
   }
 }
 

src/services/StockService.ts

@@ -2,50 +2,20 @@ import { Equal, Like, Between, FindManyOptions, FindConditions } from "typeorm";
 import { Stock } from '../entities/mysql/shares/stock'
 import { getSharesManager, getSharesRepository } from '../database/dbUtils';
 import { EMarket, EBLock } from '../models/Stocks'
+import StockDao from '../daos/StockDao'
 
 
 class StockService {
 
   async getByCode(code: string) {
-    const stock = await getSharesRepository(Stock).findOne({code})
+    const stock = await StockDao.getByCode(code);
     return stock
   }
 
   async pages(offset = 1, size = 10, code?: string, name?: string, market?: EMarket, block?: EBLock) {
-    const where: FindConditions<Stock> = {}
-    if(code) {
-      where.code = Like(`%${code}%`)
-    }
-    if(name) {
-      where.name = Like(`%${name}%`)
-    }
-    if(market) {
-      where.market = Equal(market)
-    }
-    if(block) {
-      where.block = Equal(block)
-    }
-    console.log(where, 'where')
-    const options: FindManyOptions<Stock> = {
-      skip: (offset > 0 ? (offset - 1) : 0) * size,
-      take: size,
-      order: { id: 'ASC'},
-      where
-    }
-    const pages = await getSharesRepository(Stock).findAndCount(options)
+    const pages = await StockDao.pages(offset, size, code, name, market, block);
     return pages
   }
-
-  async getList(delta = 0, size = 100) {
-    const options: FindManyOptions<Stock> = {
-      skip: delta * size,
-      take: size,
-      order: { id: 'ASC'},
-      where: {}
-    }
-    const stocks = await getSharesRepository(Stock).find(options)
-    return stocks
-  }
 }
 
 export default new StockService