detail data

Author: xpioneer

src/controllers/StockController.ts

@@ -53,11 +53,17 @@ const requestApi = async(code: string) => {
 
 class StockController {
 
-  async getByCode(code: string) {
-    const stock = await getSharesRepository(Stock).findOne({code})
-    return stock
+  async getStock(ctx: Context) {
+    const {id} = ctx.params
+    const stockDetail = await StockService.getCode(id)
+    ctx.Json({data: stockDetail})
   }
 
+  // async getByCode(code: string) {
+  //   const stock = await getSharesRepository(Stock).findOne({code})
+  //   return stock
+  // }
+
   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)

src/core/koa.ts

@@ -15,6 +15,8 @@ export interface Context extends KoaContext {
     limit: number
   }
 
+  params: AnyObject
+
   // response
   Json?: <T = any>(res: T | ResponseData<T> | (() => T)) => ResponseData<T>
   Pages?: <T = any>(res: ReturnPage<T>) => ResponseData<T[]>

src/daos/StockDao.ts

@@ -8,6 +8,17 @@ import { getSharesManager, getSharesRepository } from '../database/dbUtils';
 
 class StockDao {
 
+
+  async getCode(id: number) {
+    const stock = await getSharesRepository(Stock).findOne({id})
+    return stock
+  }
+
+  async getCodeByIds(ids: number[]) {
+    const stock = await getSharesRepository(Stock).findByIds(ids)
+    return stock
+  }
+
   async getByCode(code: string) {
     const stock = await getSharesRepository(Stock).findOne({code})
     return stock

src/daos/StockHistoryDao.ts

@@ -1,18 +1,29 @@
 import { Equal, Like, Between, FindManyOptions} from "typeorm";
-import { StockHistory } from '../entities/mysql/shares/stockHistory'
+import { StockHistory, History } from '../entities/mysql/shares/stockHistory'
 import { getSharesManager, getSharesRepository } from '../database/dbUtils';
 
 
 
 class StockHistoryDao {
 
+  async getLastestTrade(stockId: number) {
+    const lastestTrade = await getSharesRepository(History).findOne({
+      select: ['timestamp'],
+      where: {
+        stockId: Equal(stockId)
+      },
+      order: {
+        timestamp: 'DESC'
+      }
+    })
+    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 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`
 
     const parameters = []
 

src/entities/mysql/shares/stock.ts

@@ -24,4 +24,28 @@ export class Stock {
   @Column()
   amount: number // 单手成交数量
 
+}
+
+
+export class StockDetail extends Stock {
+  constructor(arg: Stock) {
+    super()
+    this.id = arg.id
+    this.name = arg.name
+    this.code = arg.code
+    this.market = arg.market
+    this.block = arg.block
+    this.amount = arg.amount
+    this.lastestTradeAt = 0
+  }
+
+
+  private lastestTradeAt = 0
+
+  get _lastestTradeAt() {
+    return this.lastestTradeAt
+  }
+  set _lastestTradeAt(val) {
+    this.lastestTradeAt = +val
+  }
 }

src/middlewares/catch.ts

@@ -1,7 +1,7 @@
-import * as Koa from 'koa'
+import { Context } from '@core/koa'
 import LogCtrl from '../controllers/LogsController'
 
-export default async (ctx: Koa.Context, next: () => Promise<any>) => {
+export default async (ctx: Context, next: () => Promise<any>) => {
   // console.log('ctx-----------', ctx.header)
   const start = Date.now()
   try {

src/routes/index.ts

@@ -28,6 +28,7 @@ router
   .post('/api/batchShares', SharesCtrl.batchInsert)
   .post('/api/upload', FileCtrl.upload)
   .get('/api/stocks', StockCtrl.pages1)
+  .get('/api/stocks/:id', StockCtrl.getStock)
   .get('/api/stockhistory', StockHistoryCtrl.pages)
   .get('/graphql', KoaGraphql({
     schema: RootSchema,

src/services/StockHistoryService.ts

@@ -8,6 +8,11 @@ import { DateFormat } from "../types/base";
 
 class StockHistoryService {
 
+  async getLastestTrade(stockId: number) {
+    const lastestTrade = await StockHistoryDao.getLastestTrade(stockId)
+    return lastestTrade
+  }
+
   async pages(offset = 1, size = 10, code: string): Promise<[StockHistory[], number]> {
     const stock = await StockService.getByCode(code)
     if(stock) {

src/services/StockService.ts

@@ -1,12 +1,21 @@
 import { Equal, Like, Between, FindManyOptions, FindConditions } from "typeorm";
-import { Stock } from '../entities/mysql/shares/stock'
-import { getSharesManager, getSharesRepository } from '../database/dbUtils';
+import { Stock, StockDetail } from '../entities/mysql/shares/stock'
 import { EMarket, EBLock } from '../models/Stocks'
 import StockDao from '../daos/StockDao'
+import StockHistoryDao from '../daos/StockHistoryDao'
 
 
 class StockService {
 
+  async getCode(id: number) {
+    const stock = await StockDao.getCode(id);
+    const lastestTrade = await StockHistoryDao.getLastestTrade(stock.id)
+    const detail = new StockDetail(stock)
+    console.log(detail, '---------')
+    detail._lastestTradeAt = lastestTrade ? lastestTrade.timestamp : null
+    return detail
+  }
+
   async getByCode(code: string) {
     const stock = await StockDao.getByCode(code);
     return stock