Merge branch 'dev' of https://gitea.anxinyun.cn/gao.zhiyuan/OperationalService into dev

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

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
                }