分组验证

controllers/device_api_controller.go

@@ -652,15 +652,22 @@ func (this *DeviceAPIController) CreateGroup() {
 	}
 
 	adminInfo := this.GetAdminUserInfo()
-	group, createErr := service.CreateDeviceGroup(adminInfo.CurrentOrgId, name)
-	if createErr != nil {
-		this.ErrorLog("创建设备分组失败:%v", createErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
-		return
-	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"group": group,
-	})
+  _, errcode := service.GetDeviceGroupName(name, adminInfo.CurrentOrgId)
+  if errcode == gorm.ErrRecordNotFound{
+    group, createErr := service.CreateDeviceGroup(adminInfo.CurrentOrgId, name)
+    if createErr != nil {
+      this.ErrorLog("创建设备分组失败:%v", createErr)
+      this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+      return
+    }
+    this.ServeSuccessJSON(map[string]interface{}{
+      "group": group,
+    })
+  }else if errcode == nil{
+    this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+    return
+  }
+
 }
 
 // /api/device/group/modify [post] ModifyGroup
@@ -687,8 +694,12 @@ func (this *DeviceAPIController) ModifyGroup() {
 
 	group.Name = name
 	group.ModifyTime = time.Now().Unix()
-
-	updateErr := service.UpdateDeviceGroup(group)
+  byName, getGroupErr := service.GetUpdateDeviceGroupByName(name, adminInfo.CurrentOrgId)
+  if byName.ID > 0 && byName.ID != id {
+    this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+    return
+  }
+  updateErr := service.UpdateDeviceGroup(group)
 	if updateErr != nil {
 		this.ErrorLog("修改设备分组失败:%v", updateErr)
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)

service/device_service.go

@@ -337,6 +337,20 @@ func GetDeviceGroupByID(orgID int64, groupID int64) (*models.DeviceGroup, error)
 	return &group, nil
 }
 
+func GetDeviceGroupName(name string,orgid int64)(*models.DeviceGroup,error)  {
+  group := models.DeviceGroup{}
+  err := XTReadDB().Model(&group).Where("name = ? and org_id = ? and status =1", name, orgid).Find(&group).Error
+  if err == gorm.ErrRecordNotFound {
+    return nil, err
+  }
+  if err != nil {
+    return nil, err
+  }
+
+  return &group, nil
+
+}
+
 func CreateDeviceGroup(orgID int64, name string) (*models.DeviceGroup, error) {
 	now := time.Now().Unix()
 	group := models.DeviceGroup{
@@ -353,6 +367,11 @@ func CreateDeviceGroup(orgID int64, name string) (*models.DeviceGroup, error) {
 	return &group, nil
 }
 
+func GetUpdateDeviceGroupByName(name string,orgid int64)(group models.DeviceGroup,err error)  {
+  err = XTReadDB().Model(&group).Where("name = ? and org_id = ? and status =1",name,orgid).Find(&group).Error
+  return group,err
+}
+
 func UpdateDeviceGroup(group *models.DeviceGroup) error {
 	err := writeDb.Save(group).Error
 	return err