更新代码

controllers/device_api_controller.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"XT_New/utils"
+	"github.com/jinzhu/gorm"
 	"time"
 
 	"XT_New/enums"
@@ -525,15 +526,22 @@ func (this *DeviceAPIController) CreateZone() {
 	}
 
 	adminInfo := this.GetAdminUserInfo()
-	zone, createErr := service.CreateDeviceZone(adminInfo.CurrentOrgId, name, type_)
-	if createErr != nil {
-		this.ErrorLog("创建设备分区失败:%v", createErr)
+	_, errcode := service.GetZoneByName(name, adminInfo.CurrentOrgId)
+	fmt.Println("errcode=----------", errcode)
+	if errcode == gorm.ErrRecordNotFound {
+		zone, createErr := service.CreateDeviceZone(adminInfo.CurrentOrgId, name, type_)
+		if createErr != nil {
+			this.ErrorLog("创建设备分区失败:%v", createErr)
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+			return
+		}
+		this.ServeSuccessJSON(map[string]interface{}{
+			"zone": zone,
+		})
+	} else if errcode == nil {
 		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
 		return
 	}
-	this.ServeSuccessJSON(map[string]interface{}{
-		"zone": zone,
-	})
 }
 
 // /api/device/zone/modify [post] ModifyZone

models/dialysis.go

@@ -808,30 +808,6 @@ func (GobalTemplate) TableName() string {
 	return "xt_gobal_template"
 }
 
-type UserAdminRoles struct {
-	ID            int64  `gorm:"column:id" json:"id" form:"id"`
-	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
-	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
-	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
-	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
-	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
-	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
-	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
-	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
-	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
-	Status        int64  `gorm:"column:status" json:"status" form:"status"`
-	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
-	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
-	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
-	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
-	Message       string `gorm:"column:message" json:"message" form:"message"`
-	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
-	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
-	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
-	Url           string `gorm:"column:url" json:"url" form:"url"`
-	Hash          string `gorm:"column:hash" json:"hash" form:"hash"`
-}
-
 type SgjUserAdminRole struct {
 	ID            int64  `gorm:"column:id" json:"id" form:"id"`
 	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
@@ -878,3 +854,27 @@ type SgjUserAdmin struct {
 func (SgjUserAdmin) TableName() string {
 	return "sgj_user_admin"
 }
+
+type UserAdminRoles struct {
+	ID            int64  `gorm:"column:id" json:"id" form:"id"`
+	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id" form:"admin_user_id"`
+	OrgId         int64  `gorm:"column:org_id" json:"org_id" form:"org_id"`
+	AppId         int64  `gorm:"column:app_id" json:"app_id" form:"app_id"`
+	RoleId        int64  `gorm:"column:role_id" json:"role_id" form:"role_id"`
+	UserName      string `gorm:"column:user_name" json:"user_name" form:"user_name"`
+	Avatar        string `gorm:"column:avatar" json:"avatar" form:"avatar"`
+	UserType      int64  `gorm:"column:user_type" json:"user_type" form:"user_type"`
+	UserTitle     int64  `gorm:"column:user_title" json:"user_title" form:"user_title"`
+	Intro         string `gorm:"column:intro" json:"intro" form:"intro"`
+	Status        int64  `gorm:"column:status" json:"status" form:"status"`
+	Ctime         int64  `gorm:"column:ctime" json:"ctime" form:"ctime"`
+	Mtime         int64  `gorm:"column:mtime" json:"mtime" form:"mtime"`
+	UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	RoleIds       string `gorm:"column:role_ids" json:"role_ids" form:"role_ids"`
+	Message       string `gorm:"column:message" json:"message" form:"message"`
+	Sex           int64  `gorm:"column:sex" json:"sex" form:"sex"`
+	Birthday      int64  `gorm:"column:birthday" json:"birthday" form:"birthday"`
+	Creator       int64  `gorm:"column:creator" json:"creator" form:"creator"`
+	Url           string `gorm:"column:url" json:"url" form:"url"`
+	Hash          string `gorm:"column:hash" json:"hash" form:"hash"`
+}

service/device_service.go

@@ -272,6 +272,19 @@ func GetDeviceZoneByID(orgID int64, zoneID int64) (*models.DeviceZone, error) {
 	return &zone, nil
 }
 
+func GetZoneByName(name string, orgid int64) (*models.DeviceZone, error) {
+	zones := models.DeviceZone{}
+	err := XTReadDB().Model(&zones).Where("name = ? and org_id = ? and status = 1", name, orgid).Find(&zones).Error
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return nil, nil
+		} else {
+			return nil, err
+		}
+	}
+	return &zones, nil
+}
+
 func CreateDeviceZone(orgID int64, name string, type_ int) (*models.DeviceZone, error) {
 	now := time.Now().Unix()
 	zone := models.DeviceZone{

service/dialysis_service.go

@@ -695,13 +695,13 @@ func GetAdminUserES(orgID int64, appID int64, ids []int64) (es []*models.AdminUs
 	return
 }
 
-func GetAdminUserEsOne(orgid int64) (adminrole []*models.UserAdminRoles, err error) {
+func GetAdminUserEsOne(orgid int64) (admin []*models.UserAdminRoles, err error) {
 
 	db := readUserDb.Table("sgj_user_admin_role as x").Where("x.status = 1")
 	table := readUserDb.Table("sgj_user_admin_electronic_signature as s")
-	fmt.Println(table)
-	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ?", orgid).Scan(&adminrole).Error
-	return adminrole, err
+	fmt.Println("table", table)
+	err = db.Select("x.id,x.admin_user_id,x.user_name,x.org_id,s.creator,s.url,s.hash").Joins("left join sgj_user_admin_electronic_signature as s on s.creator = x.admin_user_id").Where("x.org_id = ?", orgid).Scan(&admin).Error
+	return admin, err
 }
 
 func UpDateDialysisPrescriptionDoctorSign(patient int64, date int64, orgId int64, doctor_id int64) (err error) {