From 3330f07be4238e2b911c8a864a1e021e8dc0eb28 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Wed, 10 Aug 2022 15:34:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/VideoAccess-VCMP/api/.vscode/launch.json | 2 +- code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js | 2 +- code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/VideoAccess-VCMP/api/.vscode/launch.json b/code/VideoAccess-VCMP/api/.vscode/launch.json index 14736de..2aa9572 100644 --- a/code/VideoAccess-VCMP/api/.vscode/launch.json +++ b/code/VideoAccess-VCMP/api/.vscode/launch.json @@ -16,7 +16,7 @@ "-p 4000", "-f http://localhost:4000", "-g postgres://postgres:123@10.8.30.32:5432/video_access", - "--redisHost 10.8.30.34", + "--redisHost 10.8.30.112", "--redisPort 6379", "--axyApiUrl http://127.0.0.1:4100", "--iotAuthApi http://127.0.0.1:4200", diff --git a/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js b/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js index 2446ea8..7efb877 100644 --- a/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js +++ b/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js @@ -120,7 +120,7 @@ module.exports = function (app, opts) { // camera: cameraIds, } // 离线推送 - console.log('离线推送', pushWay, offArr, onArr, receiver,); + console.log('离线推送', c.pushWay, offArr, onArr, receiver,); if (offArr.length && c.noticeWay && c.noticeWay.includes('offline') && receiver.length) { if (c.pushWay == 'email') { // 邮件 diff --git a/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js b/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js index 612ded3..0151b1e 100644 --- a/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js +++ b/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js @@ -7,7 +7,7 @@ module.exports = function (app, opts) { interval: '0 */4 * * * *', // interval: '*/3 * * * *', // immediate: true, - // proRun: true, + proRun: true, }, async () => { From 043ac8747ef9315e114b5479ecb3410c31bcecd6 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Wed, 10 Aug 2022 16:05:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js b/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js index 0151b1e..4ef7c32 100644 --- a/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js +++ b/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js @@ -4,7 +4,7 @@ const moment = require('moment') module.exports = function (app, opts) { const freshYingshiState = app.fs.scheduleInit( { - interval: '0 */4 * * * *', + interval: '50 */4 * * * *', // interval: '*/3 * * * *', // immediate: true, proRun: true, From 4dcd501d981c8da01a8942e943c53e708eac5bcc Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Wed, 10 Aug 2022 16:12:52 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/app/lib/schedule/cameraStatePush.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js b/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js index 7efb877..4758961 100644 --- a/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js +++ b/code/VideoAccess-VCMP/api/app/lib/schedule/cameraStatePush.js @@ -35,6 +35,7 @@ module.exports = function (app, opts) { const timeNow = moment().startOf('minute').format() for (let c of configRes) { + console.log('上下线推送方式', c.pushWay,); // 查配置信息所对应的摄像头15min内的在离线状态 const cameraIds = c.cameraStatusPushMonitors.map(m => m.cameraId) const offlineStatusRes = await models.CameraStatusOfflineLog.findAll({ @@ -51,7 +52,7 @@ module.exports = function (app, opts) { }], order: [['time', 'ASC']], }) - + console.log('上下线推送路线记录', offlineStatusRes); if (offlineStatusRes.length) { const cameraStatusMap = {} // 当前逻辑 @@ -120,7 +121,8 @@ module.exports = function (app, opts) { // camera: cameraIds, } // 离线推送 - console.log('离线推送', c.pushWay, offArr, onArr, receiver,); + console.log('上下线推送数据', offArr, onArr); + console.log('上下线推送接收', receiver); if (offArr.length && c.noticeWay && c.noticeWay.includes('offline') && receiver.length) { if (c.pushWay == 'email') { // 邮件 From fbc1c407037cf6bb39b4c6dfee7bce02a2fcb533 Mon Sep 17 00:00:00 2001 From: "gao.zhiyuan" Date: Wed, 10 Aug 2022 16:24:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js b/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js index 4ef7c32..7f10c11 100644 --- a/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js +++ b/code/VideoAccess-VCMP/api/app/lib/schedule/freshYingshiMsg.js @@ -10,7 +10,7 @@ module.exports = function (app, opts) { proRun: true, }, async () => { - + console.log('萤石状态查询 ', moment().format('YYYY-MM-DD HH:mm:ss')); try { const startTime = moment() const { models } = app.fs.dc