Merge branch 'main' of http://192.168.0.229:3180/OMC/ems_backend

features/dbrest/dbrest.go

@@ -109,19 +109,35 @@ func InitDbClient(dbType, dbUser, dbPassword, dbHost, dbPort, dbName string) err
 }
 
 func GetUriSQLArray(r *http.Request) []string {
+	var sa []string
 	vars := r.URL.Query()
-	s, ok := vars["SQL"]
+
-	if !ok {
+	// 默认SQL
-		log.Info("SQL is not exist")
+	if s, ok := vars["SQL"]; ok {
-		return nil
+		for _, r := range s {
+			if r != "" {
+				sa = append(sa, r)
+			}
+		}
 	}
 
-	var sa []string
+	// 查询总数
-	for _, r := range s {
+	if totalSQL, ok := vars["totalSQL"]; ok {
-		if r != "" {
+		if totalSQL[0] != "" {
-			sa = append(sa, r)
+			sa = append(sa, totalSQL[0])
 		}
 	}
+	// 查询列表
+	if rowsSQL, ok := vars["rowsSQL"]; ok {
+		if rowsSQL[0] != "" {
+			sa = append(sa, rowsSQL[0])
+		}
+	}
+
+	if len(sa) == 0 {
+		log.Info("SQL is not exist")
+		return nil
+	}
 
 	log.Debug("SQL array:", sa)
 	return sa