OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

alarm

Browse Source
This commit is contained in:
simonzhangsz
2023-08-15 23:00:27 +08:00
parent 8e0d32f05d
commit e1a78c7937
5 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
database/upgrade/upgrade.sql
View File

@@ -12,4 +12,6 @@ MODIFY COLUMN `user_expiration` date NULL DEFAULT NULL AFTER `status`;
ALTER TABLE `omc_db`.`config` ALTER TABLE `omc_db`.`config`
ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `update_time`; ADD COLUMN IF NOT EXISTS `comment` varchar(255) NULL AFTER `update_time`;
ALTER TABLE `omc_db`.`nbi_operation_log` ALTER TABLE `omc_db`.`nbi_operation_log`
MODIFY COLUMN `created_at` datetime NULL DEFAULT NULL AFTER `log_time`; MODIFY COLUMN `created_at` datetime NULL DEFAULT NULL AFTER `log_time`;
ALTER TABLE `omc_db`.`permission`
ADD COLUMN IF NOT EXISTS `management` varchar(32) NULL DEFAULT '*' AFTER `method`;

9
features/fm/alarm.go
View File

@@ -341,8 +341,8 @@ func PostAlarmFromNF(w http.ResponseWriter, r *http.Request) {
var currentSeq string var currentSeq string
has, err = xEngine.Table("alarm"). has, err = xEngine.Table("alarm").
Where("ne_type=? and ne_id=?", alarmData.NeType, alarmData.NeId). Where("ne_type=? and ne_id=?", alarmData.NeType, alarmData.NeId).
//Desc("alarm_seq"). Desc("alarm_seq").
Desc("event_time"). //Desc("event_time").
Cols("alarm_seq"). Cols("alarm_seq").
Limit(1). Limit(1).
Get(&currentSeq) Get(&currentSeq)
@@ -575,6 +575,7 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
// for alarm forward time format // for alarm forward time format
alarmData.EventTime = eventTime alarmData.EventTime = eventTime
} else { } else {
activeAlarmNum++
has, err := xEngine.Table("alarm"). has, err := xEngine.Table("alarm").
Where("alarm_id=? and ne_type=? and ne_id=? and alarm_status=1", Where("alarm_id=? and ne_type=? and ne_id=? and alarm_status=1",
alarmData.AlarmId, alarmData.NeType, alarmData.NeId). alarmData.AlarmId, alarmData.NeType, alarmData.NeId).
@@ -587,8 +588,8 @@ func GetAlarmFromNF(w http.ResponseWriter, r *http.Request) {
var currentSeq string var currentSeq string
has, err = xEngine.Table("alarm"). has, err = xEngine.Table("alarm").
Where("ne_type=? and ne_id=?", alarmData.NeType, alarmData.NeId). Where("ne_type=? and ne_id=?", alarmData.NeType, alarmData.NeId).
//Desc("alarm_seq"). Desc("alarm_seq").
Desc("event_time"). //Desc("event_time").
Cols("alarm_seq"). Cols("alarm_seq").
Limit(1). Limit(1).
Get(&currentSeq) Get(&currentSeq)

4
restagent/config/config.go
View File

@@ -292,8 +292,8 @@ const defaultConfigFile = "./etc/restconf.yaml"
func init() { func init() {
cfile := flag.String("c", defaultConfigFile, "config file") cfile := flag.String("c", defaultConfigFile, "config file")
pv := flag.Bool("v", false, "print version") pv := flag.Bool("version", false, "print version")
ph := flag.Bool("h", false, "print help") ph := flag.Bool("help", false, "print help")
global.BuildTime = "Wed May 31 18:24:04 CST 2023" global.BuildTime = "Wed May 31 18:24:04 CST 2023"
global.GoVer = "go version go1.15.7 linux/arm64" global.GoVer = "go version go1.15.7 linux/arm64"

0
tools/casign/ca_cert - 副本.pem → tools/casign/ca.cer
View File

8
tools/casign/public.cer Normal file
View File

@@ -0,0 +1,8 @@
-----BEGIN RSA PUBLIC KEY-----
MIIBCgKCAQEAlE3BYk9Rk2avUTik7lpuiHxbYTusrLYRCnr8JICRg0QsBfiuq8d4
+4s0w3y5F7puTj23Hf8ohAeNGK6vV9nJF9utMRvT4w5hlGqvKubM2vORoNoa1usI
ixfcvMmCt/7++9endMurLY7e9aR+eeEffJtMx5G5JqxRGoFkeXBKFTOjD2adsHQ5
zhQQUYgdQa2xzKQBYiierKKptcoVMAnnkfx7NPSRfCnzhYVeKgBFbxNXL4h7nAhL
ywWhusQc2yr2Fdojj7urtqPNfMKYapkmWKI9/zuPxMlYL49VXUqppE0rnYoiISwG
vP9iSq1tb+8BUI0ZMDcHX4elEeZYiFMJOwIDAQAB
-----END RSA PUBLIC KEY-----