|
@@ -126,7 +126,7 @@ func (c *SysCheckModelMgr) Save() (err error) {
|
|
|
for _, ritem := range nodes {
|
|
|
ritem2 := ritem.(map[string]interface{})
|
|
|
nodetype := tools.IsEmpty(ritem2["type"])
|
|
|
- if nodetype == "group" {
|
|
|
+ if nodetype == "my-group" {
|
|
|
properties := ritem2["properties"].(map[string]interface{})
|
|
|
iedtypes = append(iedtypes, tools.IsEmpty(properties["ied_type"]))
|
|
|
continue
|
|
@@ -145,16 +145,13 @@ func (c *SysCheckModelMgr) Save() (err error) {
|
|
|
}
|
|
|
newid, err2 := db.Insert(&c.Model)
|
|
|
if err2 == nil {
|
|
|
+ c.Model.Id = int(newid)
|
|
|
//添加接线方式与模型关系
|
|
|
lm := new(LinkStyleModelMgr)
|
|
|
lm.Model.LinkstyleId = c.Model.LineLinkStyle
|
|
|
lm.Model.ModelId = int(newid)
|
|
|
lm.SetUserInfo(c.GetUserInfo())
|
|
|
lm.Save()
|
|
|
- //保存装置分组
|
|
|
- bgm := new(SysCheckModelIedtypeGroupMgr)
|
|
|
- bgm.Model = T_data_model_iedtype_group{ModelId: int(newid)}
|
|
|
- bgm.Save(c.Model.RelationJson)
|
|
|
if c.Model.RelationJson != "" {
|
|
|
m2 := new(SysCheckModelIedRelationMgr)
|
|
|
m2.SetUserInfo(c.GetUserInfo())
|
|
@@ -240,7 +237,7 @@ func (c *SysCheckModelMgr) Save() (err error) {
|
|
|
for _, ritem := range nodes {
|
|
|
ritem2 := ritem.(map[string]interface{})
|
|
|
nodetype := tools.IsEmpty(ritem2["type"])
|
|
|
- if nodetype == "group" {
|
|
|
+ if nodetype == "my-group" {
|
|
|
//装置分组
|
|
|
properties := ritem2["properties"].(map[string]interface{})
|
|
|
tmp := tools.IsEmpty(properties["ied_type"])
|
|
@@ -293,6 +290,10 @@ func (c *SysCheckModelMgr) Save() (err error) {
|
|
|
} else {
|
|
|
dblog.Description = fmt.Sprintf("保存%s信息成功,操作数据:%+v", sysCheckModelDesc, c.Model)
|
|
|
dblog.Success2()
|
|
|
+ //保存装置分组
|
|
|
+ bgm := new(SysCheckModelIedtypeGroupMgr)
|
|
|
+ bgm.Model = T_data_model_iedtype_group{ModelId: c.Model.Id}
|
|
|
+ bgm.Save(c.Model.RelationJson)
|
|
|
}
|
|
|
return err
|
|
|
}
|
|
@@ -312,14 +313,30 @@ func (c *SysCheckModelMgr) One() (T_data_model_defualt, error) {
|
|
|
|
|
|
//更新指定模型中的指定装置类型编码
|
|
|
func (c *SysCheckModelMgr) UpdateIedType(oldiedtype, newiedtype string) error {
|
|
|
+ c.Model, _ = c.One()
|
|
|
dblog := new(SystemLog)
|
|
|
dblog.SetUserInfo(c.GetUserInfo())
|
|
|
dblog.Audittype = enum.AuditType_check_model
|
|
|
dblog.Logtype = enum.LogType_Delete
|
|
|
dblog.Eventtype = enum.OptEventType_Bus
|
|
|
dblog.Eventlevel = enum.OptEventLevel_Hight
|
|
|
+ //判断修改的是否是分组的自定义装置类型
|
|
|
+ groupMapping := new(SysCheckModelIedtypeGroupMgr)
|
|
|
+ groupMapping.Model = T_data_model_iedtype_group{ModelId: c.Model.Id}
|
|
|
+ rowset := groupMapping.List()
|
|
|
+ for _, g := range rowset {
|
|
|
+ if g == oldiedtype {
|
|
|
+ db := orm.NewOrm()
|
|
|
+ db.Raw("update t_data_model_relation_def set from_ied_code=? where model_id=? and from_ied_code=?", newiedtype, c.Model.Id, oldiedtype).Exec()
|
|
|
+ db.Raw("update t_data_model_relation_def set to_ied_code=? where model_id=? and to_ied_code=?", newiedtype, c.Model.Id, oldiedtype).Exec()
|
|
|
+ db.Raw("update t_data_model_iedtype_group set ied_type=? where model_id=? and ied_type=?", newiedtype, c.Model.Id, oldiedtype).Exec()
|
|
|
+ dblog.Description = fmt.Sprintf("设置%s%s装置类型编码(%s->%s)成功", sysCheckModelDesc, c.Model.ModelName, oldiedtype, newiedtype)
|
|
|
+ dblog.Success2()
|
|
|
+ return nil
|
|
|
+ }
|
|
|
+ }
|
|
|
mapping := new(SysCheckModelIedtypeMappingMgr)
|
|
|
- mapping.Model = T_data_model_iedtype_maping{ModelId: c.Model.Id}
|
|
|
+ mapping.Model = T_data_model_iedtype_mapping{ModelId: c.Model.Id}
|
|
|
mapping.Model.IedType = oldiedtype
|
|
|
mapping.Model.MappingIedType = newiedtype
|
|
|
err := mapping.Save()
|
|
@@ -336,7 +353,7 @@ func (c *SysCheckModelMgr) UpdateIedType(oldiedtype, newiedtype string) error {
|
|
|
//获取指定装置类型的自定义类型编码
|
|
|
func (c *SysCheckModelMgr) GetIedtypeMapping(iedtype string) string {
|
|
|
mapping := new(SysCheckModelIedtypeMappingMgr)
|
|
|
- mapping.Model = T_data_model_iedtype_maping{ModelId: c.Model.Id}
|
|
|
+ mapping.Model = T_data_model_iedtype_mapping{ModelId: c.Model.Id}
|
|
|
mapping.Model.IedType = iedtype
|
|
|
re := mapping.List()
|
|
|
if len(re) == 0 {
|
|
@@ -379,7 +396,7 @@ func (c *SysCheckModelMgr) Delete() (err error) {
|
|
|
bgm.Model = T_data_model_iedtype_group{ModelId: c.Model.Id}
|
|
|
bgm.Delete()
|
|
|
obj1 := new(SysCheckModelIedtypeMappingMgr)
|
|
|
- obj1.Model = T_data_model_iedtype_maping{ModelId: c.Model.Id}
|
|
|
+ obj1.Model = T_data_model_iedtype_mapping{ModelId: c.Model.Id}
|
|
|
obj1.Delete()
|
|
|
dblog.Description = fmt.Sprintf("删除%s%s成功", sysCheckModelDesc, c.Model.ModelName)
|
|
|
dblog.Success2()
|
|
@@ -433,7 +450,7 @@ func (c *SysCheckModelMgr) Copy(modelid int) (error, int) {
|
|
|
bgm.Copy(int(newid))
|
|
|
//复制装置类型自定义信息
|
|
|
obj1 := new(SysCheckModelIedtypeMappingMgr)
|
|
|
- obj1.Model = T_data_model_iedtype_maping{ModelId: c.Model.Id}
|
|
|
+ obj1.Model = T_data_model_iedtype_mapping{ModelId: c.Model.Id}
|
|
|
obj1.Copy(int(newid))
|
|
|
//复制功能及端子信息
|
|
|
m3 := new(SysCheckModelIedFuncMgr)
|