diff --git a/api/app/lib/controllers/data/videoCenter.js b/api/app/lib/controllers/data/videoCenter.js index d66f6d60..17af58be 100644 --- a/api/app/lib/controllers/data/videoCenter.js +++ b/api/app/lib/controllers/data/videoCenter.js @@ -38,7 +38,7 @@ function videoList (opts) { }) ctx.status = 200; - ctx.body = (deviceRes.data || []).map(item => { + ctx.body = [] || (deviceRes.data || []).map(item => { return { ...item, token: yingshiToken, diff --git a/api/app/lib/schedule/index.js b/api/app/lib/schedule/index.js new file mode 100644 index 00000000..b976d6d8 --- /dev/null +++ b/api/app/lib/schedule/index.js @@ -0,0 +1,39 @@ +'use strict'; + +const fs = require('fs'); +const nodeSchedule = require('node-schedule'); + +// 将定时任务汇集未来可根据需要选取操作 +module.exports = async function (app, opts) { + + const scheduleInit = ({ + interval, immediate, proRun, disabled + }, callback) => { + if (disabled) { + return; + } + if (proRun && opts.dev) { + return; + } + const j = nodeSchedule.scheduleJob(interval, callback); + if (immediate && (!proRun || (proRun && !opts.dev))) { + setTimeout(callback, 0) + } + return j; + } + + app.fs.scheduleInit = scheduleInit + + fs.readdirSync(__dirname).forEach((filename) => { + if (!['index.js'].some(f => filename == f)) { + const scheduleList = require(`./${filename}`)(app, opts) + for (let k of Object.keys(scheduleList)) { + console.info(`定时任务 ${k} 启动`); + } + app.fs.schedule = { + ...app.fs.schedule, + ...scheduleList, + } + } + }); +}; diff --git a/web/client/src/sections/fillion/nav-item.js b/web/client/src/sections/fillion/nav-item.js index 0449594f..77ccc031 100644 --- a/web/client/src/sections/fillion/nav-item.js +++ b/web/client/src/sections/fillion/nav-item.js @@ -95,10 +95,10 @@ export function getNavItem(user, dispatch) { 考核评分 : ''} - {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'VIDEOCENTER') ? + {/* {user?.username == 'SuperAdmin' || user?.userResources?.some(i => i.resourceId === 'VIDEOCENTER') ? 视频中心 - : ''} + : ''} */} : null ); }