修改分页返回数据结构体

server/model/asset.go

@@ -23,7 +23,7 @@ type Asset struct {
 	Owner        string         `gorm:"index" json:"owner"`
 }
 
-type AssetVo struct {
+type AssetForPage struct {
 	ID          string         `json:"id"`
 	Name        string         `json:"name"`
 	IP          string         `json:"ip"`

server/model/command.go

@@ -12,7 +12,7 @@ type Command struct {
 	Owner   string         `gorm:"index" json:"owner"`
 }
 
-type CommandVo struct {
+type CommandForPage struct {
 	ID          string         `gorm:"primary_key" json:"id"`
 	Name        string         `json:"name"`
 	Content     string         `json:"content"`

server/model/credential.go

@@ -20,7 +20,7 @@ func (r *Credential) TableName() string {
 	return "credentials"
 }
 
-type CredentialVo struct {
+type CredentialForPage struct {
 	ID          string         `json:"id"`
 	Name        string         `json:"name"`
 	Type        string         `json:"type"`

server/model/login_log.go

@@ -14,7 +14,7 @@ type LoginLog struct {
 	Remember        bool           `json:"remember"`
 }
 
-type LoginLogVo struct {
+type LoginLogForPage struct {
 	ID              string         `json:"id"`
 	UserId          string         `json:"userId"`
 	UserName        string         `json:"userName"`

server/model/session.go

@@ -32,7 +32,7 @@ func (r *Session) TableName() string {
 	return "sessions"
 }
 
-type SessionVo struct {
+type SessionForPage struct {
 	ID               string         `json:"id"`
 	Protocol         string         `json:"protocol"`
 	IP               string         `json:"ip"`

server/model/user.go

@@ -17,7 +17,7 @@ type User struct {
 	Mail       string         `json:"mail"`
 }
 
-type UserVo struct {
+type UserForPage struct {
 	ID               string         `json:"id"`
 	Username         string         `json:"username"`
 	Nickname         string         `json:"nickname"`

server/model/user_group.go

@@ -5,10 +5,16 @@ import (
 )
 
 type UserGroup struct {
-	ID         string         `gorm:"primary_key" json:"id"`
+	ID      string         `gorm:"primary_key" json:"id"`
+	Name    string         `json:"name"`
+	Created utils.JsonTime `json:"created"`
+}
+
+type UserGroupForPage struct {
+	ID         string         `json:"id"`
 	Name       string         `json:"name"`
 	Created    utils.JsonTime `json:"created"`
-	AssetCount int64          `gorm:"-" json:"assetCount"`
+	AssetCount int64          `json:"assetCount"`
 }
 
 func (r *UserGroup) TableName() string {

server/repository/asset.go

@@ -57,7 +57,7 @@ func (r AssetRepository) FindByProtocolAndUser(protocol string, account model.Us
 	return
 }
 
-func (r AssetRepository) Find(pageIndex, pageSize int, name, protocol, tags string, account model.User, owner, sharer, userGroupId, ip, order, field string) (o []model.AssetVo, total int64, err error) {
+func (r AssetRepository) Find(pageIndex, pageSize int, name, protocol, tags string, account model.User, owner, sharer, userGroupId, ip, order, field string) (o []model.AssetForPage, total int64, err error) {
 	db := r.DB.Table("assets").Select("assets.id,assets.name,assets.ip,assets.port,assets.protocol,assets.active,assets.owner,assets.created,assets.tags, users.nickname as owner_name,COUNT(resource_sharers.user_id) as sharer_count").Joins("left join users on assets.owner = users.id").Joins("left join resource_sharers on assets.id = resource_sharers.resource_id").Group("assets.id")
 	dbCounter := r.DB.Table("assets").Select("DISTINCT assets.id").Joins("left join resource_sharers on assets.id = resource_sharers.resource_id").Group("assets.id")
 
@@ -140,7 +140,7 @@ func (r AssetRepository) Find(pageIndex, pageSize int, name, protocol, tags stri
 	err = db.Order("assets." + field + " " + order).Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&o).Error
 
 	if o == nil {
-		o = make([]model.AssetVo, 0)
+		o = make([]model.AssetForPage, 0)
 	}
 	return
 }

server/repository/command.go

@@ -16,7 +16,7 @@ func NewCommandRepository(db *gorm.DB) *CommandRepository {
 	return commandRepository
 }
 
-func (r CommandRepository) Find(pageIndex, pageSize int, name, content, order, field string, account model.User) (o []model.CommandVo, total int64, err error) {
+func (r CommandRepository) Find(pageIndex, pageSize int, name, content, order, field string, account model.User) (o []model.CommandForPage, total int64, err error) {
 	db := r.DB.Table("commands").Select("commands.id,commands.name,commands.content,commands.owner,commands.created, users.nickname as owner_name,COUNT(resource_sharers.user_id) as sharer_count").Joins("left join users on commands.owner = users.id").Joins("left join resource_sharers on commands.id = resource_sharers.resource_id").Group("commands.id")
 	dbCounter := r.DB.Table("commands").Select("DISTINCT commands.id").Joins("left join resource_sharers on commands.id = resource_sharers.resource_id").Group("commands.id")
 
@@ -55,7 +55,7 @@ func (r CommandRepository) Find(pageIndex, pageSize int, name, content, order, f
 
 	err = db.Order("commands." + field + " " + order).Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&o).Error
 	if o == nil {
-		o = make([]model.CommandVo, 0)
+		o = make([]model.CommandForPage, 0)
 	}
 	return
 }

server/repository/credential.go

@@ -25,7 +25,7 @@ func (r CredentialRepository) FindByUser(account model.User) (o []model.Credenti
 	return
 }
 
-func (r CredentialRepository) Find(pageIndex, pageSize int, name, order, field string, account model.User) (o []model.CredentialVo, total int64, err error) {
+func (r CredentialRepository) Find(pageIndex, pageSize int, name, order, field string, account model.User) (o []model.CredentialForPage, total int64, err error) {
 	db := r.DB.Table("credentials").Select("credentials.id,credentials.name,credentials.type,credentials.username,credentials.owner,credentials.created,users.nickname as owner_name,COUNT(resource_sharers.user_id) as sharer_count").Joins("left join users on credentials.owner = users.id").Joins("left join resource_sharers on credentials.id = resource_sharers.resource_id").Group("credentials.id")
 	dbCounter := r.DB.Table("credentials").Select("DISTINCT credentials.id").Joins("left join resource_sharers on credentials.id = resource_sharers.resource_id").Group("credentials.id")
 
@@ -59,7 +59,7 @@ func (r CredentialRepository) Find(pageIndex, pageSize int, name, order, field s
 
 	err = db.Order("credentials." + field + " " + order).Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&o).Error
 	if o == nil {
-		o = make([]model.CredentialVo, 0)
+		o = make([]model.CredentialForPage, 0)
 	}
 	return
 }

server/repository/login_log.go

@@ -15,7 +15,7 @@ func NewLoginLogRepository(db *gorm.DB) *LoginLogRepository {
 	return loginLogRepository
 }
 
-func (r LoginLogRepository) Find(pageIndex, pageSize int, userId, clientIp string) (o []model.LoginLogVo, total int64, err error) {
+func (r LoginLogRepository) Find(pageIndex, pageSize int, userId, clientIp string) (o []model.LoginLogForPage, total int64, err error) {
 
 	db := r.DB.Table("login_logs").Select("login_logs.id,login_logs.user_id,login_logs.client_ip,login_logs.client_user_agent,login_logs.login_time, login_logs.logout_time, users.nickname as user_name").Joins("left join users on login_logs.user_id = users.id")
 	dbCounter := r.DB.Table("login_logs").Select("DISTINCT login_logs.id")
@@ -37,7 +37,7 @@ func (r LoginLogRepository) Find(pageIndex, pageSize int, userId, clientIp strin
 
 	err = db.Order("login_logs.login_time desc").Offset((pageIndex - 1) * pageSize).Limit(pageSize).Find(&o).Error
 	if o == nil {
-		o = make([]model.LoginLogVo, 0)
+		o = make([]model.LoginLogForPage, 0)
 	}
 	return
 }

server/repository/session.go

@@ -20,7 +20,7 @@ func NewSessionRepository(db *gorm.DB) *SessionRepository {
 	return sessionRepository
 }
 
-func (r SessionRepository) Find(pageIndex, pageSize int, status, userId, clientIp, assetId, protocol string) (results []model.SessionVo, total int64, err error) {
+func (r SessionRepository) Find(pageIndex, pageSize int, status, userId, clientIp, assetId, protocol string) (results []model.SessionForPage, total int64, err error) {
 
 	db := r.DB
 	var params []interface{}
@@ -62,7 +62,7 @@ func (r SessionRepository) Find(pageIndex, pageSize int, status, userId, clientI
 	err = db.Raw(itemSql, params...).Scan(&results).Error
 
 	if results == nil {
-		results = make([]model.SessionVo, 0)
+		results = make([]model.SessionForPage, 0)
 	}
 	return
 }

server/repository/user.go

@@ -22,7 +22,7 @@ func (r UserRepository) FindAll() (o []model.User) {
 	return
 }
 
-func (r UserRepository) Find(pageIndex, pageSize int, username, nickname, mail, order, field string) (o []model.UserVo, total int64, err error) {
+func (r UserRepository) Find(pageIndex, pageSize int, username, nickname, mail, order, field string) (o []model.UserForPage, total int64, err error) {
 	db := r.DB.Table("users").Select("users.id,users.username,users.nickname,users.mail,users.online,users.enabled,users.created,users.type, count(resource_sharers.user_id) as sharer_asset_count, users.totp_secret").Joins("left join resource_sharers on users.id = resource_sharers.user_id and resource_sharers.resource_type = 'asset'").Group("users.id")
 	dbCounter := r.DB.Table("users")
 	if len(username) > 0 {
@@ -61,7 +61,7 @@ func (r UserRepository) Find(pageIndex, pageSize int, username, nickname, mail,
 
 	err = db.Order("users." + field + " " + order).Find(&o).Offset((pageIndex - 1) * pageSize).Limit(pageSize).Error
 	if o == nil {
-		o = make([]model.UserVo, 0)
+		o = make([]model.UserForPage, 0)
 	}
 
 	for i := 0; i < len(o); i++ {

server/repository/user_group.go

@@ -23,7 +23,7 @@ func (r UserGroupRepository) FindAll() (o []model.UserGroup) {
 	return
 }
 
-func (r UserGroupRepository) Find(pageIndex, pageSize int, name, order, field string) (o []model.UserGroup, total int64, err error) {
+func (r UserGroupRepository) Find(pageIndex, pageSize int, name, order, field string) (o []model.UserGroupForPage, total int64, err error) {
 	db := r.DB.Table("user_groups").Select("user_groups.id, user_groups.name, user_groups.created, count(resource_sharers.user_group_id) as asset_count").Joins("left join resource_sharers on user_groups.id = resource_sharers.user_group_id and resource_sharers.resource_type = 'asset'").Group("user_groups.id")
 	dbCounter := r.DB.Table("user_groups")
 	if len(name) > 0 {
@@ -50,7 +50,7 @@ func (r UserGroupRepository) Find(pageIndex, pageSize int, name, order, field st
 
 	err = db.Order("user_groups." + field + " " + order).Find(&o).Offset((pageIndex - 1) * pageSize).Limit(pageSize).Error
 	if o == nil {
-		o = make([]model.UserGroup, 0)
+		o = make([]model.UserGroupForPage, 0)
 	}
 	return
 }