fix: wecom user list
CI / admin (push) Has been skipped
CI / bff (push) Has been skipped
CI / chore (push) Has been skipped
CI / express (push) Has been skipped
CI / product (push) Has been skipped
CI / sale (push) Has been skipped
CI / user (push) Has been skipped
CI / wecom (push) Has been skipped
CI / changes (push) Successful in 12s
CI / ad (push) Successful in 0s
CI / admin (push) Has been skipped
CI / bff (push) Has been skipped
CI / chore (push) Has been skipped
CI / express (push) Has been skipped
CI / product (push) Has been skipped
CI / sale (push) Has been skipped
CI / user (push) Has been skipped
CI / wecom (push) Has been skipped
CI / changes (push) Successful in 12s
CI / ad (push) Successful in 0s
This commit is contained in:
@@ -1,8 +1,15 @@
|
||||
package logic
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
|
||||
"lone-services/pkg/modelbase"
|
||||
"lone-services/pkg/utils"
|
||||
"lone-services/services/wecom/internal/dao"
|
||||
"lone-services/services/wecom/internal/model"
|
||||
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
)
|
||||
|
||||
func departmentID() int {
|
||||
@@ -47,3 +54,78 @@ func resolveStatus(reqStatus uint32, current uint8) uint8 {
|
||||
}
|
||||
return dao.StatusEnabled
|
||||
}
|
||||
|
||||
// buildAgentsJSON 按 agents 表主键 id 查出应用,落库为 [{id,agent_id,name}]
|
||||
func buildAgentsJSON(ids []int64) (string, error) {
|
||||
ids = cleanAgentIds(ids)
|
||||
if len(ids) == 0 {
|
||||
return "", fmt.Errorf("应用不能为空")
|
||||
}
|
||||
|
||||
idStrs := make([]string, 0, len(ids))
|
||||
for _, id := range ids {
|
||||
idStrs = append(idStrs, strconv.FormatInt(id, utils.NumberTen))
|
||||
}
|
||||
|
||||
var rows []dao.WecomAgent
|
||||
am := model.AgentModel{}.Init()
|
||||
if err := am.Items(modelbase.Params{
|
||||
In: map[string][]string{"id in ?": idStrs},
|
||||
}, &rows); err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
byID := make(map[int64]dao.WecomAgent, len(rows))
|
||||
for _, row := range rows {
|
||||
byID[row.Id] = row
|
||||
}
|
||||
|
||||
items := make([]dao.UserAgentItem, 0, len(ids))
|
||||
for _, id := range ids {
|
||||
row, ok := byID[id]
|
||||
if !ok {
|
||||
return "", fmt.Errorf("应用不存在: %d", id)
|
||||
}
|
||||
items = append(items, dao.UserAgentItem{
|
||||
Id: row.Id,
|
||||
AgentId: row.AgentId,
|
||||
Name: row.Name,
|
||||
})
|
||||
}
|
||||
|
||||
buf, err := jsoniter.Marshal(items)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return string(buf), nil
|
||||
}
|
||||
|
||||
func parseAgents(raw string) []dao.UserAgentItem {
|
||||
if raw == utils.StringEmpty {
|
||||
return []dao.UserAgentItem{}
|
||||
}
|
||||
var items []dao.UserAgentItem
|
||||
if err := jsoniter.Unmarshal([]byte(raw), &items); err != nil {
|
||||
return []dao.UserAgentItem{}
|
||||
}
|
||||
if items == nil {
|
||||
return []dao.UserAgentItem{}
|
||||
}
|
||||
return items
|
||||
}
|
||||
|
||||
func cleanAgentIds(ids []int64) []int64 {
|
||||
out := make([]int64, 0, len(ids))
|
||||
seen := make(map[int64]struct{}, len(ids))
|
||||
for _, id := range ids {
|
||||
if id < utils.NumberOne {
|
||||
continue
|
||||
}
|
||||
if _, ok := seen[id]; ok {
|
||||
continue
|
||||
}
|
||||
seen[id] = struct{}{}
|
||||
out = append(out, id)
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user