hailin
/
plugai_updsrv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

This commit is contained in:
hailin 2025-06-24 15:22:28 +08:00
parent a8867a0cca
commit f70f74b566
1 changed files with 1 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
pkg/dal/dao/news.go
View File

@ -229,88 +229,6 @@ func (dao *NewsDAO) QueryList(cond *NewsCondition) (dos []*models.NewsDO, total
return return
} }
// func (dao *NewsDAO) QueryAsync(cond *NewsAsyncCondition) (dos []*models.NewsDO, total int64, err error) {
// log.Infof("[QueryAsync] >>> 调用开始，org_id=%d, digest='%s'", cond.Org_Id, cond.Digest)
// if cond.Org_Id == 0 {
// log.Warnf("[QueryAsync] org_id 为空，非法请求")
// return nil, 0, errors.New("org_id is required")
// }
// e := dao.db.Model(&dos).
// Table(models.TableNameNews).
// Select(
// models.NEWS_COLUMN_ID,
// models.NEWS_COLUMN_ORG_ID,
// models.NEWS_COLUMN_SPIDER_ID,
// models.NEWS_COLUMN_PNAME_ID,
// models.NEWS_COLUMN_TAG,
// models.NEWS_COLUMN_CATEGORY,
// models.NEWS_COLUMN_MAIN_TITLE,
// models.NEWS_COLUMN_SUB_TITLE,
// models.NEWS_COLUMN_SUMMARY,
// models.NEWS_COLUMN_KEYWORDS,
// models.NEWS_COLUMN_SEO_KEYWORDS,
// models.NEWS_COLUMN_TAGS,
// models.NEWS_COLUMN_URL,
// models.NEWS_COLUMN_IMAGE_URL,
// models.NEWS_COLUMN_LOGO_URL,
// models.NEWS_COLUMN_MODEL_PARAMETER,
// models.NEWS_COLUMN_CONTENT,
// models.NEWS_COLUMN_IS_HOTSPOT,
// models.NEWS_COLUMN_IS_OVERWRITTEN,
// models.NEWS_COLUMN_IS_DELETED,
// models.NEWS_COLUMN_IS_REPLICATE,
// models.NEWS_COLUMN_STATE,
// models.NEWS_COLUMN_CREATED_TIME,
// models.NEWS_COLUMN_UPDATED_TIME,
// models.NEWS_COLUMN_EXTRA_DATA,
// ).
// Eq(models.NEWS_COLUMN_ORG_ID, cond.Org_Id)
// _, total, err = e.QueryEx()
// if err != nil {
// log.Errorf("[QueryAsync] 查询失败: %v", err)
// return nil, 0, err
// }
// if total == 0 {
// log.Warnf("[QueryAsync] org_id=%d 无匹配记录", cond.Org_Id)
// return nil, 0, errors.New("未找到对应 org_id 的记录")
// }
// if total > 1 {
// log.Errorf("[QueryAsync] org_id=%d 数据异常，记录不唯一", cond.Org_Id)
// return nil, 0, errors.New("org_id 不唯一，数据异常")
// }
// record := dos[0]
// if cond.Digest == "" {
// log.Infof("[QueryAsync] org_id=%d digest 为空，直接返回记录", cond.Org_Id)
// return []*models.NewsDO{record}, 1, nil
// }
// // 客户端传了 digest，进行比较
// log.Infof("[QueryAsync] org_id=%d 开始比较 digest，客户端='%s'", cond.Org_Id, cond.Digest)
// if record.ExtraData != nil {
// if val, ok := record.ExtraData["digest"]; ok {
// log.Infof("[QueryAsync] org_id=%d 数据库 digest='%v'", cond.Org_Id, val)
// if ds, ok := val.(string); ok && ds == cond.Digest {
// log.Infof("[QueryAsync] org_id=%d digest 相同，跳过返回", cond.Org_Id)
// return nil, 0, nil
// }
// } else {
// log.Infof("[QueryAsync] org_id=%d ExtraData 中无 digest 字段", cond.Org_Id)
// }
// } else {
// log.Infof("[QueryAsync] org_id=%d ExtraData 为空", cond.Org_Id)
// }
// log.Infof("[QueryAsync] org_id=%d digest 不同，返回记录", cond.Org_Id)
// return []*models.NewsDO{record}, 1, nil
// }
func (dao *NewsDAO) QueryAsync(cond *NewsAsyncCondition) (dos []*models.NewsDO, total int64, err error) { func (dao *NewsDAO) QueryAsync(cond *NewsAsyncCondition) (dos []*models.NewsDO, total int64, err error) {
//log.Infof("[QueryAsync] >>> 调用开始，org_id=%d, digest='%s'", cond.Org_Id, cond.Digest) //log.Infof("[QueryAsync] >>> 调用开始，org_id=%d, digest='%s'", cond.Org_Id, cond.Digest)
@ -453,69 +371,10 @@ func (dao *NewsDAO) QueryAsyncBatch(pairs []OrgDigestPair) (dos []*models.NewsDO
dos = append(dos, row) dos = append(dos, row)
} }
} }
log.Infof("[Query New Versions available Batch] selected %d records from %d orgs", len(dos), len(pairs))
return dos, int64(len(dos)), nil return dos, int64(len(dos)), nil
} }
// func (dao *NewsDAO) QueryPullNew(cond *NewsPullNewCondition) (dos []*models.NewsDO, total int64, err error) {
// if cond == nil || len(cond.Pairs) == 0 {
// // 客户端没传org_id列表，返回空
// return []*models.NewsDO{}, 0, nil
// }
// e := dao.db.Model(&dos).
// Table(models.TableNameNews).
// Select(
// models.NEWS_COLUMN_ID,
// models.NEWS_COLUMN_ORG_ID,
// models.NEWS_COLUMN_SPIDER_ID,
// models.NEWS_COLUMN_PNAME_ID,
// models.NEWS_COLUMN_TAG,
// models.NEWS_COLUMN_CATEGORY,
// models.NEWS_COLUMN_MAIN_TITLE,
// models.NEWS_COLUMN_SUB_TITLE,
// models.NEWS_COLUMN_SUMMARY,
// models.NEWS_COLUMN_KEYWORDS,
// models.NEWS_COLUMN_SEO_KEYWORDS,
// models.NEWS_COLUMN_TAGS,
// models.NEWS_COLUMN_URL,
// models.NEWS_COLUMN_LANGUAGE,
// models.NEWS_COLUMN_DIGEST,
// models.NEWS_COLUMN_REPO_NAME,
// models.NEWS_COLUMN_IMAGE_URL,
// models.NEWS_COLUMN_LOGO_URL,
// models.NEWS_COLUMN_MODEL_PARAMETER,
// models.NEWS_COLUMN_CONTENT,
// models.NEWS_COLUMN_IS_HOTSPOT,
// models.NEWS_COLUMN_IS_OVERWRITTEN,
// models.NEWS_COLUMN_IS_DELETED,
// models.NEWS_COLUMN_IS_REPLICATE,
// models.NEWS_COLUMN_STATE,
// models.NEWS_COLUMN_DATA_TIME,
// models.NEWS_COLUMN_CREATED_TIME,
// models.NEWS_COLUMN_UPDATED_TIME,
// models.NEWS_COLUMN_EXTRA_DATA,
// )
// if cond != nil && len(cond.Pairs) > 0 {
// orgIDs := make([]string, 0, len(cond.Pairs))
// for _, p := range cond.Pairs {
// orgIDs = append(orgIDs, fmt.Sprintf("%d", p.OrgId))
// }
// notInClause := fmt.Sprintf("org_id NOT IN (%s)", strings.Join(orgIDs, ","))
// e = e.Where(notInClause)
// }
// _, total, err = e.QueryEx()
// if err != nil {
// log.Errorf("QueryPullNew failed: %v", err)
// return nil, 0, err
// }
// log.Infof(".................[DEBUG] QueryPullNew 返回数据: %+v", dos)
// return
// }
func (dao *NewsDAO) QueryPullNew(cond *NewsPullNewCondition) (dos []*models.NewsDO, total int64, err error) { func (dao *NewsDAO) QueryPullNew(cond *NewsPullNewCondition) (dos []*models.NewsDO, total int64, err error) {
if cond == nil || len(cond.Pairs) == 0 { if cond == nil || len(cond.Pairs) == 0 {
// 客户端没传org_id列表，返回空 // 客户端没传org_id列表，返回空