From 7c8661e9923a501503f70352cb654654b69e883f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zhaobing=E2=80=99?= Date: Wed, 1 Nov 2023 11:40:37 +0800 Subject: [PATCH 1/4] feat:fix bugs --- api/config.js | 7 ++++++- .../firmwareUpgrade/components/addFirmwareModal.jsx | 9 +++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/api/config.js b/api/config.js index efd6e63..372508b 100644 --- a/api/config.js +++ b/api/config.js @@ -151,6 +151,9 @@ const ANXINCLOUD_ES_NODES_REST = process.env.ANXINCLOUD_ES_NODES_REST || flags.e // //business_key // const BUSINESS_KEY=process.env.BUSINESS_KEY||['160','161'] +//文件上传类型限制（主要是固件升级上传固件包） +const TYPES= process.env.TYPES&&process.env.TYPES.split(',')||['.bin'] + const requireParams = { FS_CAMUNDA_HOST, FS_CAMUNDA_ROOT, POMS_DB, @@ -168,7 +171,8 @@ const requireParams = { CONFIRM_ALARM_ANXIN_USER_ID, VCMP_APP_ID, VCMP_APP_SECRET, API_CRAW_URL, - // CLICKHOUST_DATA_ALARM_LOCAL + // CLICKHOUST_DATA_ALARM_LOCAL, + TYPES } Object.keys(requireParams).forEach(key => { @@ -193,6 +197,7 @@ const product = { secretKey: QINIU_SK }, maxSize: 104857600, // 100M + types:TYPES } }, { entry: require('./app').entry, diff --git a/web/client/src/sections/firmwareUpgrade/components/addFirmwareModal.jsx b/web/client/src/sections/firmwareUpgrade/components/addFirmwareModal.jsx index 9f9ec35..20de846 100644 --- a/web/client/src/sections/firmwareUpgrade/components/addFirmwareModal.jsx +++ b/web/client/src/sections/firmwareUpgrade/components/addFirmwareModal.jsx @@ -6,7 +6,7 @@ import { IconUpload,IconVigoLogo } from '@douyinfe/semi-icons'; import request from 'superagent'; const AddFirmwareModal = (props) => { - const {modalVis,onCancel,crawapi,recordRow,actions,dispatch,qiniu} =props + const {modalVis,onCancel,crawapi,recordRow,actions,dispatch,qiniu,apiRoot} =props const api = useRef(); const {domain}=qiniu //七牛服务器地址 const {firmwareUpgrade}=actions @@ -113,14 +113,14 @@ const AddFirmwareModal = (props) => { { setUploadData({}) setRemoveFlag(true) }} - accept={'.bin'} + // accept={'.txt, .doc, .docx, .xls, .xlsx, .pdf, .png, .jpg, .rar, .zip, .bin'} onSuccess={(responseBody, file,all) => { // console.log('file111',file) setFileObj(file) @@ -154,6 +154,7 @@ function mapStateToProps (state) { actions: global.actions, crawapi: global.crawapi, qiniu:global.qiniu, + apiRoot: global.apiRoot }; } From 54b42769ed4a8fbd4a273066181c56d7f20b7baa Mon Sep 17 00:00:00 2001 From: lucas2 Date: Wed, 1 Nov 2023 13:58:23 +0800 Subject: [PATCH 2/4] =?UTF-8?q?add=20=E6=B7=BB=E5=8A=A0=E8=BF=90=E7=BB=B4?= =?UTF-8?q?=E4=B8=AD=E5=8F=B0=20=E5=BC=82=E5=B8=B8=E8=AF=86=E5=88=AB=20?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=E7=A0=81=E7=9B=B8=E5=85=B3=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/3.5/schema/1.add_alarm_code.sql | 54 ++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 script/3.5/schema/1.add_alarm_code.sql diff --git a/script/3.5/schema/1.add_alarm_code.sql b/script/3.5/schema/1.add_alarm_code.sql new file mode 100644 index 0000000..46e5474 --- /dev/null +++ b/script/3.5/schema/1.add_alarm_code.sql @@ -0,0 +1,54 @@ +DO +$$ +BEGIN + + +INSERT INTO t_alarm_group_unit("id","name", "group_id") VALUES (47,'数据中断', 1); --group=1数据中断 +INSERT INTO t_alarm_group_unit("id","name", "group_id") VALUES (48,'数据异常趋势', 3); --group=3策略命中 +INSERT INTO t_alarm_group_unit("id","name", "group_id") VALUES (49,'数据毛刺', 3); --group=3策略命中 + + +-- 添加[异常识别]告警类型 + IF NOT EXISTS(SELECT 1 FROM t_alarm_type WHERE name='数据中断' AND code='3020' ) + THEN + INSERT INTO t_alarm_type (code, name,description,category,enabled,alarm_group,alarm_group_unit,advice_problem) VALUES ('3020','数据中断','数据中断',1,true, + 1,(select id from "t_alarm_group_unit" where name='数据中断' LIMIT 1),'非软件处理'); + END IF; + + IF NOT EXISTS(SELECT 1 FROM t_alarm_code WHERE name='数据中断' AND type_code='30200001' ) + THEN + INSERT INTO t_alarm_code (code, name,type_code,level,enable,alarm_group,alarm_group_unit,advice_problem) VALUES ('30200001','数据中断','3020',1,true, + 1,(select id from "t_alarm_group_unit" where name='数据中断' LIMIT 1),'非软件处理'); + END IF; + +-- 添加[数据异常趋势]告警类型 + IF NOT EXISTS(SELECT 1 FROM t_alarm_type WHERE name='数据异常趋势' AND code='3021' ) + THEN + INSERT INTO t_alarm_type (code, name,description,category,enabled,alarm_group,alarm_group_unit,advice_problem) VALUES ('3021','数据异常趋势','数据异常趋势',1,true, + 3,(select id from "t_alarm_group_unit" where name='数据异常趋势' LIMIT 1),'非软件处理'); + END IF; + + + IF NOT EXISTS(SELECT 1 FROM t_alarm_code WHERE name='数据异常趋势' AND type_code='3021' ) + THEN + INSERT INTO t_alarm_code (code, name,type_code,level,enable,alarm_group,alarm_group_unit,advice_problem) VALUES ('30210001','数据异常趋势','3021',1,true, + 1,(select id from "t_alarm_group_unit" where name='数据异常趋势' LIMIT 1),'非软件处理'); + END IF; + + +-- 添加[数据毛刺]告警类型 + IF NOT EXISTS(SELECT 1 FROM t_alarm_type WHERE name='数据毛刺' AND code='3022' ) + THEN + INSERT INTO t_alarm_type (code, name,description,category,enabled,alarm_group,alarm_group_unit,advice_problem) VALUES ('3022','数据毛刺','数据毛刺',1,true, + 3,(select id from "t_alarm_group_unit" where name='数据毛刺' LIMIT 1),'非软件处理'); + END IF; + + + IF NOT EXISTS(SELECT 1 FROM t_alarm_code WHERE name='数据毛刺' AND type_code='3022' ) + THEN + INSERT INTO t_alarm_code (code, name,type_code,level,enable,alarm_group,alarm_group_unit,advice_problem) VALUES ('30220001','数据毛刺','3022',1,true, + 1,(select id from "t_alarm_group_unit" where name='数据毛刺' LIMIT 1),'非软件处理'); + END IF; + +END +$$ \ No newline at end of file From 519955cbe956d3fb7248e0597adcbba18a412ea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?zhaobing=E2=80=99?= Date: Wed, 1 Nov 2023 14:54:27 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/package.json b/api/package.json index 7722899..32976b7 100644 --- a/api/package.json +++ b/api/package.json @@ -14,7 +14,7 @@ "repository": {}, "dependencies": { "@alicloud/pop-core": "^1.7.12", - "@fs/attachment": "^1.0.0", + "@fs/attachment": "^1.1.0", "args": "^3.0.7", "better-xlsx": "^0.7.6", "clickhouse": "^2.6.0", From 4f9b08e1626a785af05c7cacb347d1b3eae1032c Mon Sep 17 00:00:00 2001 From: lucas2 Date: Wed, 1 Nov 2023 17:40:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?update=20=E6=8C=89=E7=85=A7=E4=BC=9F?= =?UTF-8?q?=E6=96=87=E6=8C=87=E5=AF=BC=20=E4=BF=AE=E6=94=B9type=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/3.5/schema/1.add_alarm_code.sql | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/script/3.5/schema/1.add_alarm_code.sql b/script/3.5/schema/1.add_alarm_code.sql index 46e5474..a32ccca 100644 --- a/script/3.5/schema/1.add_alarm_code.sql +++ b/script/3.5/schema/1.add_alarm_code.sql @@ -9,9 +9,9 @@ INSERT INTO t_alarm_group_unit("id","name", "group_id") VALUES (49,'数据毛刺 -- 添加[异常识别]告警类型 - IF NOT EXISTS(SELECT 1 FROM t_alarm_type WHERE name='数据中断' AND code='3020' ) + IF NOT EXISTS(SELECT 1 FROM t_alarm_type WHERE name='识别到数据异常中断，产生告警，并已将告警信息推送至运维服务工程师。' AND code='3020' ) THEN - INSERT INTO t_alarm_type (code, name,description,category,enabled,alarm_group,alarm_group_unit,advice_problem) VALUES ('3020','数据中断','数据中断',1,true, + INSERT INTO t_alarm_type (code, name,description,category,enabled,alarm_group,alarm_group_unit,advice_problem) VALUES ('3020','识别到数据异常中断，产生告警，并已将告警信息推送至运维服务工程师。','数据中断',1,true, 1,(select id from "t_alarm_group_unit" where name='数据中断' LIMIT 1),'非软件处理'); END IF; @@ -22,9 +22,9 @@ INSERT INTO t_alarm_group_unit("id","name", "group_id") VALUES (49,'数据毛刺 END IF; -- 添加[数据异常趋势]告警类型 - IF NOT EXISTS(SELECT 1 FROM t_alarm_type WHERE name='数据异常趋势' AND code='3021' ) + IF NOT EXISTS(SELECT 1 FROM t_alarm_type WHERE name='识别到数据异常趋势，产生告警，并已将告警信息推送至运维服务工程师。' AND code='3021' ) THEN - INSERT INTO t_alarm_type (code, name,description,category,enabled,alarm_group,alarm_group_unit,advice_problem) VALUES ('3021','数据异常趋势','数据异常趋势',1,true, + INSERT INTO t_alarm_type (code, name,description,category,enabled,alarm_group,alarm_group_unit,advice_problem) VALUES ('3021','识别到数据异常趋势，产生告警，并已将告警信息推送至运维服务工程师。','数据异常趋势',1,true, 3,(select id from "t_alarm_group_unit" where name='数据异常趋势' LIMIT 1),'非软件处理'); END IF; @@ -37,9 +37,9 @@ INSERT INTO t_alarm_group_unit("id","name", "group_id") VALUES (49,'数据毛刺 -- 添加[数据毛刺]告警类型 - IF NOT EXISTS(SELECT 1 FROM t_alarm_type WHERE name='数据毛刺' AND code='3022' ) + IF NOT EXISTS(SELECT 1 FROM t_alarm_type WHERE name='识别到数据异常毛刺，产生告警，并已将告警信息推送至运维服务工程师。' AND code='3022' ) THEN - INSERT INTO t_alarm_type (code, name,description,category,enabled,alarm_group,alarm_group_unit,advice_problem) VALUES ('3022','数据毛刺','数据毛刺',1,true, + INSERT INTO t_alarm_type (code, name,description,category,enabled,alarm_group,alarm_group_unit,advice_problem) VALUES ('3022','识别到数据异常毛刺，产生告警，并已将告警信息推送至运维服务工程师。','数据毛刺',1,true, 3,(select id from "t_alarm_group_unit" where name='数据毛刺' LIMIT 1),'非软件处理'); END IF;