chart

Author: xpioneer

src/controllers/StockController.ts

@@ -142,6 +142,11 @@ class StockController {
     return result
   }
 
+  async getBlocksCount(ctx: Context) {
+    const counts = await StockService.getBlocksCount()
+    ctx.Json({ data: counts })
+  }
+
 }
 
 export default new StockController

src/controllers/StockHistoryController.ts

@@ -169,6 +169,11 @@ class SharesController {
     // }
     return stock
   }
+
+  async getTotal(ctx: Context) {
+    const total = await StockHistoryService.getTotal()
+    ctx.Json(total)
+  }
 }
 
 export default new SharesController

src/daos/StockDao.ts

@@ -2,7 +2,7 @@ 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';
+import { getSharesManager, getSharesRepository, createSharesQueryBuilder } from '../database/dbUtils';
 
 
 
@@ -70,6 +70,12 @@ class StockDao {
     const pages = await getSharesRepository(Stock).findAndCount(options)
     return pages
   }
+
+  async getBlocksCount(): Promise<{total: number, block: EBLock}> {
+    const counts = await createSharesQueryBuilder(Stock, 'groupByBlocks')
+      .select('count(*) as total, block').groupBy('block').execute()
+    return counts
+  }
 }
 
 export default new StockDao

src/daos/StockHistoryDao.ts

@@ -1,11 +1,12 @@
-import { Equal, Like, Between, FindManyOptions} from "typeorm";
+import { Equal, Like, Between, LessThanOrEqual, FindManyOptions} from "typeorm";
 import { StockHistory, History } from '../entities/mysql/shares/stockHistory'
 import { getSharesManager, getSharesRepository } from '../database/dbUtils';
-
-
+import Store, { RedisStore } from "../utils/session/store";
 
 class StockHistoryDao {
 
+  maxCount = -1
+
   async getLastestTrade(stockId: number) {
     const lastestTrade = await getSharesRepository(History).findOne({
       select: ['timestamp'],
@@ -51,6 +52,25 @@ class StockHistoryDao {
     })
     return [list as StockHistory[], total]
   }
+
+  async _getTotal() {
+    const before = Date.now()
+    return getSharesRepository(History).count().then(count => {
+      console.log('get total: ', count)
+      this.maxCount = count
+      return this.maxCount
+    }).then(() => {
+      console.log(`time:${Date.now() - before}ms`)
+    })
+  }
+
+  async getTotal() {
+    if(this.maxCount > 0) {
+      return this.maxCount
+    } else {
+      return await this._getTotal()
+    }
+  }
 }
 
 export default new StockHistoryDao

src/database/conectDB.ts

@@ -1,29 +1,31 @@
-import 'reflect-metadata'
+// import 'reflect-metadata'
 import { createConnection, createConnections, ConnectionOptions } from "typeorm";
-import { BlogConf, SharesConf, MongoConf } from '../../conf/db.conf'
+import { MysqlConf, MongoConf } from '../../conf/db.conf'
 import { Entities, ShareEntities } from '../entities/mysql'
 import { MongoEntities } from '../entities/mongo'
 import { CONNECT_BLOG, CONNECT_MONGO, CONNECT_SHARES } from './dbUtils';
+import stockHistoryDao from '../daos/StockHistoryDao'
 
 const _PROD_ = process.env.NODE_ENV === 'production'
 
 const connectDB = (): Promise<void> => {
   const connectOptions = [
-    {name: CONNECT_BLOG, entities: Entities, database: BlogConf.database},
-    {name: CONNECT_SHARES, entities: ShareEntities, database: SharesConf.database}
+    {name: CONNECT_BLOG, entities: Entities, database: CONNECT_BLOG},
+    {name: CONNECT_SHARES, entities: ShareEntities, database: CONNECT_SHARES}
   ].map<ConnectionOptions>(db => {
     return {
       ...db,
       type     : 'mysql',
-      host     : BlogConf.host,
-      port     : BlogConf.port,
-      username : BlogConf.username,
-      password : BlogConf.password,
+      host     : MysqlConf.host,
+      port     : MysqlConf.port,
+      username : MysqlConf.username,
+      password : MysqlConf.password,
       logging  : _PROD_ ? false : true,
     }
   })
   return createConnections(connectOptions).then((connect) => {
-    console.log(`${connectOptions.length} mysql connected successfully!`)
+    console.log(`${connectOptions.map(c => c.name).join()} ${connectOptions.length} mysql connected successfully!`)
+    stockHistoryDao._getTotal()
   }).catch((err) => {
     console.log('mysql failed to connect!', err)
   })

src/database/dbUtils.ts

@@ -1,4 +1,4 @@
-import {getManager, getRepository, Entity, ObjectType, EntitySchema, getMongoManager} from "typeorm";
+import {getManager, getRepository, ObjectType, EntitySchema, getMongoManager, createQueryBuilder} from "typeorm";
 
 type TConnectName = 'Blog' | 'Shares' | 'Mongo'
 
@@ -41,4 +41,4 @@ export const getSharesManager = () => getManager(CONNECT_SHARES)
 export const getSharesRepository = <Entity>(entity: ObjectType<Entity> | EntitySchema<Entity> | string) => getRepository(entity, CONNECT_SHARES)
 
 
-
+export const createSharesQueryBuilder = <Entity>(entity: ObjectType<Entity> | string, alias = 'queryBuilder') => createQueryBuilder(entity, alias, CONNECT_SHARES)

src/routes/index.ts

@@ -30,6 +30,8 @@ router
   .get('/api/stocks', StockCtrl.pages1)
   .get('/api/stocks/:id', StockCtrl.getStock)
   .get('/api/stockhistory', StockHistoryCtrl.pages)
+  .get('/api/stockhistory/total', StockHistoryCtrl.getTotal)
+  .get('/api/stock/chartCount', StockCtrl.getBlocksCount)
   .get('/graphql', KoaGraphql({
     schema: RootSchema,
     graphql: _PROD_ ? false : true

src/services/StockHistoryService.ts

@@ -52,6 +52,10 @@ class StockHistoryService {
       ]
     }
   }
+
+  async getTotal() {
+    return await StockHistoryDao.getTotal()
+  }
 }
 
 export default new StockHistoryService

src/services/StockService.ts

@@ -40,6 +40,11 @@ class StockService {
     const pages = await StockDao.pages(offset, size, code, name, market, block);
     return pages
   }
+
+  async getBlocksCount() {
+    const counts = await StockDao.getBlocksCount()
+    return counts
+  }
 }
 
 export default new StockService