marge: 合并代码

lib/dborm/dborm.go

@@ -298,7 +298,40 @@ func XormGetNeInfoByNeType(neType string, nes *[]NeInfo) error {
 		}
 		*nes = append(*nes, *ne)
 	}
-	log.Debug("nes:", nes)
+
+	return nil
+}
+
+func XormGetNeInfo2(neType string, neIDs []string, nes *[]NeInfo) error {
+	log.Info("XormGetNeInfo2 processing... ")
+
+	ne := new(NeInfo)
+	var rows *xorm.Rows
+	var err error
+	if len(neIDs) == 0 {
+		rows, err = xEngine.Table("ne_info").
+			Where("status in ('0','3') and ne_type=?", neType).
+			Rows(ne)
+	} else {
+		rows, err = xEngine.Table("ne_info").
+			In("ne_id", neIDs).
+			And("status in ('0','3') and ne_type=?", neType).
+			Rows(ne)
+	}
+	if err != nil {
+		log.Error("Failed to get table ne_info from database:", err)
+		return err
+	}
+	defer rows.Close()
+	for rows.Next() {
+		err := rows.Scan(ne)
+		if err != nil {
+			log.Error("Failed to get table ne_info from database:", err)
+			return err
+		}
+		*nes = append(*nes, *ne)
+	}
+
 	return nil
 }
 
@@ -1350,7 +1383,7 @@ func XormGetTableRows(tableName string, where string, tbInfo *[]interface{}) (*[
 		}
 		*tbInfo = append(*tbInfo, row)
 	}
-	log.Debug("tbInfo:", tbInfo)
+	log.Trace("tbInfo:", tbInfo)
 	return tbInfo, nil
 }
 
@@ -1396,7 +1429,7 @@ func XormGetDataBySQL(sql string) (*[]map[string]string, error) {
 	rows := make([]map[string]string, 0)
 	rows, err := DbClient.XEngine.QueryString(sql)
 	if err != nil {
-		log.Errorf("Failed to QueryString:", err)
+		log.Error("Failed to QueryString:", err)
 		return nil, err
 	}
 
@@ -1410,7 +1443,7 @@ func XormDeleteDataByWhere(where, table string) (int64, error) {
 	defer xSession.Close()
 	affected, err := xSession.Table(table).Where(where).Delete()
 	if err != nil {
-		log.Errorf("Failed to Delete:", err)
+		log.Error("Failed to Delete:", err)
 		return 0, err
 	}
 	xSession.Commit()

lib/global/kits.go

@@ -391,6 +391,27 @@ func GetSecondsSinceDatetime(datetimeStr string) (int64, error) {
 	return seconds, nil
 }
 
+func GetSecondDuration(time1, time2 string) (int64, error) {
+	loc1, _ := time.LoadLocation("Local")
+	// 解析日期时间字符串为时间对象
+	t1, err := time.ParseInLocation(time.DateTime, time1, loc1)
+	if err != nil {
+		return 0, err
+	}
+	t2, err := time.ParseInLocation(time.DateTime, time2, loc1)
+	if err != nil {
+		return 0, err
+	}
+
+	// 计算时间差
+	duration := t2.Sub(t1)
+
+	// 获取时间差的秒数
+	seconds := int64(duration.Seconds())
+
+	return seconds, nil
+}
+
 // 0: invalid ip
 // 4: IPv4
 // 6: IPv6

lib/routes/routes.go

@@ -303,6 +303,9 @@ func init() {
 	Register("POST", cdr.UriCDREvent, cdr.PostCDREventFromNF, nil)
 	Register("POST", cdr.CustomUriCDREvent, cdr.PostCDREventFromNF, nil)
 
+	// UE event
+	//Register("POST", event.UriUEEvent, event.PostUEEventFromAMF, nil)
+
 	// 进程网络
 	Register("GET", psnet.UriWs, psnet.ProcessWs, nil)
 	Register("POST", psnet.UriStop, psnet.StopProcess, nil)