From a870f7c8ecdc3d2c8c47d44a98cd64a7bd03f192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zhaobing=E2=80=99?= Date: Thu, 26 Oct 2023 14:34:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=E6=B7=BB=E5=8A=A0FS-RTU-P4-SL?= =?UTF-8?q?=EF=BC=8CFS-RTU-SL=E4=B8=A4=E7=A7=8D=E8=AE=BE=E5=A4=87=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/controllers/firmwareUpgrade/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/app/lib/controllers/firmwareUpgrade/index.js b/api/app/lib/controllers/firmwareUpgrade/index.js index 3f0efe6..57be0ba 100644 --- a/api/app/lib/controllers/firmwareUpgrade/index.js +++ b/api/app/lib/controllers/firmwareUpgrade/index.js @@ -22,7 +22,7 @@ async function getDeviceType (ctx) { const { clickHouse } = ctx.app.fs const rlst = await clickHouse.iot.query(` SELECT id,model FROM DeviceMeta - WHERE model in ('FS-YTSW','FS-YTDZ-GD','FS-iFWL-ZXSJ','ZSJ-iVW08','FS-Q90-NHB1-HC','FS-RTU-P4-SL','FS-RTU-SL','FS-V08','FS-M24','FS-LPWAN08') + WHERE model in ('FS-YTSW','FS-YTDZ-GD','FS-iFWL-ZXSJ','ZSJ-iVW08','FS-Q90-NHB1-HC','FS-RTU-P4-SL','FS-RTU-SL','FS-V08','FS-M24','FS-LPWAN08','FS-RTU-SL','FS-RTU-P4-SL') `).toPromise() ctx.body=rlst||[] ctx.status=200 From dca730749b7ace05a3098c521ba7efc04a07dbee Mon Sep 17 00:00:00 2001 From: CODE <1650192445@qq.com> Date: Thu, 26 Oct 2023 16:01:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=8F=B0=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/app/lib/schedule/alarms_push.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/api/app/lib/schedule/alarms_push.js b/api/app/lib/schedule/alarms_push.js index e83c8b1..2a2613b 100644 --- a/api/app/lib/schedule/alarms_push.js +++ b/api/app/lib/schedule/alarms_push.js @@ -28,9 +28,9 @@ module.exports = function (app, opts) { const { pushBySms, pushByEmail, sendNoticeToWeb } = app.fs.utils const curMinOfYear = moment().diff(moment().startOf('year'), 'minutes') - const pLog = (msg1, msg2) => { + const pLog = (...msg) => { if (proDebug) { - console.log(msg1, msg2) + console.log(msg) } } @@ -105,7 +105,7 @@ module.exports = function (app, opts) { pLog(`curMinOfYear / ${curMinOfYear}`) for (let { dataValues: c } of configListRes) { - if (isDev && c.id != 95) { + if (isDev && c.id != 86) { continue }