提交

controllers/device_api_controller.go

@@ -798,23 +798,30 @@ func (this *DeviceAPIController) CreateNumber() {
 		return
 	}
 
-	number, createErr := service.CreateDeviceNumber(adminInfo.CurrentOrgId, num, zoneID, groupID)
-	if createErr != nil {
-		this.ErrorLog("创建机号失败:%v", createErr)
-		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
-		return
-	}
-	numberJson := map[string]interface{}{
-		"id":         number.ID,
-		"number":     number.Number,
-		"zone_id":    number.ZoneID,
-		"group_id":   number.GroupID,
-		"zone_name":  zone.Name,
-		"group_name": group.Name,
-	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"number": numberJson,
-	})
+  _, errcode := service.GetCreateDeviceNumber(num, adminInfo.CurrentOrgId)
+  if errcode == gorm.ErrRecordNotFound{
+    number, createErr := service.CreateDeviceNumber(adminInfo.CurrentOrgId, num, zoneID, groupID)
+    if createErr != nil {
+      this.ErrorLog("创建机号失败:%v", createErr)
+      this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+      return
+    }
+    numberJson := map[string]interface{}{
+      "id":         number.ID,
+      "number":     number.Number,
+      "zone_id":    number.ZoneID,
+      "group_id":   number.GroupID,
+      "zone_name":  zone.Name,
+      "group_name": group.Name,
+    }
+    this.ServeSuccessJSON(map[string]interface{}{
+      "number": numberJson,
+    })
+  }else if errcode == nil{
+    this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+    return
+  }
+
 }
 
 // /api/device/number/modify [post] ModifyNumber

service/device_service.go

@@ -446,6 +446,19 @@ func GetDeviceNumberByID(orgID int64, numberID int64) (*models.DeviceNumber, err
 	return &number, nil
 }
 
+func GetCreateDeviceNumber(num string,orgid int64)(*models.DeviceNumber,error)  {
+  number := models.DeviceNumber{}
+  err := XTReadDB().Model(&number).Where("number = ? and org_id = ? and status = 1", num, orgid).Find(&number).Error
+  if err == gorm.ErrRecordNotFound {
+    return nil, err
+  }
+  if err != nil {
+    return nil, err
+  }
+
+  return &number, nil
+}
+
 func CreateDeviceNumber(orgID int64, number string, zoneID int64, groupID int64) (*models.DeviceNumber, error) {
 	now := time.Now().Unix()
 	numberModel := models.DeviceNumber{