修改system模块-1

app/middleware/checkAuth.go

@@ -20,7 +20,7 @@ func CheckAuth() gin.HandlerFunc {
 
 		authorization := ctx.GetHeader(Authorization)
 		if authorization != "" {
-			token := parseAccessToken(authorization)
+			token := ParseAccessToken(authorization)
 			if token != nil {
 				ctx.Set(Authorization, token)
 				ctx.Next()

app/middleware/token.go

@@ -41,7 +41,7 @@ func GetAccessToken(userId, roleId int64, tenantId int, userName string, random
 	return claims.SignedString([]byte(config.Instance().Server.TokenSign))
 }
 
-func parseAccessToken(authorization string) *Claims {
+func ParseAccessToken(authorization string) *Claims {
 	token, err := jwt.ParseWithClaims(authorization, &Claims{}, EmptyKeyFunc)
 	if err != nil {
 		return nil

app/system/controller/role.go

@@ -85,7 +85,11 @@ func (c *role) Remove(ctx *gin.Context) {
 		return
 	}
 	err := service.RoleService.Remove(req.IDs)
-	ctx.JSON(http.StatusOK, err)
+	if err == nil {
+		ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, nil))
+	} else {
+		ctx.JSON(http.StatusOK, err)
+	}
 }
 
 func (c *role) GetList(ctx *gin.Context) {

app/system/controller/user.go

@@ -1,7 +1,10 @@
 package controller
 
 import (
+	"crypto/sha1"
+	"fmt"
 	"github.com/gin-gonic/gin"
+	"io"
 	"iot_manager_service/app/middleware"
 	"iot_manager_service/app/system/dao"
 	"iot_manager_service/app/system/model"
@@ -45,30 +48,59 @@ func (c *user) List(ctx *gin.Context) {
 		size = 10
 	}
 
-	users, err := service.UserService.List(account, realName, current, size)
+	users, counts, err := service.UserService.List(account, realName, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return
 	}
-	pages := math.Ceil(float64(len(users)) / float64(size))
+	pages := int(math.Ceil(float64(counts) / float64(size)))
 	rsp := model.RsqUserList{
 		Current: current,
 		Size:    size,
-		Total:   len(users),
-		Pages:   int(pages),
+		Total:   counts,
+		Pages:   pages,
 		Records: users,
 	}
 	ctx.JSON(http.StatusOK, common.SuccessResponse(common.Succeeded, rsp))
 }
 
+func (c *user) Info(ctx *gin.Context) {
+	authorization := ctx.GetHeader("Authorization")
+	claims := middleware.ParseAccessToken(authorization)
+	var userInfo = &dao.User{ID: claims.UserId}
+
+	err := service.UserService.Info(userInfo)
+
+	if err == nil {
+		ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, userInfo))
+	} else {
+		ctx.JSON(http.StatusOK, err)
+	}
+}
+
 func (c *user) Submit(ctx *gin.Context) {
 	var req dao.User
 	if err := ctx.ShouldBindJSON(&req); err != nil {
 		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(err.Error(), nil))
 		return
 	}
+	//判断Account是否存在
+	if c.IsExist(req) {
+		ctx.JSON(http.StatusOK, common.FailResponse("账号已存在!", nil))
+		return
+	}
+	// 密码sha1加密
+	t := sha1.New()
+	_, _ = io.WriteString(t, req.Password)
+	password := fmt.Sprintf("%x", t.Sum(nil))
+	req.Password = password
+
 	err := service.UserService.Submit(req)
-	ctx.JSON(http.StatusOK, err)
+	if err == nil {
+		ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, nil))
+	} else {
+		ctx.JSON(http.StatusOK, err)
+	}
 }
 
 func (c *user) Update(ctx *gin.Context) {
@@ -95,7 +127,11 @@ func (c *user) Remove(ctx *gin.Context) {
 		return
 	}
 	err := service.UserService.Remove(claims.UserId, req.IDs)
-	ctx.JSON(http.StatusOK, err)
+	if err == nil {
+		ctx.JSON(http.StatusOK, common.SuccessResponse(common.Success, nil))
+	} else {
+		ctx.JSON(http.StatusOK, err)
+	}
 }
 
 func (c *user) ResetPwd(ctx *gin.Context) {
@@ -131,3 +167,7 @@ func (c *user) Grant(ctx *gin.Context) {
 	err := service.UserService.Grant(uIds, req.RoleIds)
 	ctx.JSON(http.StatusOK, err)
 }
+
+func (c *user) IsExist(user dao.User) bool {
+	return service.UserService.IsExist(user)
+}

app/system/dao/operationHisDao.go

@@ -25,10 +25,12 @@ func (c *OperationHistory) Create() error {
 	return Db.Debug().Model(&c).Save(&c).Error
 }
 
-func (c OperationHistory) GetHistories(offset, limit int) ([]OperationHistory, int, error) {
+func (c OperationHistory) GetHistories(offset, limit int) ([]OperationHistory, int64, error) {
 	var list []OperationHistory
 	var counts int64
 	db := Db.Debug().Model(&c)
+	db.Count(&counts)
+
 	if c.OperationType > 0 {
 		db = db.Where("operation_type = ?", c.OperationType)
 	}
@@ -40,6 +42,6 @@ func (c OperationHistory) GetHistories(offset, limit int) ([]OperationHistory, i
 	}
 
 	err := db.Order("handle_time DESC").Offset(offset).Limit(limit).Find(&list).Error
-	db.Count(&counts)
-	return list, int(counts), err
+
+	return list, counts, err
 }

app/system/dao/role.go

@@ -25,7 +25,10 @@ func (c *Role) GetRole() error {
 
 func (c Role) GetRoles(offset, limit int) ([]Role, int, error) {
 	var Roles []Role
+	var counts int64
 	db := Db.Debug().Model(&c)
+	db.Count(&counts)
+
 	if c.RoleName != "" {
 		db = db.Where("role_name like ?", "%"+c.RoleName+"%")
 	}
@@ -36,8 +39,7 @@ func (c Role) GetRoles(offset, limit int) ([]Role, int, error) {
 		db = db.Where("tenant_id like ?", "%"+c.TenantId+"%")
 	}
 	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&Roles).Error
-	var counts int64
-	db.Count(&counts)
+
 	return Roles, int(counts), err
 }
 

app/system/dao/user.go

@@ -1,34 +1,35 @@
 package dao
 
 import (
+	"fmt"
 	"time"
 )
 
 // User 用户
 type User struct {
-	ID                      int64     `gorm:"primary_key;type:bigint" json:"id"`                //编号
-	TenantId                int       `gorm:"type:int" json:"tenantId"`                         //租户ID
-	Code                    string    `gorm:"type:varchar(12)" json:"code"`                     //用户编号
-	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(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                  int64     `gorm:"type:bigint" json:"roleId"`                        //角色id 数组,分隔
-	CreateUser              int64     `gorm:"type:bigint" json:"createUser"`                    //创建人
-	CreateDept              int64     `gorm:"type:bigint" json:"createDept"`                    //创建部门
-	CreateTime              time.Time `gorm:"type:datetime" json:"createTime"`                  //新增时间
-	UpdateUser              int64     `gorm:"type:bigint" json:"updateUser"`                    //修改人
-	UpdateTime              time.Time `gorm:"type:datetime" json:"updateTime"`                  //修改时间
-	Status                  int       `gorm:"type:int  " json:"status"`                         //状态
-	IsDeleted               int       `gorm:"type:int" json:"isDeleted"`                        //是否删除 0=未删除,1=删除
-	GroupId                 int       `gorm:"type:int" json:"groupId"`                          //用户分组id
-	BigScreenIndexCameraIds string    `gorm:"type:varchar(255)" json:"bigScreenIndexCameraIds"` //数据大屏中摄像头保存位置
-	SecuritySixScreen       string    `gorm:"type:varchar(255)" json:"securitySixScreen"`       //安防页面六分屏
+	ID                      int64     `gorm:"primary_key;type:bigint" json:"id"`                                  //编号
+	TenantId                int       `gorm:"type:int" json:"tenantId"`                                           //租户ID
+	Code                    string    `gorm:"type:varchar(12)" json:"code"`                                       //用户编号
+	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(500)" json:"avatar"`                                    //头像
+	Email                   string    `gorm:"type:varchar(45)" json:"email"`                                      //邮箱
+	Phone                   string    `gorm:"type:varchar(45)" json:"phone"`                                      //手机
+	Birthday                string    `gorm:"type:string" json:"birthday"`                                        //生日
+	Sex                     int       `gorm:"type:smallint" json:"sex"`                                           //生日
+	RoleId                  int64     `gorm:"type:bigint" json:"roleId"`                                          //角色id 数组,分隔
+	CreateUser              int64     `gorm:"type:bigint" json:"createUser"`                                      //创建人
+	CreateDept              int64     `gorm:"type:bigint" json:"createDept"`                                      //创建部门
+	CreateTime              time.Time `gorm:"autoCreateTime;column:create_time;type:datetime;" json:"createTime"` //新增时间
+	UpdateUser              int64     `gorm:"type:bigint" json:"updateUser"`                                      //修改人
+	UpdateTime              time.Time `gorm:"autoUpdateTime;column:update_time;type:datetime;" json:"updateTime"` //修改时间
+	Status                  int       `gorm:"type:int  " json:"status"`                                           //状态
+	IsDeleted               int       `gorm:"type:int" json:"isDeleted"`                                          //是否删除 0=未删除,1=删除
+	GroupId                 int       `gorm:"type:int" json:"groupId"`                                            //用户分组id
+	BigScreenIndexCameraIds string    `gorm:"type:varchar(255)" json:"bigScreenIndexCameraIds"`                   //数据大屏中摄像头保存位置
+	SecuritySixScreen       string    `gorm:"type:varchar(255)" json:"securitySixScreen"`                         //安防页面六分屏
 }
 type JsonInt64 int64
 
@@ -41,7 +42,7 @@ func (User) TableName() string {
 }
 
 func (c *User) GetUser() error {
-	return Db.Debug().Model(&c).Where("id = ? and is_deleted = 0", c.ID).Find(&c).Error
+	return Db.Debug().Model(&c).Where(" is_deleted = 0").Find(&c).Error
 }
 
 func (c *User) GetUserByTenantId() error {
@@ -52,9 +53,12 @@ func (c *User) GetUserByPwd() error {
 	return Db.Debug().Model(&c).Where("tenant_id = ? and account = ? and password = ? and is_deleted = 0", c.TenantId, c.Account, c.Password).First(&c).Error
 }
 
-func (c User) GetUsers(offset, limit int) ([]User, error) {
+func (c User) GetUsers(offset, limit int) ([]User, int64, error) {
 	var users []User
+	var counts int64
 	db := Db.Debug().Model(&c)
+	db.Count(&counts)
+
 	if c.Account != "" {
 		db = db.Where("account like ?", "%"+c.Account+"%")
 	}
@@ -62,7 +66,8 @@ func (c User) GetUsers(offset, limit int) ([]User, error) {
 		db = db.Where("real_name like ?", "%"+c.RealName+"%")
 	}
 	err := db.Where("is_deleted = 0").Offset(offset).Limit(limit).Find(&users).Error
-	return users, err
+
+	return users, counts, err
 }
 
 func (c *User) Save() error {
@@ -91,3 +96,11 @@ func (c *User) UpdateRoles(userIds []string, roleIds string) error {
 	err := Db.Debug().Model(&c).Where("id in ?", userIds).Updates(map[string]interface{}{"role_id": roleIds}).Error
 	return err
 }
+
+// IsExist : true为存在,false不存在
+func (c *User) IsExist() bool {
+	var s string
+	r := Db.Debug().Model(&c).Select("account").Where("account = ?", c.Account).First(&s).Error
+	fmt.Printf("ERROR:%v\n account:%v\n return:%v\n", r, s, s != "")
+	return s != ""
+}

app/system/model/OperationHis.go

@@ -17,5 +17,5 @@ type RsqOperationHisList struct {
 	Current int                  `json:"current"` //当前分页
 	Size    int                  `json:"size"`    //每页数量
 	Pages   int                  `json:"pages"`   //总页数
-	Total   int                  `json:"total"`   //总数
+	Total   int64                `json:"total"`   //总数
 }

app/system/model/role.go

@@ -1,13 +1,22 @@
 package model
 
-import "iot_manager_service/app/system/dao"
-
 type RsqRoleList struct {
-	Records []dao.Role `json:"records"` //记录列表
-	Current int        `json:"current"` //当前分页
-	Size    int        `json:"size"`    //每页数量
-	Pages   int        `json:"pages"`   //总页数
-	Total   int        `json:"total"`   //总数
+	Records []RoleVO `json:"records"` //记录列表
+	Current int      `json:"current"` //当前分页
+	Size    int      `json:"size"`    //每页数量
+	Pages   int      `json:"pages"`   //总页数
+	Total   int      `json:"total"`   //总数
+}
+
+type RoleVO struct {
+	ID         int64  `gorm:"primary_key" json:"id"`                             //编号
+	TenantId   string `gorm:"type:varchar(12);default '000000'" json:"tenantId"` //
+	ParentName string `json:"parentName"`
+	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"`          //是否删除
 }
 
 type ReqRoleRemove struct {

app/system/model/user.go

@@ -14,7 +14,7 @@ type RsqUserList struct {
 	Current int          `json:"current"` //当前分页
 	Size    int          `json:"size"`    //每页数量
 	Pages   int          `json:"pages"`   //总页数
-	Total   int          `json:"total"`   //总数
+	Total   int64        `json:"total"`   //总数
 }
 
 type ReqUserRemove struct {

app/system/service/operationHisService.go

@@ -33,7 +33,7 @@ func (s *operationHisService) Save(userId int64, tenantId int, handleType, handl
 }
 
 func (s *operationHisService) List(tenantId int, handleContent, operationType, moduleType string, current,
-	size int) ([]model.OperationHisDetail, int, *common.Errors) {
+	size int) ([]model.OperationHisDetail, int64, *common.Errors) {
 	his := dao.OperationHistory{
 		Object: handleContent,
 	}

app/system/service/roleService.go

@@ -26,7 +26,7 @@ func (s *roleService) Get(id int64) (*dao.Role, error) {
 	return role, nil
 }
 
-func (s *roleService) List(roleName, tenantId, roleAlias string, current, size int) ([]dao.Role, int, error) {
+func (s *roleService) List(roleName, tenantId, roleAlias string, current, size int) ([]model.RoleVO, int, error) {
 	role := &dao.Role{}
 	offset := (current - 1) * size
 	limit := size
@@ -41,10 +41,27 @@ func (s *roleService) List(roleName, tenantId, roleAlias string, current, size i
 	}
 
 	roles, counts, err := role.GetRoles(offset, limit)
+	var result []model.RoleVO
+	var temp model.RoleVO
+	for _, v := range roles {
+		temp.ID = v.ID
+		temp.TenantId = v.TenantId
+		temp.ParentId = v.ParentId
+		temp.RoleName = v.RoleName
+		temp.IsDeleted = v.IsDeleted
+		temp.RoleAlias = v.RoleAlias
+		temp.Sort = v.Sort
+		for _, va := range roles {
+			if va.ID == temp.ParentId {
+				temp.ParentName = va.RoleName
+			}
+		}
+		result = append(result, temp)
+	}
 	if err != nil {
 		return nil, 0, err
 	}
-	return roles, counts, nil
+	return result, counts, nil
 }
 
 func (s *roleService) Submit(req dao.Role) *common.Errors {

app/system/service/userService.go

@@ -62,7 +62,7 @@ func (s *userService) GetOne(tenantId int, account, password string) *dao.User {
 	return user
 }
 
-func (s *userService) List(account, realName string, current, size int) ([]model.UserDetail, *common.Errors) {
+func (s *userService) List(account, realName string, current, size int) ([]model.UserDetail, int64, *common.Errors) {
 	user := dao.User{}
 	offset := (current - 1) * size
 	limit := size
@@ -73,9 +73,9 @@ func (s *userService) List(account, realName string, current, size int) ([]model
 		user.RealName = realName
 	}
 
-	users, err := user.GetUsers(offset, limit)
+	users, counts, err := user.GetUsers(offset, limit)
 	if err != nil {
-		return nil, common.FailResponse(err.Error(), nil)
+		return nil, 0, common.FailResponse(err.Error(), nil)
 	}
 	var details []model.UserDetail
 	for _, user := range users {
@@ -86,11 +86,24 @@ func (s *userService) List(account, realName string, current, size int) ([]model
 			SexName:    DictService.GetSexName(user.TenantId, user.Sex),
 		})
 	}
-	return details, nil
+	return details, counts, nil
 }
 
+func (s *userService) Info(userInfo *dao.User) *common.Errors {
+
+	err := userInfo.GetUser()
+	if err != nil {
+		return common.FailResponse(err.Error(), nil)
+	}
+	return nil
+}
+
+// Submit Birthday为""时在数据库报错,给一个默认值.
 func (s *userService) Submit(req dao.User) *common.Errors {
 	user := &req
+	if user.Birthday == "" {
+		user.Birthday = "1900-01-01 00:00:00"
+	}
 	err := user.Save()
 	if err != nil {
 		return common.FailResponse(err.Error(), nil)
@@ -100,6 +113,9 @@ func (s *userService) Submit(req dao.User) *common.Errors {
 
 func (s *userService) Update(req dao.User) *common.Errors {
 	user := &req
+	if user.Birthday == "" {
+		user.Birthday = "1900-01-01 00:00:00"
+	}
 	err := user.Update()
 	if err != nil {
 		return common.FailResponse(err.Error(), nil)
@@ -161,3 +177,7 @@ func (s *userService) GetUserName(tenantId int, id int64) string {
 	}
 	return name
 }
+
+func (s *userService) IsExist(user dao.User) bool {
+	return user.IsExist()
+}

app/warn/service/noticeSetService.go

@@ -139,7 +139,7 @@ func (s noticeSetService) GetById(id string) (*model.NoticeSetDetail, error) {
 
 func (s noticeSetService) UserList(account string, name string, current int, size int) ([]model.NoticeSetDUserList, error) {
 	var list []model.NoticeSetDUserList
-	userList, _ := systemService.UserService.List(account, name, current, size)
+	userList, _, _ := systemService.UserService.List(account, name, current, size)
 	for _, user := range userList {
 		idStr := strconv.Itoa(int(user.ID))
 		list = append(list, model.NoticeSetDUserList{ID: idStr, Name: user.Name})
@@ -153,7 +153,7 @@ func (s noticeSetService) getUserName(ids string) string {
 	for i, v := range split {
 		fm[v] = i
 	}
-	userList, _ := systemService.UserService.List("", "", 0, 1000)
+	userList, _, _ := systemService.UserService.List("", "", 0, 1000)
 	new := []string{}
 	for _, detail := range userList {
 		id := strconv.Itoa(int(detail.ID))

router/router.go

@@ -385,6 +385,7 @@ func InitRouter(engine *gin.Engine) {
 		user.POST("/user-list", system.User.GetList)
 		user.POST("/grant", system.User.Grant)
 		//todo 添加/info 路由
+		user.GET("/info", system.User.Info)
 	}
 
 	//租户

util/common/common.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"gorm.io/gorm"
 	"math/rand"
+	"reflect"
 	"strconv"
 	"strings"
 	"time"
@@ -282,3 +283,16 @@ func InIntArr(target int, str_array []int) bool {
 	}
 	return false
 }
+
+func ACopyToB(a interface{}, b interface{}) {
+	vVal := reflect.ValueOf(a).Elem() //获取reflect.Type类型
+	bVal := reflect.ValueOf(b).Elem() //获取reflect.Type类型
+	vTypeOfT := vVal.Type()
+	for i := 0; i < vVal.NumField(); i++ {
+		// 在要修改的结构体中查询有数据结构体中相同属性的字段，有则修改其值
+		name := vTypeOfT.Field(i).Name
+		if ok := bVal.FieldByName(name).IsValid(); ok {
+			bVal.FieldByName(name).Set(reflect.ValueOf(vVal.Field(i).Interface()))
+		}
+	}
+}