diff --git a/entity/friend.go b/entity/friend.go index 69d4b6c..8012c27 100644 --- a/entity/friend.go +++ b/entity/friend.go @@ -1,22 +1,24 @@ package entity import ( + "go-wechat/common/types" "time" ) // Friend // @description: 好友列表 type Friend struct { - Wxid string `json:"wxid"` // 微信原始Id - CustomAccount string `json:"customAccount"` // 微信号 - Nickname string `json:"nickname"` // 昵称 - Pinyin string `json:"pinyin"` // 昵称拼音大写首字母 - PinyinAll string `json:"pinyinAll"` // 昵称全拼 - EnableAi bool `json:"enableAI" gorm:"type:tinyint(1) default 0 not null"` // 是否使用AI - AiModel string `json:"aiModel"` // AI模型 - EnableChatRank bool `json:"enableChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否使用聊天排行 - EnableWelcome bool `json:"enableWelcome" gorm:"type:tinyint(1) default 0 not null"` // 是否启用迎新 - IsOk bool `json:"isOk" gorm:"type:tinyint(1) default 0 not null"` // 是否正常 + Wxid string `json:"wxid"` // 微信原始Id + CustomAccount string `json:"customAccount"` // 微信号 + Nickname string `json:"nickname"` // 昵称 + Pinyin string `json:"pinyin"` // 昵称拼音大写首字母 + PinyinAll string `json:"pinyinAll"` // 昵称全拼 + LastActive types.DateTime `json:"lastActive"` // 最后活跃时间 + EnableAi bool `json:"enableAI" gorm:"type:tinyint(1) default 0 not null"` // 是否使用AI + AiModel string `json:"aiModel"` // AI模型 + EnableChatRank bool `json:"enableChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否使用聊天排行 + EnableWelcome bool `json:"enableWelcome" gorm:"type:tinyint(1) default 0 not null"` // 是否启用迎新 + IsOk bool `json:"isOk" gorm:"type:tinyint(1) default 0 not null"` // 是否正常 } func (Friend) TableName() string { @@ -34,6 +36,7 @@ type GroupUser struct { IsMember bool `json:"isMember" gorm:"type:tinyint(1) default 0 not null"` // 是否群成员 IsAdmin bool `json:"isAdmin" gorm:"type:tinyint(1) default 0 not null"` // 是否群主 JoinTime time.Time `json:"joinTime"` // 加入时间 + LastActive time.Time `json:"lastActive"` // 最后活跃时间 LeaveTime *time.Time `json:"leaveTime"` // 离开时间 SkipChatRank bool `json:"skipChatRank" gorm:"type:tinyint(1) default 0 not null"` // 是否跳过聊天排行 } diff --git a/service/friend.go b/service/friend.go index ce2b92e..f5e44a4 100644 --- a/service/friend.go +++ b/service/friend.go @@ -4,6 +4,7 @@ import ( "go-wechat/client" "go-wechat/entity" "go-wechat/vo" + "log" "strings" ) @@ -16,10 +17,11 @@ func GetAllFriend() (friends, groups []vo.FriendItem, err error) { var records []vo.FriendItem err = client.MySQL. Table("t_friend AS tf"). - Joins("LEFT JOIN t_message AS tm ON tf.wxid = tm.from_user"). - Select("tf.*", "MAX(tm.create_at) AS last_active_time"). - Group("tf.wxid"). - Order("last_active_time DESC"). + //Joins("LEFT JOIN t_message AS tm ON tf.wxid = tm.from_user"). + //Select("tf.*", "MAX(tm.create_at) AS last_active"). + Select("tf.*"). + //Group("tf.wxid"). + Order("tf.last_active DESC"). Find(&records).Error if err != nil { return @@ -60,3 +62,27 @@ func CheckIsEnableCommand(userId string) (flag bool) { client.MySQL.Model(&entity.Friend{}).Where("enable_command = 1").Where("wxid = ?", userId).Count(&coo) return coo > 0 } + +// updateLastActive +// @description: 更新最后活跃时间 +// @param msg +func updateLastActive(msg entity.Message) { + var err error + // 如果是群,更新群成员最后活跃时间 + if strings.HasSuffix(msg.FromUser, "@chatroom") { + err = client.MySQL.Model(&entity.GroupUser{}). + Where("group_id = ?", msg.FromUser). + Where("wxid = ?", msg.GroupUser). + Update("last_active", msg.CreateTime).Error + if err != nil { + log.Printf("更新群成员最后活跃时间失败, 错误信息: %v", err) + } + } + // 更新群或者好友活跃时间 + err = client.MySQL.Model(&entity.Friend{}). + Where("wxid = ?", msg.FromUser). + Update("last_active", msg.CreateTime).Error + if err != nil { + log.Printf("更新群或者好友活跃时间失败, 错误信息: %v", err) + } +} diff --git a/service/group.go b/service/group.go index 85c3187..1475497 100644 --- a/service/group.go +++ b/service/group.go @@ -13,10 +13,9 @@ import ( func GetGroupUsersByGroupId(groupId string) (records []vo.GroupUserItem, err error) { err = client.MySQL. Table("t_group_user AS tgu"). - Joins("LEFT JOIN t_message AS tm ON tm.from_user = tgu.group_id AND tm.group_user = tgu.wxid"). - //Select("tgu.wxid", "tgu.nickname", "tgu.head_image", "tgu.is_member", "tgu.leave_time", - // "tgu.skip_chat_rank", "MAX(tm.create_at) AS last_active_time"). - Select("tgu.*", "MAX(tm.create_at) AS last_active_time"). + //Joins("LEFT JOIN t_message AS tm ON tm.from_user = tgu.group_id AND tm.group_user = tgu.wxid"). + //Select("tgu.*", "MAX(tm.create_at) AS last_active"). + Select("tgu.*"). Where("tgu.group_id = ?", groupId). Group("tgu.group_id, tgu.wxid"). Order("tgu.join_time DESC"). diff --git a/service/message.go b/service/message.go index 18c2a0b..2e0c9cf 100644 --- a/service/message.go +++ b/service/message.go @@ -32,4 +32,10 @@ func SaveMessage(msg entity.Message) { log.Printf("消息入库失败, 错误信息: %v", err) } log.Printf("消息入库成功,消息Id: %d", msg.MsgId) + + // 更新最后活跃时间 + // 只处理收到的消息 + if msg.MsgId > 1 { + go updateLastActive(msg) + } } diff --git a/views/index.html b/views/index.html index 1339217..c197d94 100644 --- a/views/index.html +++ b/views/index.html @@ -47,10 +47,10 @@