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

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,

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",

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
+$$

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) => {
             <Form.Select  disabled={recordRow?true:false} field='deviceName' label='设备型号:' placeholder='请选择设备型号' optionList={options}   rules={[{ required: true, message: '设备型号必填' }]}></Form.Select>
             <Form.Input disabled={recordRow?true:false} field='versionNo' label='版本号:'  rules={[{ required: true, message: '版本号必填' }]}></Form.Input>
             <Form.Upload  limit={1}
-                           action={`/_upload/attachments`}
-                           field='files'  label='文件上传'
+               action={`${apiRoot}/attachments/p`}
+               field='files'  label='文件上传'
                            rules={[{ required: true, message: '文件上传必填' }]}
                            onRemove={() => {
                               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
 
     };
  }