支持坐席切换在线状态,转接列表展示状态
侧栏可切换在线/忙碌/离线;转接弹窗显示状态点与标签,列表含在线与忙碌坐席。
This commit is contained in:
@@ -2,6 +2,7 @@ package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"time"
|
||||
|
||||
"github.com/gin-gonic/gin"
|
||||
"golang.org/x/crypto/bcrypt"
|
||||
@@ -41,6 +42,14 @@ func (h *AuthHandler) Login(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
// 登录后默认置为在线(可被坐席自行改忙碌/离线)
|
||||
now := time.Now()
|
||||
_ = model.DB.Model(&user).Updates(map[string]interface{}{
|
||||
"status": "online",
|
||||
"last_online_at": now,
|
||||
}).Error
|
||||
user.Status = "online"
|
||||
|
||||
token, err := middleware.GenerateToken(user.ID, user.TenantID, user.Role)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"code": 500, "message": "生成token失败"})
|
||||
@@ -56,6 +65,68 @@ func (h *AuthHandler) Login(c *gin.Context) {
|
||||
"tenant_id": user.TenantID,
|
||||
"nickname": user.Nickname,
|
||||
"role": user.Role,
|
||||
"status": user.Status,
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
// Me 当前登录用户信息。
|
||||
func (h *AuthHandler) Me(c *gin.Context) {
|
||||
var user model.User
|
||||
if err := model.DB.Select("id", "tenant_id", "nickname", "role", "status", "username").
|
||||
First(&user, middleware.GetUserID(c)).Error; err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"code": 404, "message": "用户不存在"})
|
||||
return
|
||||
}
|
||||
middleware.JSON(c, gin.H{
|
||||
"user_id": user.ID,
|
||||
"tenant_id": user.TenantID,
|
||||
"nickname": user.Nickname,
|
||||
"role": user.Role,
|
||||
"status": user.Status,
|
||||
"username": user.Username,
|
||||
})
|
||||
}
|
||||
|
||||
type UpdatePresenceReq struct {
|
||||
Status string `json:"status" binding:"required"`
|
||||
}
|
||||
|
||||
// UpdatePresence 坐席自行切换在线状态(online / busy / offline)。
|
||||
func (h *AuthHandler) UpdatePresence(c *gin.Context) {
|
||||
var req UpdatePresenceReq
|
||||
if err := c.ShouldBindJSON(&req); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"code": 400, "message": "参数错误"})
|
||||
return
|
||||
}
|
||||
status := req.Status
|
||||
if status != "online" && status != "busy" && status != "offline" {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"code": 400, "message": "状态仅支持 online / busy / offline"})
|
||||
return
|
||||
}
|
||||
|
||||
userID := middleware.GetUserID(c)
|
||||
var user model.User
|
||||
if err := model.DB.First(&user, userID).Error; err != nil {
|
||||
c.JSON(http.StatusNotFound, gin.H{"code": 404, "message": "用户不存在"})
|
||||
return
|
||||
}
|
||||
if user.Status == "disabled" {
|
||||
c.JSON(http.StatusForbidden, gin.H{"code": 403, "message": "账号已停用"})
|
||||
return
|
||||
}
|
||||
|
||||
updates := map[string]interface{}{"status": status}
|
||||
if status == "online" {
|
||||
updates["last_online_at"] = time.Now()
|
||||
}
|
||||
if err := model.DB.Model(&user).Updates(updates).Error; err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"code": 500, "message": "更新状态失败"})
|
||||
return
|
||||
}
|
||||
user.Status = status
|
||||
middleware.JSON(c, gin.H{
|
||||
"user_id": user.ID,
|
||||
"status": user.Status,
|
||||
})
|
||||
}
|
||||
|
||||
@@ -50,6 +50,10 @@ func SetupRoutes(r *gin.Engine, store storage.ObjectStorage, storageCfg config.S
|
||||
authRequired := api.Group("")
|
||||
authRequired.Use(middleware.AuthRequired())
|
||||
{
|
||||
// 当前用户
|
||||
authRequired.GET("/me", auth.Me)
|
||||
authRequired.PUT("/me/status", auth.UpdatePresence)
|
||||
|
||||
// WebSocket
|
||||
authRequired.GET("/ws", wsHandler.Connect)
|
||||
|
||||
|
||||
@@ -2,6 +2,7 @@ package handler
|
||||
|
||||
import (
|
||||
"net/http"
|
||||
"sort"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
@@ -490,21 +491,34 @@ func (h *SessionHandler) ListAvailableAgents(c *gin.Context) {
|
||||
type agentItem struct {
|
||||
ID uint `json:"id"`
|
||||
Nickname string `json:"nickname"`
|
||||
Status string `json:"status"`
|
||||
Status string `json:"status"` // online | busy | offline | disabled
|
||||
Role string `json:"role,omitempty"`
|
||||
}
|
||||
// all=1 返回租户全部坐席(含离线),用于对话记录筛选;默认仅在线(工作台转接)
|
||||
// all=1 返回租户全部坐席(含离线),用于对话记录筛选;
|
||||
// 默认:可转接坐席(role=agent,在线/忙碌),便于前端展示状态
|
||||
q := model.DB.Where("tenant_id = ? AND role IN ?", middleware.GetTenantID(c), []string{"agent", "supervisor", "admin"})
|
||||
if c.Query("all") != "1" {
|
||||
q = q.Where("role = ? AND status = ?", "agent", "online")
|
||||
q = q.Where("role = ? AND status IN ?", "agent", []string{"online", "busy"})
|
||||
}
|
||||
var users []model.User
|
||||
if err := q.Order("nickname asc").Find(&users).Error; err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"code": 500, "message": "查询客服失败"})
|
||||
return
|
||||
}
|
||||
// 在线优先,其次忙碌,再按昵称
|
||||
statusRank := map[string]int{"online": 0, "busy": 1, "offline": 2, "disabled": 3}
|
||||
sort.SliceStable(users, func(i, j int) bool {
|
||||
ri, rj := statusRank[users[i].Status], statusRank[users[j].Status]
|
||||
if ri != rj {
|
||||
return ri < rj
|
||||
}
|
||||
return users[i].Nickname < users[j].Nickname
|
||||
})
|
||||
items := make([]agentItem, 0, len(users))
|
||||
for _, user := range users {
|
||||
items = append(items, agentItem{ID: user.ID, Nickname: user.Nickname, Status: user.Status})
|
||||
items = append(items, agentItem{
|
||||
ID: user.ID, Nickname: user.Nickname, Status: user.Status, Role: user.Role,
|
||||
})
|
||||
}
|
||||
middleware.JSON(c, items)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user