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()