user 相关接口

app/device/model/common.go

@@ -40,15 +40,15 @@ const (
 
 //redis
 const (
-	AlarmList           = "AlarmList_GetList_%s"
-	LampPoleGroupList   = "LampPoleGroupList_GetList_%s"
-	GroupFiltrationList = "GroupFiltrationList_GetList_%s"
-	GarbageList         = "GarbageList_GetList_%s"
-	GarbageWayGroupList = "GarbageWayGroupList_GetList_%s"
-	OnDemandGroupList   = "OnDemandGroupList_GetList_%s"
-	SwitchBoxList       = "switchBoxList_GetList_%s"
-	TransformerList     = "TransformerList_GetList_%s"
-	WisdomGatewayList   = "WisdomGatewayList_GetList_%s"
+	AlarmList           = "%s:AlarmList:GetList"
+	LampPoleGroupList   = "%s:LampPoleGroupList:GetList"
+	GroupFiltrationList = "%s:GroupFiltrationList:GetList"
+	GarbageList         = "%s:GarbageList:GetList"
+	GarbageWayGroupList = "%s:GarbageWayGroupList:GetList"
+	OnDemandGroupList   = "%s:OnDemandGroupList:GetList"
+	SwitchBoxList       = "%s:SwitchBoxList:GetList"
+	TransformerList     = "%s:TransformerList:GetList"
+	WisdomGatewayList   = "%s:WisdomGatewayList:GetList"
 )
 
 //Operation type 操作类型

app/device/service/operationHisService.go

@@ -61,9 +61,11 @@ func (s *operationHisService) List(handleContent, operationType, moduleType stri
 			OperationHis: his,
 		}
 		uId, _ := strconv.ParseInt(his.HandleUserId, 10, 64)
-		detail.HandleName = util.GetUserName(uId)
-		detail.OperationTypeName = util.GetControlType(his.OperationType)
-		detail.ModuleTypeName = util.GetModuleName(his.ModuleType)
+		// todo get tenantId
+		tenantId := "000000"
+		detail.HandleName = util.GetUserName(tenantId, uId)
+		detail.OperationTypeName = util.GetControlType(tenantId, his.OperationType)
+		detail.ModuleTypeName = util.GetModuleName(tenantId, his.ModuleType)
 		details = append(details, detail)
 	}
 	return details, nil

app/system/controller/token.go

@@ -55,7 +55,7 @@ func (c *auth) Token(ctx *gin.Context) {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	if userInfo == nil || userInfo.ID == 0 {
+	if userInfo == nil || userInfo.User == nil {
 		ctx.JSON(http.StatusOK, util.NormalResponse(http.StatusBadRequest, model.UserNotFound, nil))
 		return
 	}
@@ -149,15 +149,15 @@ func checkLock() {
 
 func getAccessToken(info model.UserInfo, random string) (string, error) {
 	jwtToken := model.JwtToken{StandardClaims: jwt.StandardClaims{
-		Audience:  "audience",
+		Audience:  model.Audience,
+		Issuer:    model.Issuer,
 		ExpiresAt: time.Now().Add(2 * time.Hour).Unix(),
-		Issuer:    "issuser",
 		NotBefore: time.Now().Unix(),
 	},
 		UserId:    info.ID,
 		TenantId:  info.TenantId,
-		TokenType: "access_token",
-		ClientId:  "saber",
+		TokenType: model.AccessToken,
+		ClientId:  model.Saber,
 		RoleId:    info.RoleId,
 		RoleName:  info.Roles[0],
 		DeptId:    info.DeptId,
@@ -175,10 +175,10 @@ func getAccessToken(info model.UserInfo, random string) (string, error) {
 
 func getRefreshToken(info model.UserInfo) string {
 	claims := jwt.NewWithClaims(jwt.SigningMethodHS512, jwt.MapClaims{
-		model.Iss:       "issuser",
-		model.Aud:       "audience",
-		model.ClientId:  "saber",
-		model.TokenType: "refresh_token",
+		model.Iss:       model.Issuer,
+		model.Aud:       model.Audience,
+		model.ClientId:  model.Saber,
+		model.TokenType: model.RefreshToken,
 		model.UserId:    info.ID,
 		model.Exp:       time.Now().Add(7 * 24 * time.Hour).Unix(),
 		model.Nbf:       time.Now().Unix(),
@@ -213,7 +213,7 @@ func grant(token model.Token, ctx *gin.Context) (*model.UserInfo, *util.Errors)
 		}
 		// 获取用户类型
 		// 根据不同用户类型调用对应的接口返回数据，用户可自行拓展
-		info.User, _ = service.UserService.GetOne(token.TenantId, token.UserName, token.Password)
+		info.User = service.UserService.GetOne(token.TenantId, token.UserName, token.Password)
 	}
 
 	//测试代码start

app/system/controller/user.go

@@ -1 +1,53 @@
 package controller
+
+import (
+	"github.com/gin-gonic/gin"
+	"iot_manager_service/app/system/model"
+	"iot_manager_service/app/system/service"
+	"iot_manager_service/util"
+	"math"
+	"net/http"
+	"strconv"
+)
+
+var User = new(user)
+
+type user struct{}
+
+func (c *user) GetDetail(ctx *gin.Context) {
+	id := ctx.Query("id")
+	iId, err := strconv.ParseInt(id, 10, 64)
+	if err != nil {
+		ctx.JSON(http.StatusOK, util.ParamsInvalidResponse(err.Error(), nil))
+		return
+	}
+	service.UserService.Get(iId)
+}
+
+func (c *user) List(ctx *gin.Context) {
+	current, _ := strconv.Atoi(ctx.Query("current"))
+	size, _ := strconv.Atoi(ctx.Query("size"))
+	if current == 0 {
+		current = 1
+	}
+	if size <= 0 || size > 100 {
+		size = 10
+	}
+
+	users, err := service.UserService.List(current, size)
+	if err != nil {
+		ctx.JSON(http.StatusOK, err)
+		return
+	}
+	pages := math.Ceil(float64(len(users)) / float64(size))
+	rsp := model.RsqUserList{
+		Current: current,
+		Size:    size,
+		Total:   len(users),
+		Pages:   int(pages),
+	}
+	for _, device := range users {
+		rsp.Records = append(rsp.Records, device)
+	}
+	ctx.JSON(http.StatusOK, util.SuccessResponse(util.Succeeded, rsp))
+}

app/system/dao/common.go

@@ -12,6 +12,9 @@ func InitDB(db *gorm.DB) {
 	Db = db
 	err := Db.AutoMigrate(
 		&User{},
+		&Tenant{},
+		&TenantCode{},
+		&Role{},
 	).Error
 	if err != nil {
 		panic(fmt.Sprintf("AutoMigrate err : %v", err))

app/system/dao/role.go

@@ -0,0 +1,20 @@
+package dao
+
+// Role 角色
+type Role struct {
+	ID        int64  `gorm:"primary_key" json:"id"`                             //编号
+	TenantId  string `gorm:"type:varchar(12);default '000000'" json:"tenantId"` //租户id
+	ParentId  int64  `gorm:"type:bigint" json:"parentId"`                       //父主键
+	RoleName  string `gorm:"type:varchar(255)" json:"roleName"`                 //角色别名
+	Sort      int    `gorm:"type:int" json:"sort"`                              //排序
+	RoleAlias string `gorm:"type:varchar(255)" json:"roleAlias"`                //角色别名
+	IsDeleted int    `gorm:"type:int" json:"isDeleted"`                         //是否删除
+}
+
+func (Role) TableName() string {
+	return "role"
+}
+
+func (c *Role) GetRole() error {
+	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
+}

app/system/dao/tenant.go

@@ -2,6 +2,7 @@ package dao
 
 import "time"
 
+// 租户
 type Tenant struct {
 	ID               int64     `gorm:"primary_key" json:"id"`                             //编号
 	TenantId         string    `gorm:"type:varchar(12);default '000000'" json:"tenantId"` //租户id
@@ -16,7 +17,7 @@ type Tenant struct {
 	ExpireTime       time.Time `gorm:"type:datetime" json:"expireTime"`                   //过期时间
 	DatasourceId     int64     `gorm:"type:bigint" json:"datasourceId"`                   //数据源
 	LicenseKey       string    `gorm:"type:varchar(1000)" json:"licenseKey"`              //授权码
-	BigScreeName     string    `gorm:"type:varchar(60)" json:"bigScreeName"`              //大屏端显示名称
+	BigScreenName    string    `gorm:"type:varchar(60)" json:"bigScreenName"`             //大屏端显示名称
 	CreateUser       int64     `gorm:"type:bigint" json:"createUser"`                     //创建人
 	CreateDept       int64     `gorm:"type:bigint" json:"createDept"`                     //创建部门
 	CreateTime       time.Time `gorm:"type:datetime" json:"createTime"`                   //新增时间
@@ -41,6 +42,7 @@ func (c *Tenant) GetTenantByPasskey() error {
 	return Db.Model(&c).Where("pass_key = ?", c.PassKey).Find(&c).Error
 }
 
+// 租户位置信息
 type TenantCode struct {
 	ID       int64   `gorm:"primary_key" json:"id"`              //编号
 	TenantId string  `gorm:"type:varchar(12)" json:"tenantId"`   //租户id

app/system/dao/user.go

@@ -9,18 +9,18 @@ type User struct {
 	ID                      int64     `gorm:"primary_key" json:"id"`                             //编号
 	TenantId                string    `gorm:"type:varchar(12);default '000000'" json:"tenantId"` //租户id
 	Code                    string    `gorm:"type:varchar(12)" json:"code"`                      //用户编号
-	Account                 string    `gorm:"type:varchar(12)" json:"account"`                   //账号
-	Password                string    `gorm:"type:varchar(12)" json:"password"`                  //密码
-	Name                    string    `gorm:"type:varchar(12)" json:"name"`                      //昵称
+	Account                 string    `gorm:"type:varchar(45)" json:"account"`                   //账号
+	Password                string    `gorm:"type:varchar(45)" json:"password"`                  //密码
+	Name                    string    `gorm:"type:varchar(20)" json:"name"`                      //昵称
 	RealName                string    `gorm:"type:varchar(12)" json:"realName"`                  //真名
-	Avatar                  string    `gorm:"type:varchar(12)" json:"avatar"`                    //头像
-	Email                   string    `gorm:"type:varchar(12)" json:"email"`                     //邮箱
-	Phone                   string    `gorm:"type:varchar(12)" json:"phone"`                     //手机
+	Avatar                  string    `gorm:"type:varchar(500)" json:"avatar"`                   //头像
+	Email                   string    `gorm:"type:varchar(45)" json:"email"`                     //邮箱
+	Phone                   string    `gorm:"type:varchar(45)" json:"phone"`                     //手机
 	Birthday                string    `gorm:"type:datetime" json:"birthday"`                     //生日
 	Sex                     int       `gorm:"type:smallint" json:"sex"`                          //生日
-	RoleId                  string    `gorm:"type:varchar(1000)" json:"roleId"`                  //角色id
-	DeptId                  string    `gorm:"type:varchar(1000)" json:"deptId"`                  //部门id
-	PostId                  string    `gorm:"type:varchar(1000)" json:"postId"`                  //岗位id
+	RoleId                  string    `gorm:"type:varchar(1000)" json:"roleId"`                  //角色id 数组,分隔
+	DeptId                  string    `gorm:"type:varchar(1000)" json:"deptId"`                  //部门id 数组,分隔
+	PostId                  string    `gorm:"type:varchar(1000)" json:"postId"`                  //岗位id 数组,分隔
 	CreateUser              int64     `gorm:"type:bigint" json:"createUser"`                     //创建人
 	CreateDept              int64     `gorm:"type:bigint" json:"createDept"`                     //创建部门
 	CreateTime              time.Time `gorm:"type:datetime" json:"createTime"`                   //新增时间
@@ -40,3 +40,14 @@ func (User) TableName() string {
 func (c *User) GetUser() error {
 	return Db.Model(&c).Where("id = ?", c.ID).Find(&c).Error
 }
+
+func (c *User) GetUserByPwd() error {
+	return Db.Model(&c).Where("tenant_id = ? and account = ? and password = ?", c.TenantId, c.Account,
+		c.Password).Find(&c).Error
+}
+
+func (c User) GetUsers(offset, limit int) ([]User, error) {
+	var users []User
+	err := Db.Model(&c).Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&users).Error
+	return users, err
+}

app/system/model/tenant.go

@@ -0,0 +1,6 @@
+package model
+
+const (
+	AdminTenantId = "1000000000000000" //默认租户
+	DES_KEY       = "0000000000000000" //租户授权码默认16位密钥
+)

app/system/model/token.go

@@ -32,7 +32,7 @@ type Token struct {
 }
 
 type UserInfo struct {
-	dao.User             //用户基础信息
+	*dao.User            //用户基础信息
 	Permissions []string //权限标识集合
 	Roles       []string //角色集合
 	OauthId     string   //第三方授权id
@@ -88,11 +88,12 @@ const (
 	Exp       = "exp"
 	Nbf       = "nbf"
 	BEARER    = "bearer"
-)
 
-const (
-	AdminTenantId = "1000000000000000" //默认租户
-	DES_KEY       = "0000000000000000" //租户授权码默认16位密钥
+	Audience     = "audience"
+	Issuer       = "issuser"
+	AccessToken  = "access_token"
+	RefreshToken = "refresh_token"
+	Saber        = "saber"
 )
 
 const (

app/system/model/user.go

@@ -0,0 +1,20 @@
+package model
+
+import "iot_manager_service/app/system/dao"
+
+type UserDetail struct {
+	dao.User
+	TenantName string `json:"tenantName"` //租户名
+	RoleName   string `json:"roleName"`   //角色名
+	DeptName   string `json:"deptName"`   //部门名
+	PostName   string `json:"postName"`   //岗位名
+	SexName    string `json:"sexName"`    //性别
+}
+
+type RsqUserList struct {
+	Records []dao.User `json:"records"` //记录列表
+	Current int        `json:"current"` //当前分页
+	Size    int        `json:"size"`    //每页数量
+	Pages   int        `json:"pages"`   //总页数
+	Total   int        `json:"total"`   //总数
+}

app/system/service/userService.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"io"
 	"iot_manager_service/app/system/dao"
+	"iot_manager_service/app/system/model"
+	"iot_manager_service/util"
 )
 
 // 用户管理服务
@@ -12,27 +14,49 @@ var UserService = new(userService)
 
 type userService struct{}
 
-func (s *userService) GetUserByPasskey(passKey string) (*dao.User, error) {
-	user := &dao.User{}
+func (s *userService) Get(id int64) (*model.UserDetail, error) {
+	user := &dao.User{
+		ID: id,
+	}
 	err := user.GetUser()
 	if err != nil {
 		return nil, err
 	}
-	return user, nil
+	detail := &model.UserDetail{
+		User:       *user,
+		TenantName: util.GetTenantName(user.TenantId, user.TenantId),
+		RoleName:   util.GetRoleNames(user.TenantId, user.RoleId),
+		DeptName:   "",
+		PostName:   "",
+		SexName:    util.GetSexName(user.TenantId, user.Sex),
+	}
+	return detail, nil
 }
 
-func (s *userService) GetOne(tenantId, account, password string) (dao.User, error) {
+func (s *userService) GetOne(tenantId, account, password string) *dao.User {
+	// 密码前端先MD5 后端再sha1加密
 	t := sha1.New()
 	_, _ = io.WriteString(t, password)
 	password = fmt.Sprintf("%x", t.Sum(nil))
-	user := dao.User{
+	user := &dao.User{
 		TenantId: tenantId,
 		Account:  account,
 		Password: password,
 	}
-	err := user.GetUser()
+	err := user.GetUserByPwd()
+	if err != nil {
+		return nil
+	}
+	return user
+}
+
+func (s *userService) List(current, size int) ([]dao.User, *util.Errors) {
+	user := dao.User{}
+	offset := (current - 1) * size
+	limit := size
+	users, err := user.GetUsers(offset, limit)
 	if err != nil {
-		return dao.User{}, err
+		return nil, util.FailResponse(err.Error(), nil)
 	}
-	return user, nil
+	return users, nil
 }

router/router.go

@@ -4,7 +4,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"iot_manager_service/app/device/controller"
 	"iot_manager_service/app/middleware"
-	user "iot_manager_service/app/system/controller"
+	system "iot_manager_service/app/system/controller"
 )
 
 func InitRouter(engine *gin.Engine) {
@@ -337,13 +337,20 @@ func InitRouter(engine *gin.Engine) {
 	//登录校验相关
 	auth := engine.Group("/api/blade-auth")
 	{
-		auth.POST("/oauth/token", user.Auth.Token)
-		auth.POST("/oauth/logout", user.Auth.Logout)
-		auth.GET("/oauth/captcha", user.Auth.Captcha)
-		auth.GET("/oauth/clear-cache", user.Auth.Clear)
+		auth.POST("/oauth/token", system.Auth.Token)
+		auth.POST("/oauth/logout", system.Auth.Logout)
+		auth.GET("/oauth/captcha", system.Auth.Captcha)
+		auth.GET("/oauth/clear-cache", system.Auth.Clear)
 	}
 	login := engine.Group("/login")
 	{
-		login.GET("", user.Auth.Login)
+		login.GET("", system.Auth.Login)
+	}
+
+	//用户
+	user := engine.Group("/api/blade-user")
+	{
+		user.GET("/detail", system.User.GetDetail)
+		user.GET("/page", system.User.List)
 	}
 }

util/redis.go

@@ -3,10 +3,11 @@ package util
 import (
 	"fmt"
 	"github.com/go-redis/redis"
-	"iot_manager_service/app/device/dao"
-	dao2 "iot_manager_service/app/system/dao"
+	device "iot_manager_service/app/device/dao"
+	system "iot_manager_service/app/system/dao"
 	"iot_manager_service/config"
 	"strconv"
+	"strings"
 	"time"
 )
 
@@ -31,20 +32,24 @@ func InitRedis() error {
 }
 
 const (
-	UserKey        = "user_%d"
-	ModuleTypeKey  = "module_type_%d"
-	ControlTypeKey = "control_type_%d"
+	UserKey        = "%s:sys:user:%d"
+	ModuleTypeKey  = "%s:dict:module_type:%d"
+	ControlTypeKey = "%s:dict:control_type:%d"
+	TenantNameKey  = "%s:sys:tenant_name:%s"
+	RoleNameKey    = "%s:sys:role_name:%d"
+	SexNameKey     = "%s:sys:sex_name:%d"
 
 	ControlType = "control_type"
 	ModuleType  = "module_his_type"
+	Sex         = "sex"
 )
 
-func GetUserName(id int64) string {
+func GetUserName(tenantId string, id int64) string {
 	var name string
-	key := fmt.Sprintf(UserKey, id)
+	key := fmt.Sprintf(UserKey, tenantId, id)
 	name, err := Redis.Get(key).Result()
 	if err != nil {
-		user := &dao2.User{ID: id}
+		user := &system.User{ID: id}
 		if err := user.GetUser(); err != nil {
 			fmt.Printf("GetUser err = %s \n", err)
 		} else {
@@ -55,12 +60,12 @@ func GetUserName(id int64) string {
 	return name
 }
 
-func GetModuleName(id int) string {
+func GetModuleName(tenantId string, id int) string {
 	var name string
-	key := fmt.Sprintf(ModuleTypeKey, id)
+	key := fmt.Sprintf(ModuleTypeKey, tenantId, id)
 	name, err := Redis.Get(key).Result()
 	if err != nil {
-		dict := &dao.Dict{Code: ModuleType, DictKey: strconv.Itoa(id)}
+		dict := &device.Dict{Code: ModuleType, DictKey: strconv.Itoa(id)}
 		if err := dict.GetByCodeAndKey(); err != nil {
 			fmt.Printf("GetByCodeAndKey err = %d \n", err)
 		} else {
@@ -71,12 +76,12 @@ func GetModuleName(id int) string {
 	return name
 }
 
-func GetControlType(id int) string {
+func GetControlType(tenantId string, id int) string {
 	var name string
-	key := fmt.Sprintf(ControlTypeKey, id)
+	key := fmt.Sprintf(ControlTypeKey, tenantId, id)
 	name, err := Redis.Get(key).Result()
 	if err != nil {
-		dict := &dao.Dict{Code: ControlType, DictKey: strconv.Itoa(id)}
+		dict := &device.Dict{Code: ControlType, DictKey: strconv.Itoa(id)}
 		if err := dict.GetByCodeAndKey(); err != nil {
 			fmt.Printf("GetByCodeAndKey err = %d \n", err)
 		} else {
@@ -86,3 +91,65 @@ func GetControlType(id int) string {
 	}
 	return name
 }
+
+func GetSexName(tenantId string, id int) string {
+	var name string
+	key := fmt.Sprintf(SexNameKey, tenantId, id)
+	name, err := Redis.Get(key).Result()
+	if err != nil {
+		dict := &device.Dict{Code: Sex, DictKey: strconv.Itoa(id)}
+		if err := dict.GetByCodeAndKey(); err != nil {
+			fmt.Printf("GetByCodeAndKey err = %d \n", err)
+		} else {
+			name = dict.DictValue
+			Redis.Set(key, name, -1)
+		}
+	}
+	return name
+}
+
+func GetTenantName(tenantId string, id string) string {
+	var name string
+	key := fmt.Sprintf(TenantNameKey, tenantId, id)
+	name, err := Redis.Get(key).Result()
+	if err != nil {
+		tenant := &system.Tenant{TenantId: id}
+		if err := tenant.GetTenant(); err != nil {
+			fmt.Printf("GetTenant err = %s \n", err)
+		} else {
+			name = tenant.TenantName
+			Redis.Set(key, name, -1)
+		}
+	}
+	return name
+}
+
+func GetRoleNames(tenantId string, roleIds string) string {
+	roleIdArr := strings.Split(roleIds, ",")
+	names := ""
+	for _, roleId := range roleIdArr {
+		id, _ := strconv.ParseInt(roleId, 10, 64)
+		name := GetRoleName(tenantId, id)
+		names = names + name + ","
+	}
+	if len(names) > 0 {
+		return names[:len(names)-1]
+	}
+	return names
+}
+
+func GetRoleName(tenantId string, roleId int64) string {
+	var name string
+	key := fmt.Sprintf(RoleNameKey, tenantId, roleId)
+	name, err := Redis.Get(key).Result()
+	if err != nil {
+		role := &system.Role{ID: roleId}
+		if err := role.GetRole(); err != nil {
+			fmt.Printf("GetRole err = %s \n", err)
+		} else {
+			name = role.RoleName
+			Redis.Set(key, name, -1)
+		}
+	}
+	return name
+}