@@ -2,4 +2,6 @@ | |||||
type EggEnergyUserActivityDao interface { | type EggEnergyUserActivityDao interface { | ||||
//TODO:: You can add specific method definitions here | //TODO:: You can add specific method definitions here | ||||
UserDailyActivityAnalysisFindByUidAndTime(startDate string, endDate string, uid []int64) (int64, error) | |||||
UserDailyActivityAnalysisCountByUidAndTime(startDate string, endDate string, uid int64) (int64, error) | |||||
} | } |
@@ -13,5 +13,4 @@ type PublicPlatoonUserRelationDao interface { | |||||
PublicPlatoonUserRelationFindByPid(fatherUid int64, fatherName, positionName string) ([]model.PublicPlatoonUserRelation, error) | PublicPlatoonUserRelationFindByPid(fatherUid int64, fatherName, positionName string) ([]model.PublicPlatoonUserRelation, error) | ||||
PublicPlatoonUserRelationFindCountByPosition(fatherUid int64, fatherName, positionName string, startPosition, endPosition int64) ([]model.PublicPlatoonUserRelation, int64, error) | PublicPlatoonUserRelationFindCountByPosition(fatherUid int64, fatherName, positionName string, startPosition, endPosition int64) ([]model.PublicPlatoonUserRelation, int64, error) | ||||
PublicPlatoonUserRelationFindByParamsByPage(params map[string]interface{}, page, pageSize int) (*[]model.PublicPlatoonUserRelation, error) | PublicPlatoonUserRelationFindByParamsByPage(params map[string]interface{}, page, pageSize int) (*[]model.PublicPlatoonUserRelation, error) | ||||
PublicPlatoonUserRelationGetOneByPosition(position int64) (*model.PublicPlatoonUserRelation, error) | |||||
} | } |
@@ -2,6 +2,8 @@ | |||||
import ( | import ( | ||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/dao" | "code.fnuoos.com/EggPlanet/egg_models.git/src/dao" | ||||
"code.fnuoos.com/EggPlanet/egg_models.git/src/model" | |||||
zhios_order_relate_logx "code.fnuoos.com/EggPlanet/egg_models.git/utils/logx" | |||||
"xorm.io/xorm" | "xorm.io/xorm" | ||||
) | ) | ||||
@@ -12,3 +14,21 @@ func NewEggEnergyUserActivityDb(engine *xorm.Engine) dao.EggEnergyUserActivityDa | |||||
type EggEnergyUserActivityDb struct { | type EggEnergyUserActivityDb struct { | ||||
Db *xorm.Engine | Db *xorm.Engine | ||||
} | } | ||||
func (e EggEnergyUserActivityDb) UserDailyActivityAnalysisFindByUidAndTime(startDate string, endDate string, uid []int64) (int64, error) { | |||||
var m model.EggEnergyUserActivity | |||||
count, err := e.Db.Where("uid in ?", uid).And("date > ?", startDate).And("date < ?", endDate).Count(&m) | |||||
if err != nil { | |||||
return 0, zhios_order_relate_logx.Error(err) | |||||
} | |||||
return count, nil | |||||
} | |||||
func (e EggEnergyUserActivityDb) UserDailyActivityAnalysisCountByUidAndTime(startDate string, endDate string, uid int64) (int64, error) { | |||||
var m model.EggEnergyUserActivity | |||||
count, err := e.Db.Where("uid = ?", uid).And("date > ?", startDate).And("date < ?", endDate).Count(&m) | |||||
if err != nil { | |||||
return 0, zhios_order_relate_logx.Error(err) | |||||
} | |||||
return count, nil | |||||
} |
@@ -119,36 +119,3 @@ func (p PublicPlatoonUserRelationDb) PublicPlatoonUserRelationFindByParamsByPage | |||||
} | } | ||||
} | } | ||||
} | } | ||||
func (p PublicPlatoonUserRelationDb) PublicPlatoonUserRelationGetOneByPosition(position int64) (*model.PublicPlatoonUserRelation, error) { | |||||
var relation model.PublicPlatoonUserRelation | |||||
_, err := p.Db.Where("position = ?", position).Get(&relation) | |||||
if err != nil { | |||||
return nil, zhios_order_relate_logx.Error(err) | |||||
} | |||||
return &relation, nil | |||||
} | |||||
func (p PublicPlatoonUserRelationDb) GetTreeBySmall(head *model.PublicPlatoonUserRelation, leveLimit int) ([]*model.PublicPlatoonUserRelation, error) { | |||||
if leveLimit == 0 { | |||||
leveLimit = 1 | |||||
} | |||||
var res []*model.PublicPlatoonUserRelation | |||||
var queue []*model.PublicPlatoonUserRelation | |||||
queue = append(queue, head) | |||||
for len(queue) > 0 { | |||||
node := queue[0] | |||||
queue = queue[1:] | |||||
if node.Level1 > head.Level1+leveLimit { | |||||
break | |||||
} | |||||
res = append(res, node) | |||||
var son []*model.PublicPlatoonUserRelation | |||||
err1 := p.Db.Where("father_uid1 = ?", node.Uid).Find(son) | |||||
if err1 != nil { | |||||
return nil, zhios_order_relate_logx.Error(err1) | |||||
} | |||||
queue = append(queue, son...) | |||||
} | |||||
return res, nil | |||||
} |