Browse Source

Merge remote-tracking branch 'origin/develop' into develop

lijie 3 years ago
parent
commit
048a4c7500

+ 0 - 6
dmp-business/dmp-dic/pom.xml

@@ -34,11 +34,5 @@
             <groupId>com.persagy</groupId>
             <artifactId>dmp-digital-starter</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.persagy</groupId>
-            <artifactId>dmp-rwd</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>

+ 4 - 4
dmp-business/dmp-dic/src/main/resources/db/init/data.sql

@@ -30,11 +30,11 @@ replace into `dic_dt_data` ( `id`, `label`, `valid`, `parent_id`, `dict_type_id`
 ( '1f216cf4-7c94-4b66-a13b-f419f529e20c', '真实报警', '1', '', '63d30019-c958-4693-90e9-effa2261ddd0', null, 'alarm_nature', '2', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( '234b85ba-508b-4993-a871-f027eb1e09f0', '环境报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Env', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( '28a0d1c564b94a848e5c8d3e49db545c', 'IBMS_U3D', '1', '', 'b4fb854e-ab10-4f6b-8934-933ec5ced571', null, 'PRODUCT', 'IBMS_U3D', null, '关联达产品线-U3D端', null, '2021-08-09 09:50:13', null, '0'),
-( '35818e94-064d-80c7-41fa-38cfffc30bb1', '租户报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Safe', null, '', null, '2021-08-09 09:50:13', null, '0'),
+( '35818e94-064d-80c7-41fa-38cfffc30bb1', '租户报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Tenant', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( '3739f6b1-ef9e-443f-a586-3d60f39d5d55', '女', '1', '', 'b3fda223-4d82-48ab-b36b-ed5471eb5ea4', null, 'sex', '0', null, '性别-女', null, '2021-08-09 09:50:13', null, '0'),
 ( '3d0706d5-15c0-44b4-90a4-8dba1073a4a3', '设备报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Eq', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( '4368e25e4eee4e90a4dc91daf4e6b768', '模式管理', '1', '', '0194b530b70e4997973027934db58ee5', null, 'functionLog', 'modelManagement', null, '', null, '2021-08-09 09:50:13', null, '0'),
-( '46494192-8928-0584-f97f-82dd9c590ec6', '配电报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Safe', null, '', null, '2021-08-09 09:50:13', null, '0'),
+( '46494192-8928-0584-f97f-82dd9c590ec6', '配电报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Electric', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( '58307329-c9d9-4014-b10f-f51d6004ec1f', '转工单', '1', '', 'f37caad0-6137-428a-af0b-7ea0a2d51e3b', null, 'alarm_treat_mode', '2', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( '5accec9c-6e4f-467d-bfff-172d8413409d', '已忽略', '1', '', '7781b335-129b-443b-a6e7-e360b14cde3b', null, 'alarm_treat_state', '4', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( '5adaad02-ec80-4d63-bf6e-ff3ed641f3d2', '低', '1', '', '2000f980-fcf3-4a43-bce4-c229f45a1e6f', null, 'alarm_level', '3', null, '', null, '2021-08-09 09:50:13', null, '0'),
@@ -45,8 +45,8 @@ replace into `dic_dt_data` ( `id`, `label`, `valid`, `parent_id`, `dict_type_id`
 ( '7680623a-202e-487d-814a-bdaded5bf8e5', '已恢复', '1', '', '717b2d89-b0dd-4969-88e2-0cb76bba0c97', null, 'alarm_state', '2', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( '8edc7bbb4ef24e0a880bf16f328b5884', '用户管理', '1', '', '0194b530b70e4997973027934db58ee5', null, 'functionLog', 'userManagement', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( '90b2fa452d3549d7b253785c9723eb08', '通用报警定义表头', '1', '', '0ae529c8a8ea489abf74463f73f20fbd', null, 'alarmConfigFields', 'general2', null, ' {\"itemCode\":\"报警类型编码\",\"itemName\":\"报警类型名称\"}', null, '2021-08-09 09:50:13', null, '1'),
-( '9bee97c1-6b6c-f872-7ce6-856231209063', '能源报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Safe', null, '', null, '2021-08-09 09:50:13', null, '0'),
-( 'a1aff428-5cd5-edd8-2148-fd955388368c', 'BIM报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Safe', null, '', null, '2021-08-09 09:50:13', null, '0'),
+( '9bee97c1-6b6c-f872-7ce6-856231209063', '能源报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Energy', null, '', null, '2021-08-09 09:50:13', null, '0'),
+( 'a1aff428-5cd5-edd8-2148-fd955388368c', 'BIM报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Bim', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( 'a27c2bc4-340b-4d7d-8b3b-5affa4b783b5', '空间报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Sp', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( 'a4c43fad-735a-4d2a-8436-3d7532c845e3', '系统报警', '1', '', 'dae4fca7-65ec-475a-9a6f-22445474e4fa', null, 'alarm_category', 'Sy', null, '', null, '2021-08-09 09:50:13', null, '0'),
 ( 'bb62d7de720448fd827becf853df6f3f', '报警处理', '1', '', '0194b530b70e4997973027934db58ee5', null, 'functionLog', 'alarmDealWith', null, '', null, '2021-08-09 09:50:13', null, '5'),