Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hilo-group
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
hujiebin
hilo-group
Commits
37399b00
Commit
37399b00
authored
Mar 16, 2023
by
hujiebin
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feature/family' into feature/3.5
parents
01e2d66d
b2582ee0
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
132 additions
and
0 deletions
+132
-0
mic.go
domain/model/mic_m/mic.go
+85
-0
group_mic.go
domain/service/group_mic_s/group_mic.go
+5
-0
inner.go
route/mic_r/inner.go
+37
-0
router.go
route/router.go
+5
-0
No files found.
domain/model/mic_m/mic.go
0 → 100644
View file @
37399b00
package
mic_m
import
(
"git.hilo.cn/hilo-common/domain"
"git.hilo.cn/hilo-common/resource/mysql"
"git.hilo.cn/hilo-common/utils"
"gorm.io/gorm"
"gorm.io/gorm/clause"
"time"
)
// 用户上麦
type
UserOnMic
struct
{
Day
string
UserId
mysql
.
ID
Seconds
mysql
.
Num
LastCalTs
int64
CreatedTime
time
.
Time
`gorm:"->"`
UpdatedTime
time
.
Time
`gorm:"->"`
}
// 获取用户当日上麦
// 允许返回gorm.ErrRecordNotFound
func
GetUserOnMic
(
model
*
domain
.
Model
,
userId
mysql
.
ID
)
(
*
UserOnMic
,
error
)
{
res
:=
new
(
UserOnMic
)
day
:=
time
.
Now
()
.
Format
(
"2006-01-02"
)
if
err
:=
model
.
DB
()
.
Where
(
"day = ? AND user_id = ?"
,
day
,
userId
)
.
First
(
res
)
.
Error
;
err
!=
nil
{
return
nil
,
err
}
return
res
,
nil
}
// 增加用户上麦时长
// 事务操作
func
IncrUserOnMic
(
model
*
domain
.
Model
,
userId
mysql
.
ID
,
joinMicTimestamp
int64
)
error
{
return
model
.
Transaction
(
func
(
model
*
domain
.
Model
)
error
{
omMic
,
err
:=
GetUserOnMic
(
model
,
userId
)
if
err
!=
nil
&&
err
!=
gorm
.
ErrRecordNotFound
{
return
err
}
curTs
:=
joinMicTimestamp
nowTs
:=
time
.
Now
()
.
Unix
()
day0Ts
:=
utils
.
GetZeroTime
(
time
.
Now
())
.
Unix
()
if
omMic
!=
nil
&&
joinMicTimestamp
<
omMic
.
LastCalTs
{
// 加入的时间比上次计算时间小
curTs
=
omMic
.
LastCalTs
}
// 跨天
if
curTs
<
day0Ts
{
curTs
=
day0Ts
}
score
:=
nowTs
-
curTs
day
:=
time
.
Now
()
.
Format
(
"2006-01-02"
)
onMicNew
:=
&
UserOnMic
{
Day
:
day
,
UserId
:
userId
,
Seconds
:
mysql
.
Num
(
score
),
}
if
err
:=
model
.
DB
()
.
Model
(
UserOnMic
{})
.
Clauses
(
clause
.
OnConflict
{
Columns
:
[]
clause
.
Column
{{
Name
:
"day"
},
{
Name
:
"user_id"
}},
DoUpdates
:
clause
.
Assignments
(
map
[
string
]
interface
{}{
"seconds"
:
gorm
.
Expr
(
"seconds + ?"
,
onMicNew
.
Seconds
),
"last_cal_ts"
:
nowTs
,
}),
})
.
Create
(
onMicNew
)
.
Error
;
err
!=
nil
{
model
.
Log
.
Errorf
(
"IncrUserOnMic fail:%v"
,
err
)
return
err
}
return
nil
})
}
// 批量获取用户上麦时长
// @return userId->seconds
func
MGetUserOnMicSeconds
(
model
*
domain
.
Model
,
day
string
,
userIds
[]
uint64
)
(
map
[
mysql
.
ID
]
mysql
.
Num
,
error
)
{
var
rows
[]
UserOnMic
res
:=
make
(
map
[
mysql
.
ID
]
mysql
.
Num
)
if
err
:=
model
.
DB
()
.
Model
(
UserOnMic
{})
.
Where
(
"`day`= ? AND user_id in ?"
,
day
,
userIds
)
.
Find
(
&
rows
)
.
Error
;
err
!=
nil
{
model
.
Log
.
Errorf
(
"MGetUserOnMic fail:%v"
,
err
)
return
res
,
err
}
for
_
,
r
:=
range
rows
{
res
[
r
.
UserId
]
=
r
.
Seconds
}
return
res
,
nil
}
domain/service/group_mic_s/group_mic.go
View file @
37399b00
...
@@ -12,6 +12,7 @@ import (
...
@@ -12,6 +12,7 @@ import (
"hilo-group/domain/event/group_ev"
"hilo-group/domain/event/group_ev"
"hilo-group/domain/model/groupPower_m"
"hilo-group/domain/model/groupPower_m"
"hilo-group/domain/model/group_m"
"hilo-group/domain/model/group_m"
"hilo-group/domain/model/mic_m"
"hilo-group/domain/service/signal_s"
"hilo-group/domain/service/signal_s"
"hilo-group/myerr"
"hilo-group/myerr"
"hilo-group/myerr/bizerr"
"hilo-group/myerr/bizerr"
...
@@ -322,5 +323,9 @@ func (s *GroupMicService) IncrGroupPowerOnMicExpAndTime(groupId string, userId u
...
@@ -322,5 +323,9 @@ func (s *GroupMicService) IncrGroupPowerOnMicExpAndTime(groupId string, userId u
if
err
:=
groupPower_m
.
IncrGroupPowerStarOnMic
(
model
,
groupPowerId
,
userId
,
joinMicTimestamp
);
err
!=
nil
{
if
err
:=
groupPower_m
.
IncrGroupPowerStarOnMic
(
model
,
groupPowerId
,
userId
,
joinMicTimestamp
);
err
!=
nil
{
model
.
Log
.
Errorf
(
"IncrGroupPowerOnMicTime fail:%v"
,
err
)
model
.
Log
.
Errorf
(
"IncrGroupPowerOnMicTime fail:%v"
,
err
)
}
}
// 增加用户天上麦时长
if
err
:=
mic_m
.
IncrUserOnMic
(
model
,
userId
,
joinMicTimestamp
);
err
!=
nil
{
model
.
Log
.
Errorf
(
"IncrUserOnMic fail:%v"
,
err
)
}
return
nil
return
nil
}
}
route/mic_r/inner.go
0 → 100644
View file @
37399b00
package
mic_r
import
(
"git.hilo.cn/hilo-common/domain"
"git.hilo.cn/hilo-common/mycontext"
"git.hilo.cn/hilo-common/resource/mysql"
"github.com/gin-gonic/gin"
"hilo-group/domain/model/mic_m"
"hilo-group/resp"
)
type
MGetUserOnMicSecondsReq
struct
{
Day
string
`form:"day" binding:"required"`
Ids
[]
mysql
.
ID
`form:"ids" binding:"required"`
}
// @Tags 麦位-内部
// @Summary 批量获取用户天上麦时长
// @Param day query string true "天 格式2006-001-02"
// @Param ids query string true "用户id,如:ids=1&ids=2&ids=3"
// @Success 200 {object} map[uint64]uint32
// @Router /inner/mic/onMicSeconds [get]
func
MGetUserOnMicSeconds
(
c
*
gin
.
Context
)
(
*
mycontext
.
MyContext
,
error
)
{
myCtx
:=
mycontext
.
CreateMyContext
(
c
.
Keys
)
var
model
=
domain
.
CreateModelContext
(
myCtx
)
var
req
MGetUserOnMicSecondsReq
if
err
:=
c
.
ShouldBindQuery
(
&
req
);
err
!=
nil
{
return
myCtx
,
err
}
onMic
,
err
:=
mic_m
.
MGetUserOnMicSeconds
(
model
,
req
.
Day
,
req
.
Ids
)
if
err
!=
nil
{
return
myCtx
,
err
}
response
:=
onMic
resp
.
ResponseOk
(
c
,
response
)
return
myCtx
,
nil
}
route/router.go
View file @
37399b00
...
@@ -12,6 +12,7 @@ import (
...
@@ -12,6 +12,7 @@ import (
"hilo-group/route/charge_r"
"hilo-group/route/charge_r"
"hilo-group/route/group_power_r"
"hilo-group/route/group_power_r"
"hilo-group/route/group_r"
"hilo-group/route/group_r"
"hilo-group/route/mic_r"
)
)
func
InitRouter
()
*
gin
.
Engine
{
func
InitRouter
()
*
gin
.
Engine
{
...
@@ -155,6 +156,10 @@ func InitRouter() *gin.Engine {
...
@@ -155,6 +156,10 @@ func InitRouter() *gin.Engine {
{
{
innerGroupPower
.
GET
(
"/infos"
,
wrapper
(
group_power_r
.
MGetGroupPowers
))
innerGroupPower
.
GET
(
"/infos"
,
wrapper
(
group_power_r
.
MGetGroupPowers
))
}
}
innerMic
:=
inner
.
Group
(
"/mic"
)
{
innerMic
.
GET
(
"/onMicSeconds"
,
wrapper
(
mic_r
.
MGetUserOnMicSeconds
))
}
r
.
GET
(
"/test"
,
wrapper
(
group_power_r
.
Test
))
r
.
GET
(
"/test"
,
wrapper
(
group_power_r
.
Test
))
return
r
return
r
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment