增加接口、逻辑调整

src/functional/mvc/control/spotData.control.ts

+import * as cronApplyService from "../service/spotData.service";
+import { QueryVO } from "../service/spotData.service";
+
+
+let { logger, Res3Utils, optionalUtils: Optional, apiAssertUtils: ApiAssert, datetimeUtils } = require('@madex/ex-js-public');
+
+let isIp = require('is-ip');
+/**
+ * 运营部-现货-现货数据-新增用户
+ * @param req
+ * @param infoVO
+ */
+export const increaseUserList = async (req: any, pageVO: QueryVO) => {
+    let func_name = "spotData.control.increaseUserList";
+    try {
+        //初始化查询参数
+        initParam(pageVO);
+        let res = await cronApplyService.increaseUserList(pageVO);
+        return Res3Utils.result(res);
+    }
+    catch (e) {
+        logger.error(`${func_name} error:${e}`);
+        return Res3Utils.getErrorResult(e);
+    }
+};
+
+/**
+ * 运营部-现货-现货数据-新增用户
+ * @param req
+ * @param infoVO
+ */
+export const tradeUserList = async (req: any, pageVO: QueryVO) => {
+    let func_name = "spotData.control.tradeUserList";
+    try {
+        //初始化查询参数
+        initParam(pageVO);
+        let res = await cronApplyService.tradeUserList(pageVO);
+        return Res3Utils.result(res);
+    }
+    catch (e) {
+        logger.error(`${func_name} error:${e}`);
+        return Res3Utils.getErrorResult(e);
+    }
+};
+
+/**
+ * 运营部-现货-现货数据-活跃用户
+ * @param req
+ * @param infoVO
+ */
+export const activeUserList = async (req: any, pageVO: QueryVO) => {
+    let func_name = "spotData.control.activeUserList";
+    try {
+        //初始化查询参数
+        initParam(pageVO);
+        let res = await cronApplyService.activeUserList(pageVO);
+        return Res3Utils.result(res);
+    }
+    catch (e) {
+        logger.error(`${func_name} error:${e}`);
+        return Res3Utils.getErrorResult(e);
+    }
+};
+
+
+/**
+ * 运营部-现货-现货数据-充值额
+ * @param req
+ * @param infoVO
+ */
+export const userDepositList = async (req: any, pageVO: QueryVO) => {
+    let func_name = "spotData.control.userDepositList";
+    try {
+        //初始化查询参数
+        initParam(pageVO);
+        let res = await cronApplyService.userDepositList(pageVO);
+        return Res3Utils.result(res);
+    }
+    catch (e) {
+        logger.error(`${func_name} error:${e}`);
+        return Res3Utils.getErrorResult(e);
+    }
+};
+
+
+/**
+ * 运营部-现货-现货数据-提现额
+ * @param req
+ * @param infoVO
+ */
+export const userWithdrawList = async (req: any, pageVO: QueryVO) => {
+    let func_name = "spotData.control.userWithdrawList";
+    try {
+        //初始化查询参数
+        initParam(pageVO);
+        let res = await cronApplyService.userWithdrawList(pageVO);
+        return Res3Utils.result(res);
+    }
+    catch (e) {
+        logger.error(`${func_name} error:${e}`);
+        return Res3Utils.getErrorResult(e);
+    }
+};
+
+
+/**
+ * 运营部-现货-现货数据-净充值额
+ * @param req
+ * @param infoVO
+ */
+export const userDepositAndWithdrawList = async (req: any, pageVO: QueryVO) => {
+    let func_name = "spotData.control.userDepositAndWithdrawList";
+    try {
+        //初始化查询参数
+        initParam(pageVO);
+        let res = await cronApplyService.userDepositAndWithdrawList(pageVO);
+        return Res3Utils.result(res);
+    }
+    catch (e) {
+        logger.error(`${func_name} error:${e}`);
+        return Res3Utils.getErrorResult(e);
+    }
+};
+
+
+
+/**
+ * 运营部-现货-现货数据-数据汇总
+ * @param req
+ * @param infoVO
+ */
+export const gatherData = async (req: any, pageVO: QueryVO) => {
+    let func_name = "spotData.control.gatherData";
+    try {
+        //初始化查询参数
+        initParam(pageVO);
+        let res = await cronApplyService.gatherData(pageVO);
+        return Res3Utils.result(res);
+    }
+    catch (e) {
+        logger.error(`${func_name} error:${e}`);
+        return Res3Utils.getErrorResult(e);
+    }
+};
+
+
+
+
+
+
+function initParam(pageVO: QueryVO) {
+    pageVO.page = Optional.opt(pageVO, 'page', 1);
+    pageVO.size = Optional.opt(pageVO, 'size', 20);
+    let now = new Date();
+    let today = datetimeUtils.trim(now, 'd');
+    let yesterday = datetimeUtils.sub(today, datetimeUtils.DAY);
+    if (!pageVO.from_time) {
+        pageVO.from_time = yesterday;
+    }
+    if (!pageVO.to_time) {
+        pageVO.to_time = today;
+    }
+}
+
+
+

src/functional/router/v1/index.ts

@@ -42,9 +42,10 @@ import * as contractMarketMakerCtrl from "../../mvc/control/contractMarketMaker.
 import * as contractLimitTradeCtrl from "../../mvc/control/contractLimitTrade.control";
 import * as contractAgentCtrl from "../../mvc/control/contractAgent.control";
 import * as depositAndWithdrawCtrl from "../../mvc/control/depositAndWithdraw.control";
-import * as coinTypeApplyCtrl from "../../mvc/control/coinTypeApply";
-import * as pairApplyCtrl from "../../mvc/control/pairApply";
-import * as cronApplyCtrl from "../../mvc/control/cronApply";
+import * as coinTypeApplyCtrl from "../../mvc/control/coinTypeApply.control";
+import * as pairApplyCtrl from "../../mvc/control/pairApply.control";
+import * as cronApplyCtrl from "../../mvc/control/cronApply.control";
+import * as spotDataCtrl from "../../mvc/control/spotData.control";
 
 const getFunc = {
     'user/info': userController.getUserInfo,
@@ -255,7 +256,14 @@ const postFunc = {
     //'tech/apply/new/cron/pair/add/hide': cronApplyCtrl.addHide,//TODO:增加隐藏交易对定时器 原来有 is_active  is_hide 的逻辑 现在spot_pairs 没有相关字段 ？？？
     'tech/apply/new/cron/coin/add/deposit': cronApplyCtrl.addDeposit,//增加新币充值定时器
     'tech/apply/new/cron/coin/add/withdraw': cronApplyCtrl.addWithdraw,//增加新币提现定时器
-
+    //运营部-现货-现货数据
+    'operate/spot/data/increase/user/list': spotDataCtrl.increaseUserList,
+    'operate/spot/data/trade/user/list':spotDataCtrl.tradeUserList,//TODO
+    'operate/spot/data/active/user/list':spotDataCtrl.activeUserList,
+    'operate/spot/data/user/deposit/list':spotDataCtrl.userDepositList,
+    'operate/spot/data/user/withdraw/list':spotDataCtrl.userWithdrawList,
+    'operate/spot/data/user/depositAndWithdraw/list':spotDataCtrl.userDepositAndWithdrawList,
+    'operate/spot/data/user/gatherData':spotDataCtrl.gatherData,
 };
 
 // TODO 这里先和 nodejs 的注册路由方式保持一样，后面在调整。

src/setting/access-limit.ts

 'use strict';
 import * as ReqUtils from "../utils/req-utils";
-import * as pairApplyCtrl from "../functional/mvc/control/pairApply";
+import * as pairApplyCtrl from "../functional/mvc/control/pairApply.control";
 
 const {
     Res3Utils,
@@ -201,6 +201,14 @@ let cmdWhiteList = {
     'tech/apply/new/cron/delete': 1,
     'tech/apply/new/cron/coin/add/deposit': 1,
     'tech/apply/new/cron/coin/add/withdraw': 1,
+    //运营部-现货-现货数据
+    'operate/spot/data/increase/user/list': 1,
+    'operate/spot/data/trade/user/list': 1,
+    'operate/spot/data/active/user/list': 1,
+    'operate/spot/data/user/deposit/list': 1,
+    'operate/spot/data/user/withdraw/list': 1,
+    'operate/spot/data/user/depositAndWithdraw/list': 1,
+    'operate/spot/data/user/gatherData': 1,
 };