Merge branch 'master' of http://git.shengws.com/csx/XT_New

controllers/new_mobile_api_controllers/new_mobile_api_router_register.go

@@ -34,20 +34,24 @@ func NewMobileAPIControllersRegisterRouters() {
 	beego.Router("/m/api/createOrg", &HomeController{}, "post:CreateOrg")
 
 	beego.Router("/m/api/staff", &NewRoleApiController{}, "get:GetAllOrgUser")
+
 	beego.Router("/m/api/staff/edit", &NewRoleApiController{}, "post:EditAdmin")
 	beego.Router("/m/api/staff/init", &NewRoleApiController{}, "get:GetEditAdminInitData")
 	beego.Router("/m/api/staff/get", &NewRoleApiController{}, "get:GetAdminUserInfo")
 	beego.Router("/m/api/staff/stop", &NewRoleApiController{}, "post:StopAdminUser")
 	beego.Router("/m/api/staff/create", &NewRoleApiController{}, "post:CreateAdminUser")
 
+	beego.Router("/m/api/role/addStaff", &NewRoleApiController{}, "post:AddRoleStaff")
+
 	beego.Router("/m/api/role", &NewRoleApiController{}, "get:GetAllOrgRole")
 	beego.Router("/m/api/role/edit", &NewRoleApiController{}, "post:EditRole")
 	beego.Router("/m/api/role/get", &NewRoleApiController{}, "get:GetOrgRoleInfo")
-	beego.Router("/m/api/role/del", &NewRoleApiController{}, "get:DeleteOrgRole")
+	beego.Router("/m/api/role/del", &NewRoleApiController{}, "post:DeleteOrgRole")
 	beego.Router("/m/api/role/create", &NewRoleApiController{}, "post:CreateRole")
 
 	beego.Router("/m/api/permission/post", &NewRoleApiController{}, "post:EditRolePermission")
 	beego.Router("/m/api/permission", &NewRoleApiController{}, "get:GetAllPermission")
+	beego.Router("/m/api/rolepurview", &NewRoleApiController{}, "get:GetRolePurviews")
 
 	beego.Router("/m/api/patient/getbloodpatientinfo", &NewDialysisApiController{}, "Get:GetBloodPatientInfo")
 	beego.Router("/m/api/patient/getslowpatientinfo", &NewDialysisApiController{}, "Get:GetSlowPatientInfo")

controllers/new_mobile_api_controllers/new_role_api_controller.go

@@ -4,6 +4,7 @@ import (
 	"XT_New/enums"
 	"XT_New/models"
 	"XT_New/service"
+	"strconv"
 	"strings"
 	"time"
 )
@@ -13,12 +14,12 @@ type NewRoleApiController struct {
 }
 
 func (this *NewRoleApiController) GetAllOrgUser() {
+
 	adminUserInfo := this.GetMobileAdminUserInfo()
-	viewModels, _, _ := service.GetAdminUsersAndLoginInfo(adminUserInfo.Org.Id, adminUserInfo.App.Id, 1, 10)
+	viewModels, _, _ := service.GetAllAdminUsersAndRole(adminUserInfo.Org.Id, adminUserInfo.App.Id, 1, 10)
 	this.ServeSuccessJSON(map[string]interface{}{
 		"admins": viewModels,
 	})
-
 }
 
 func (this *NewRoleApiController) EditAdmin() {
@@ -145,26 +146,35 @@ func (this *NewRoleApiController) CreateAdminUser() {
 				this.ServeSuccessJSON(nil)
 				return
 			}
-		} else { //新增用户
-			app_role := &models.App_Role{
-				AdminUserId:   adminUser.Id,
-				OrgId:         adminUserInfo.Org.Id,
-				AppId:         adminUserInfo.App.Id,
-				Avatar:        "",
-				UserName:      name,
-				UserTitleName: userTitle,
-				Status:        1,
-				CreateTime:    time.Now().Unix(),
-				ModifyTime:    time.Now().Unix(),
-				RoleIds:       role_ids,
-			}
-
-			err := service.CreateUserRole(app_role)
-			if err != nil {
-				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+		} else {
+
+			total, _ := service.FindAdminUserByID(adminUser.Id, adminUserInfo.Org.Id)
+
+			if total <= 0 {
+				//新增用户
+				app_role := &models.App_Role{
+					AdminUserId:   adminUser.Id,
+					OrgId:         adminUserInfo.Org.Id,
+					AppId:         adminUserInfo.App.Id,
+					Avatar:        "",
+					UserName:      name,
+					UserTitleName: userTitle,
+					Status:        1,
+					CreateTime:    time.Now().Unix(),
+					ModifyTime:    time.Now().Unix(),
+					RoleIds:       role_ids,
+				}
+				err := service.CreateUserRole(app_role)
+				if err != nil {
+					this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBCreate)
+					return
+				}
+				this.ServeSuccessJSON(nil)
+			} else {
+				this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRepeatCreateStaffException)
 				return
 			}
-			this.ServeSuccessJSON(nil)
+
 			return
 		}
 	}
@@ -186,7 +196,22 @@ func (this *NewRoleApiController) GetAllOrgRole() {
 }
 
 func (this *NewRoleApiController) EditRole() {
+	role_id, _ := this.GetInt64("id", 0)
+	desc := this.GetString("desc")
+
+	role, _ := service.GetRoleByRoleID(role_id)
+
+	role.RoleIntro = desc
+	role.ModifyTime = time.Now().Unix()
 
+	err := service.SaveRole(role)
+	if err != nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"role": role,
+	})
+	return
 }
 
 func (this *NewRoleApiController) GetOrgRoleInfo() {
@@ -295,6 +320,70 @@ func (this *NewRoleApiController) GetAllPermission() {
 }
 
 func (this *NewRoleApiController) DeleteOrgRole() {
-	//role_id, _ := this.GetInt64("id", 0)
+	roleID, _ := this.GetInt64("role_id")
+	enable, _ := this.GetBool("enable")
+	if roleID <= 0 {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeParamWrong)
+		return
+	}
+
+	adminUserInfo := this.GetMobileAdminUserInfo()
+
+	role, getRoleErr := service.GetRoleByRoleID(roleID)
+	if getRoleErr != nil {
+		//beego.Error("获取角色失败:", getRoleErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDataException)
+		return
+	} else if role == nil {
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeRoleNotExist)
+		return
+	}
+
+	if enable == false {
+		if count, _ := service.RoleAdminUserCountTwo(adminUserInfo.Org.Id, adminUserInfo.App.Id, roleID); count != 0 {
+			this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeCannotRemoveRole)
+			return
+		}
+	}
+
+	if enable {
+		role.Status = 1
+	} else {
+		role.Status = 2
+	}
+	role.ModifyTime = time.Now().Unix()
+	saveErr := service.ModifyRole(role)
+	if saveErr != nil {
+		//beego.Error("修改角色失败:", role.Id, saveErr)
+		this.ServeFailJSONWithSGJErrorCode(enums.ErrorCodeDBUpdate)
+	} else {
+		this.ServeSuccessJSON(nil)
+	}
+
+}
+
+func (this *NewRoleApiController) GetRolePurviews() {
+	adminUserInfo := this.GetMobileAdminUserInfo()
+	role_id, _ := this.GetInt64("id", 0)
+	rolePurview, _ := service.GetRoleAndPurviewById(role_id, adminUserInfo.Org.Id, adminUserInfo.App.Id)
+	this.ServeSuccessJSON(map[string]interface{}{
+		"role_purview": rolePurview,
+	})
+}
+
+func (this *NewRoleApiController) AddRoleStaff() {
+	//adminUserInfo := this.GetMobileAdminUserInfo()
+	role_id, _ := this.GetInt64("id", 0)
+	staff_ids := this.GetString("ids")
+	ids := strings.Split(staff_ids, ",")
+	for _, item := range ids {
+		id, _ := strconv.ParseInt(item, 10, 64)
+		role, _ := service.FindAdminUserID(id)
+		role.RoleIds = role.RoleIds + "," + strconv.FormatInt(role_id, 10)
+		service.SaveAdminUser(&role)
+	}
+	this.ServeSuccessJSON(map[string]interface{}{
+		"msg": "添加成功",
+	})
 
 }

enums/error_code.go

@@ -182,6 +182,8 @@ const ( // ErrorCode
 	ErrorCodeOrgNoExist = 20032
 
 	ErrorCodeRegisterExist = 20033
+
+	ErrorCodeRepeatCreateStaffException = 20034
 )
 
 var ErrCodeMsgs = map[int]string{
@@ -363,6 +365,8 @@ var ErrCodeMsgs = map[int]string{
 	ErrorCodeOrgNoExist: "该机构不存在",
 
 	ErrorCodeRegisterExist: "该账号已经注册，请登录",
+
+	ErrorCodeRepeatCreateStaffException: "该员工已经存在无法继续添加",
 }
 
 type SGJError struct {

models/purview_models.go

@@ -1,20 +1,22 @@
 package models
 
 type Purview struct {
-	Id                  int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
-	Parentid            int64  `json:"pid"`                                                // 父级ID
-	Module              int8   `json:"module"`                                             // 所属应用类型 1.病友经营；2.科普号；3.血透经营；4.慢病管理；
-	Name                string `json:"name"`                                               // 规则名称（也是菜单名）
-	Urlfor              string `json:"urlfor"`                                             // 规则唯一英文标识，(Controller.Method)
-	MenuIconClass       string `gorm:"menu_icon_class" json:"menu_icon_class"`             // 菜单图标的 css 样式
-	SuperAdminExclusive int8   `gorm:"super_admin_exclusive" json:"super_admin_exclusive"` // 是否为超级管理员专属 0否1是
-	Listorder           int    `json:"-"`                                                  // 排序ID
-	Status              int8   `json:"status"`                                             // 状态 0.无效 1.有效 2.禁用
-	CreateTime          int64  `gorm:"column:ctime" json:"-"`                              // 创建时间
-	ModifyTime          int64  `gorm:"column:mtime" json:"-"`                              // 修改时间
-
-	Link   string     `gorm:"-" json:"link"`   // urlfor 解析后的链接
-	Childs []*Purview `gorm:"-" json:"childs"` // 子节点
+	Id                  int64      `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	Parentid            int64      `json:"pid"`                                                // 父级ID
+	Module              int8       `json:"module"`                                             // 所属应用类型 1.病友经营；2.科普号；3.血透经营；4.慢病管理；
+	Name                string     `json:"name"`                                               // 规则名称（也是菜单名）
+	Urlfor              string     `json:"urlfor"`                                             // 规则唯一英文标识，(Controller.Method)
+	MenuIconClass       string     `gorm:"menu_icon_class" json:"menu_icon_class"`             // 菜单图标的 css 样式
+	SuperAdminExclusive int8       `gorm:"super_admin_exclusive" json:"super_admin_exclusive"` // 是否为超级管理员专属 0否1是
+	Listorder           int        `json:"-"`                                                  // 排序ID
+	Status              int8       `json:"status"`                                             // 状态 0.无效 1.有效 2.禁用
+	CreateTime          int64      `gorm:"column:ctime" json:"-"`                              // 创建时间
+	ModifyTime          int64      `gorm:"column:mtime" json:"-"`                              // 修改时间
+	Purview             []*Purview `gorm:"ForeignKey:Parentid;AssociationForeignKey:ID" json:"sub_purview"`
+	IconUrl             string     `gorm:"column:icon_url" json:"icon_url" form:"icon_url"`
+	Desc                string     `gorm:"column:desc" json:"desc" form:"desc"`
+	Link                string     `gorm:"-" json:"link"`   // urlfor 解析后的链接
+	Childs              []*Purview `gorm:"-" json:"childs"` // 子节点
 }
 
 func (Purview) TableName() string {
@@ -30,6 +32,8 @@ type RolePurview struct {
 	Status     int8  // 状态 0.无效 1.有效 2.禁用
 	CreateTime int64 `gorm:"column:ctime"` // 创建时间
 	ModifyTime int64 `gorm:"column:mtime"` // 修改时间
+
+	Role Role `gorm:"ForeignKey:RoleId;AssociationForeignKey:ID" json:"role_info"`
 }
 
 func (RolePurview) TableName() string {

models/role_models.go

@@ -7,10 +7,11 @@ type Role struct {
 	Creator      int64  `json:"-"`
 	OrgId        int64  `gorm:"column:org_id" json:"-"`
 	AppId        int64  `gorm:"column:app_id" json:"-"`
-	IsSuperAdmin bool   `gorm:"column:is_super_admin" json:"-"`
+	IsSuperAdmin bool   `gorm:"column:is_super_admin" json:"is_super_admin"`
 	Status       int8   `json:"status"`                // 状态 0.无效 1.有效 2.禁用
 	CreateTime   int64  `gorm:"column:ctime" json:"-"` // 创建时间
 	ModifyTime   int64  `gorm:"column:mtime" json:"-"` // 修改时间
+	StaffNumber  int64  `gorm:"-" json:"staff_number"`
 }
 
 func (Role) TableName() string {
@@ -35,21 +36,22 @@ type App_Roles struct {
 }
 
 type App_Role struct {
-	Id            int64  `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
-	AdminUserId   int64  `gorm:"column:admin_user_id" json:"admin_user_id"`
-	OrgId         int64  `gorm:"column:org_id" json:"org_id"`
-	AppId         int64  `gorm:"column:app_id" json:"app_id"`
-	RoleId        int64  `gorm:"column:role_id" json:"role_id"`
-	Avatar        string `json:"avatar" json:"avatar"`
-	UserName      string `gorm:"column:user_name" json:"user_name"`   // 用户名称
-	Intro         string `json:"intro"`                               // 简介
-	UserType      int8   `gorm:"column:user_type" json:"user_type"`   // 用户类型（1.管理员；2.医生；3.护士；4.运营）
-	UserTitle     int8   `gorm:"column:user_title" json:"user_title"` // 用户职称（1.医士；2.医师；3.住院医师；4.主治医师；5.副主任医师；6.主任医师；7.护士；8.护师；9.主管护师；10.副主任护师；11.主任护师；12.运营专员；13.运营主管）
-	Status        int8   `json:"status"`                              // 状态 0.无效 1.有效
-	CreateTime    int64  `gorm:"column:ctime" json:"ctime"`           // 创建时间
-	ModifyTime    int64  `gorm:"column:mtime" json:"mtime"`           // 修改时间UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
-	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"`
+	Id            int64     `gorm:"PRIMARY_KEY;AUTO_INCREMENT" json:"id"`
+	AdminUserId   int64     `gorm:"column:admin_user_id" json:"admin_user_id"`
+	OrgId         int64     `gorm:"column:org_id" json:"org_id"`
+	AppId         int64     `gorm:"column:app_id" json:"app_id"`
+	RoleId        int64     `gorm:"column:role_id" json:"role_id"`
+	Avatar        string    `json:"avatar" json:"avatar"`
+	UserName      string    `gorm:"column:user_name" json:"user_name"`   // 用户名称
+	Intro         string    `json:"intro"`                               // 简介
+	UserType      int8      `gorm:"column:user_type" json:"user_type"`   // 用户类型（1.管理员；2.医生；3.护士；4.运营）
+	UserTitle     int8      `gorm:"column:user_title" json:"user_title"` // 用户职称（1.医士；2.医师；3.住院医师；4.主治医师；5.副主任医师；6.主任医师；7.护士；8.护师；9.主管护师；10.副主任护师；11.主任护师；12.运营专员；13.运营主管）
+	Status        int8      `json:"status"`                              // 状态 0.无效 1.有效
+	CreateTime    int64     `gorm:"column:ctime" json:"ctime"`           // 创建时间
+	ModifyTime    int64     `gorm:"column:mtime" json:"mtime"`           // 修改时间UserTitleName string `gorm:"column:user_title_name" json:"user_title_name" form:"user_title_name"`
+	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"`
+	AdminUser     AdminUser `gorm:"ForeignKey:ID;AssociationForeignKey:AdminUserId" json:"admin"`
 }
 
 func (App_Role) TableName() string {

service/role_service.go

@@ -1,6 +1,7 @@
 package service
 
 import (
+	"database/sql"
 	"time"
 
 	"XT_New/models"
@@ -30,7 +31,7 @@ func GetRoles(orgID int64, appID int64, page int, count int) ([]*models.Role, in
 
 func GetAppRole(orgID int64, appID int64, adminUserID int64) (*models.App_Role, error) {
 	var appRole models.App_Role
-	err := readUserDb.Model(models.App_Role{}).Where("org_id = ? and app_id = ? and admin_user_id = ?", orgID, appID, adminUserID).First(&appRole).Error
+	err := readUserDb.Model(models.App_Role{}).Preload("AdminUser", "status = 1").Where("org_id = ? and app_id = ? and admin_user_id = ?", orgID, appID, adminUserID).First(&appRole).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			return nil, nil
@@ -416,7 +417,7 @@ func GetAllOrgValidRoles(orgID int64) ([]*models.Role, error) {
 	var roles []*models.Role
 	err := readUserDb.Model(models.Role{}).
 		Where("org_id = ? AND status = 1", orgID).
-		Order("ctime asc").
+		Order("number asc,ctime").
 		Find(&roles).
 		Error
 	if err != nil {
@@ -426,6 +427,11 @@ func GetAllOrgValidRoles(orgID int64) ([]*models.Role, error) {
 			return nil, err
 		}
 	}
+	for _, item := range roles {
+		var total int64
+		readUserDb.Model(&models.App_Role{}).Where("org_id = ? AND find_in_set(?, role_ids)", orgID, item.Id).Count(&total)
+		item.StaffNumber = total
+	}
 	return roles, nil
 }
 
@@ -457,6 +463,79 @@ func SaveRolePurview(purview *models.RolePurview) (err error) {
 
 func GetAllPurview(module int64, pid int64) ([]*models.Purview, error) {
 	var originPurviews []*models.Purview
-	getPurviewErr := readUserDb.Model(models.Purview{}).Where("module = ? AND status = 1 AND parentid = ?", module, pid).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
+	getPurviewErr := readUserDb.Model(models.Purview{}).Preload("Purview", "status = 1").Where("module = ? AND status = 1 AND parentid = ? AND super_admin_exclusive = 0", module, pid).Order("listorder asc").Order("id asc").Find(&originPurviews).Error
 	return originPurviews, getPurviewErr
 }
+
+type NewAdminUserModel struct {
+	ID          int64  `gorm:"id" json:"id"`
+	AdminUserId int    `gorm:"admin_user_id" json:"user_id"`
+	UserName    string `gorm:"user_name" json:"user_name"`
+	UserTitle   int    `gorm:"user_title_name" json:"user_title_name"`
+	Ip          string `gorm:"ip" json:"ip"`
+	Ctime       int64  `gorm:"ctime" json:"last_login_time"`
+	Status      int    `gorm:"status" json:"status"`
+	Avatar      string `gorm:"avatar" json:"avatar"`
+	RoleIds     string `gorm:"role_ids" json:"role_ids"`
+}
+
+func GetAllAdminUsersAndRole(orgID int64, appID int64, page int, count int) ([]*NewAdminUserModel, int, error) {
+	var viewModels []*NewAdminUserModel = make([]*NewAdminUserModel, 0)
+	var rows *sql.Rows
+	var err error
+	rows, err = readUserDb.Raw("SELECT u_a_r.id, u_a_r.admin_user_id, u_a_r.user_name,  u_a_r.user_title, u_a_r.status,u_a_r.avatar,u_a_r.role_ids FROM sgj_user_admin_role AS u_a_r  WHERE org_id = ? AND app_id = ? AND user_type != 1  ORDER BY ctime DESC", orgID, appID).Rows()
+	defer rows.Close()
+	if err != nil {
+		if err == gorm.ErrRecordNotFound {
+			return viewModels, 0, nil
+		} else {
+			return nil, 0, err
+		}
+	}
+	for rows.Next() {
+		var viewModel NewAdminUserModel
+		readUserDb.ScanRows(rows, &viewModel)
+		viewModels = append(viewModels, &viewModel)
+	}
+	total := 0
+	return viewModels, total, nil
+}
+
+func FindAdminUserByID(admin_user_id int64, org_id int64) (total int64, err error) {
+	err = readUserDb.Model(&models.App_Role{}).Where("admin_user_id = ? AND org_id = ?", admin_user_id, org_id).Count(&total).Error
+	return
+}
+
+func GetRoleAndPurviewById(role_id int64, org_id int64, app_id int64) (rolePurview models.RolePurview, err error) {
+	err = readUserDb.Model(&models.RolePurview{}).Preload("Role", "status = 1").Where("role_id = ? AND status = 1 AND org_id = ? AND app_id = ?", role_id, org_id, app_id).First(&rolePurview).Error
+	return
+}
+
+func SaveRole(role *models.Role) (err error) {
+	err = writeUserDb.Save(&role).Error
+	return
+}
+
+// 拥有xx角色的管理员的数量
+func RoleAdminUserCountTwo(orgID int64, appID int64, roleID int64) (int, error) {
+	var count int
+	err := readUserDb.Model(models.App_Role{}).
+		Where("org_id = ? AND app_id = ? AND status = 1 AND find_in_set(?, role_ids)", orgID, appID, roleID).
+		Count(&count).
+		Error
+	if err != nil {
+		return 0, err
+	} else {
+		return count, nil
+	}
+}
+
+func FindAdminUserID(id int64) (role models.App_Role, err error) {
+	err = readUserDb.Model(&models.App_Role{}).Where("id = ?", id).First(&role).Error
+	return
+}
+
+func SaveAdminUser(role *models.App_Role) (err error) {
+	err = writeUserDb.Save(&role).Error
+	return
+}