|
|
@@ -230,18 +230,17 @@ func (c *CheckAreaMgr) GetIedList(scdid int64, areaid int) ([]orm.Params, error)
|
|
|
} else {
|
|
|
scdNode := new(ScdNode)
|
|
|
|
|
|
- for _, row := range rowset {
|
|
|
- iedid, _ := strconv.ParseInt(tools.IsEmpty(row["ied_name"]), 10, 64)
|
|
|
- iedObj := scdNode.GetIedByID(scdXmlObj, tools.IsEmpty(scdid), iedid)
|
|
|
+ for i, row := range rowset {
|
|
|
+ iedObj := scdNode.GetIed(scdXmlObj, tools.IsEmpty(scdid), tools.IsEmpty(row["ied_name"]))
|
|
|
if iedObj == nil {
|
|
|
continue
|
|
|
}
|
|
|
- row["attr_name"] = iedObj.Name
|
|
|
- row["attr_desc"] = iedObj.Desc
|
|
|
- row["attr_config_version"] = iedObj.ConfigVersion
|
|
|
- row["attr_type"] = iedObj.Type
|
|
|
- row["attr_manufacturer"] = iedObj.Manufacturer
|
|
|
- row["ied_id"] = iedObj.NodeId
|
|
|
+ rowset[i]["attr_name"] = iedObj.Name
|
|
|
+ rowset[i]["attr_desc"] = iedObj.Desc
|
|
|
+ rowset[i]["attr_config_version"] = iedObj.ConfigVersion
|
|
|
+ rowset[i]["attr_type"] = iedObj.Type
|
|
|
+ rowset[i]["attr_manufacturer"] = iedObj.Manufacturer
|
|
|
+ rowset[i]["ied_id"] = iedObj.NodeId
|
|
|
}
|
|
|
new(SystemLog).Success(enum.AuditType_scd_show, enum.LogType_Query, enum.OptEventType_Bus, enum.OptEventLevel_Low, sqllog, c.GetUserInfo())
|
|
|
}
|
