Merge remote-tracking branch 'origin/main' into lichang

This commit is contained in:
TsMask
2024-04-30 20:21:58 +08:00
34 changed files with 533 additions and 275 deletions

View File

@@ -0,0 +1,40 @@
/*
Navicat Premium Data Transfer
Source Server : root@192.168.2.166
Source Server Type : MariaDB
Source Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1)
Source Host : 192.168.2.166:33066
Source Schema : omc_db
Target Server Type : MariaDB
Target Server Version : 100616 (10.6.16-MariaDB-0ubuntu0.22.04.1)
File Encoding : 65001
Date: 26/04/2024 17:20:44
*/
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for kpi_report
-- ----------------------------
CREATE TABLE IF NOT EXISTS `kpi_report` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`ne_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '',
`rm_uid` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`date` date NOT NULL,
`start_time` time NULL DEFAULT NULL,
`end_time` time NULL DEFAULT NULL,
`index` smallint(6) NOT NULL,
`granularity` tinyint(4) NULL DEFAULT 60 COMMENT 'Time granualarity: 5/10/.../60/300 (second)',
`kpi_values` text CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
`created_at` bigint(20) NULL DEFAULT NULL,
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx_timestamp`(`created_at`) USING BTREE,
INDEX `idx_uid_datetime`(`rm_uid`, `date`, `start_time`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 10660 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1;

View File

@@ -335,4 +335,10 @@ VALUES (
'job.genNeStateAlarmRemark'
);
UPDATE `omc_db`.`sys_job`
SET
`target_params` = '{\"duration\":1,\"tableName\":\"ne_state\",\"colName\":\"timestamp\"}'
WHERE
`job_id` = 8;
SET FOREIGN_KEY_CHECKS = 1;

View File

@@ -704,7 +704,7 @@ SET
`is_frame` = '1',
`is_cache` = '1',
`menu_type` = 'M',
`visible` = '1',
`visible` = '0',
`status` = '1',
`perms` = 'perfManage:taskManage:index',
`icon` = 'icon-wofaqi',
@@ -726,7 +726,7 @@ SET
`is_frame` = '1',
`is_cache` = '1',
`menu_type` = 'M',
`visible` = '1',
`visible` = '0',
`status` = '1',
`perms` = 'perfManage:perfData:index',
`icon` = 'icon-soutubiao',
@@ -748,7 +748,7 @@ SET
`is_frame` = '1',
`is_cache` = '0',
`menu_type` = 'M',
`visible` = '1',
`visible` = '0',
`status` = '1',
`perms` = 'perfManage:perfThreshold:index',
`icon` = 'icon-zhuanrang',

View File

@@ -186,4 +186,7 @@ ALTER TABLE `omc_db`.`mml_system`
ADD COLUMN IF NOT EXISTS `object_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'mml' AFTER `mml_display`;
ALTER TABLE `omc_db`.`ne_state`
MODIFY COLUMN `expiry_date` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '-' AFTER `serial_num`;
MODIFY COLUMN `expiry_date` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '-' AFTER `serial_num`;
ALTER TABLE `omc_db`.`alarm_forward_log`
ADD COLUMN IF NOT EXISTS `interface` varchar(16) NULL AFTER `event_time`;