Compare commits
merge into: donghanyang:master
donghanyang:client_ljk
donghanyang:details_ljk
donghanyang:dev
donghanyang:dev_ljk
donghanyang:dhy
donghanyang:lijikun
donghanyang:majun
donghanyang:master
pull from: donghanyang:majun
donghanyang:client_ljk
donghanyang:details_ljk
donghanyang:dev
donghanyang:dev_ljk
donghanyang:dhy
donghanyang:lijikun
donghanyang:majun
donghanyang:master
14 Commits
| Author | SHA1 | Message | Date |
|---|---|---|---|
majun
|
514bbb00e5 |
优化查询逻辑
|
7 months ago |
|
majun
|
cd09845d5e |
新增查询单个作业信息接口
|
7 months ago |
|
majun
|
48e1611422 |
解决Redis主页查询
|
7 months ago |
|
majun
|
019af5b2dc |
解决跨库查询
|
7 months ago |
|
majun
|
c9149a0058 |
完善数据库关联
|
7 months ago |
|
majun
|
556af2d138 |
完善注释
|
7 months ago |
|
majun
|
549af372ab |
编辑作业接口完成
|
7 months ago |
|
majun
|
7a745e5ed5 |
Merge remote-tracking branch 'origin/majun' into majun
# Conflicts: # link_homework/api/v1/homework/homework.go # link_homework/internal/controller/homework/homework.go # link_homework/internal/logic/homework/homework.go # link_homework/internal/service/homework.go |
7 months ago |
|
majun
|
8450299cdc |
新建作业接口完成
|
7 months ago |
|
majun
|
bf09c9569f |
新建作业接口完成
|
7 months ago |
|
majun
|
b1d2ad1559 |
作业列表修改v2
|
7 months ago |
|
majun
|
b51b9d038d |
作业列表修改v1
|
7 months ago |
|
majun
|
653e16ecc7 |
作业列表修改
|
7 months ago |
|
majun
|
27d16b6d82 |
作业列表
|
7 months ago |
30 changed files with 938 additions and 382 deletions
-
5link_homework/api/v1/article/article.go
-
1link_homework/api/v1/hello.go
-
36link_homework/api/v1/homework/homework.go
-
19link_homework/go.mod
-
106link_homework/go.sum
-
2link_homework/hack/config.yaml
-
45link_homework/internal/cmd/cmd.go
-
36link_homework/internal/controller/article/article.go
-
1link_homework/internal/controller/clientPage/clientPage.go
-
105link_homework/internal/controller/homework/homework.go
-
28link_homework/internal/controller/live/live.go
-
24link_homework/internal/dao/internal/activity_interactive_form.go
-
24link_homework/internal/dao/internal/activity_interactive_group.go
-
24link_homework/internal/dao/internal/activity_interactive_record.go
-
22link_homework/internal/dao/internal/fx_article.go
-
24link_homework/internal/dao/internal/live.go
-
22link_homework/internal/dao/internal/member_info.go
-
25link_homework/internal/logic/article/article.go
-
214link_homework/internal/logic/homework/homework.go
-
36link_homework/internal/logic/live/live.go
-
6link_homework/internal/logic/logic.go
-
24link_homework/internal/model/entity/activity_interactive_group.go
-
194link_homework/internal/model/entity/fx_article.go
-
172link_homework/internal/model/entity/live.go
-
32link_homework/internal/service/article.go
-
37link_homework/internal/service/homework.go
-
32link_homework/internal/service/live.go
-
8link_homework/internal/service/middleware.go
-
6link_homework/main.go
-
10link_homework/manifest/config/config.yaml
@ -0,0 +1,5 @@ |
|||
package article |
|||
|
|||
type GetArticleListReq struct { |
|||
Name string `dc:"文章模糊查询名称"` |
|||
} |
|||
@ -1 +0,0 @@ |
|||
package v1 |
|||
@ -0,0 +1,36 @@ |
|||
package homework |
|||
|
|||
import ( |
|||
"github.com/gogf/gf/v2/os/gtime" |
|||
"link_homework/internal/model/entity" |
|||
) |
|||
|
|||
type GetHomeworkListReq struct { |
|||
PageNo int `v:"required#页码不能为空" dc:"页码"` |
|||
PageSize int `v:"required#页面大小不能为空" dc:"页面大小"` |
|||
} |
|||
|
|||
type GetHomeworkReq struct { |
|||
Id int `v:"required#作业id不能为空" dc:"作业id"` |
|||
} |
|||
|
|||
type AddHomeworkReq struct { |
|||
Name string `v:"required#作业名称不能为空" dc:"作业名称"` |
|||
ClubType int `v:"required|min:1|max:9#作业所属不能为空|作业所属不存在|作业所属不存在" dc:"作业所属"` |
|||
ArticleId int `v:"required-without:LiveId|min:1#请选择关联的文章或直播|关联文章不存在" dc:"关联文章id"` |
|||
LiveId int `v:"required-without:ArticleId|min:1#请选择关联的文章或直播|关联直播不存在" dc:"关联直播id"` |
|||
StartDate *gtime.Time `v:"required#作业开始时间不能为空" dc:"作业开始时间"` |
|||
EndDate *gtime.Time `v:"required|after-equal:StartDate#作业结束时间不能为空|作业结束时间必须晚于作业开始时间" dc:"作业结束时间"` |
|||
Questions []*entity.ActivityInteractiveForm `v:"required#题目集不能为空" dc:"题目集"` |
|||
} |
|||
|
|||
type EditHomeworkReq struct { |
|||
Id int `v:"required#作业id不能为空" dc:"作业id"` |
|||
Name string `v:"required#作业名称不能为空" dc:"作业名称"` |
|||
ClubType int `v:"required|min:1|max:9#作业所属不能为空|作业所属不存在|作业所属不存在" dc:"作业所属"` |
|||
ArticleId int `v:"required-without:LiveId|min:1#请选择关联的文章或直播|关联文章不存在" dc:"关联文章id"` |
|||
LiveId int `v:"required-without:ArticleId|min:1#请选择关联的文章或直播|关联直播不存在" dc:"关联直播id"` |
|||
StartDate *gtime.Time `v:"required#作业开始时间不能为空" dc:"作业开始时间"` |
|||
EndDate *gtime.Time `v:"required|after-equal:StartDate#作业结束时间不能为空|作业结束时间必须晚于作业开始时间" dc:"作业结束时间"` |
|||
Questions []*entity.ActivityInteractiveForm `v:"required#题目集不能为空" dc:"题目集"` |
|||
} |
|||
@ -1,134 +1,80 @@ |
|||
github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= |
|||
github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= |
|||
github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= |
|||
github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= |
|||
github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= |
|||
github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= |
|||
github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= |
|||
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= |
|||
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= |
|||
github.com/clbanning/mxj/v2 v2.7.0 h1:WA/La7UGCanFe5NpHF0Q3DNtnCsVoxbPKuyBNHWRyME= |
|||
github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s= |
|||
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= |
|||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= |
|||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= |
|||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= |
|||
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= |
|||
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc= |
|||
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= |
|||
github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= |
|||
github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4= |
|||
github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI= |
|||
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= |
|||
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= |
|||
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= |
|||
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= |
|||
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= |
|||
github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= |
|||
github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= |
|||
github.com/go-logr/logr v1.2.4/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= |
|||
github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= |
|||
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= |
|||
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= |
|||
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= |
|||
github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= |
|||
github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= |
|||
github.com/goflyfox/gtoken v1.5.10 h1:oj/v5r/1TjMMZvxpyEZYdsEvG2ZK/SGGnyjvsKi4uHk= |
|||
github.com/goflyfox/gtoken v1.5.10/go.mod h1:YpoSAn9tbfrSBoQnY7raQP0HaiRjQAE+4J179ecRH5I= |
|||
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.1 h1:jbaPawkb8qmaYzrmBDbTa8Zkhzacq1RBOZw+qRJExI4= |
|||
github.com/gogf/gf/contrib/drivers/mysql/v2 v2.8.1/go.mod h1:s2aI1fV9AvKi4NtMpv3pV0EHtazkvfUNVQmzapr7UJQ= |
|||
github.com/gogf/gf/v2 v2.5.4/go.mod h1:7yf5qp0BznfsYx7Sw49m3mQvBsHpwAjJk3Q9ZnKoUEc= |
|||
github.com/gogf/gf/v2 v2.8.1 h1:1oVQg3G5OgCats4qWFTH3pHLe92nfUQeUDta05tUs1g= |
|||
github.com/gogf/gf/v2 v2.8.1/go.mod h1:6iYuZZ+A0ZcH8+4MDS/P0SvTPCvKzRvyAsY1kbkJYJc= |
|||
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= |
|||
github.com/gogf/gf/contrib/nosql/redis/v2 v2.8.2 h1:w8EfQgPvKfLBvS1rEFJfirixCRJYiSauOYlrjCZ2Y/Q= |
|||
github.com/gogf/gf/contrib/nosql/redis/v2 v2.8.2/go.mod h1:9oQtAMrDDbVIWSSb9NTMAywpZ1cqtywgpzwbHk0lvxM= |
|||
github.com/gogf/gf/v2 v2.8.2 h1:4k641rn+hV1COAKygqsqcTm8+lDTkcO8HQ4iBv/uTFs= |
|||
github.com/gogf/gf/v2 v2.8.2/go.mod h1:n++xPYGUUMadw6IygLEgGZqc6y6DRLrJKg5kqCrPLWY= |
|||
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= |
|||
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= |
|||
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= |
|||
github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg= |
|||
github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= |
|||
github.com/grokify/html-strip-tags-go v0.0.1/go.mod h1:2Su6romC5/1VXOQMaWL2yb618ARB8iVo6/DR99A6d78= |
|||
github.com/grokify/html-strip-tags-go v0.1.0 h1:03UrQLjAny8xci+R+qjCce/MYnpNXCtgzltlQbOBae4= |
|||
github.com/grokify/html-strip-tags-go v0.1.0/go.mod h1:ZdzgfHEzAfz9X6Xe5eBLVblWIxXfYSQ40S/VKrAOGpc= |
|||
github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= |
|||
github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY= |
|||
github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= |
|||
github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM= |
|||
github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= |
|||
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= |
|||
github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= |
|||
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= |
|||
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= |
|||
github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= |
|||
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= |
|||
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= |
|||
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= |
|||
github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= |
|||
github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= |
|||
github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= |
|||
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= |
|||
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= |
|||
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= |
|||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= |
|||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= |
|||
github.com/redis/go-redis/v9 v9.7.0 h1:HhLSs+B6O021gwzl+locl0zEDnyNkxMtf/Z3NNBMa9E= |
|||
github.com/redis/go-redis/v9 v9.7.0/go.mod h1:f6zhXITC7JUJIlPEiBOTXxJgPLdZcA93GewI7inzyWw= |
|||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= |
|||
github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= |
|||
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= |
|||
github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= |
|||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= |
|||
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= |
|||
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= |
|||
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= |
|||
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= |
|||
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= |
|||
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= |
|||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= |
|||
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= |
|||
go.opentelemetry.io/otel v1.14.0/go.mod h1:o4buv+dJzx8rohcUeRmWUZhqupFvzWis188WlggnNeU= |
|||
go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo= |
|||
go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo= |
|||
go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI= |
|||
go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco= |
|||
go.opentelemetry.io/otel/sdk v1.14.0/go.mod h1:bwIC5TjrNG6QDCHNWvW4HLHtUQ4I+VQDsnjhvyZCALM= |
|||
go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw= |
|||
go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg= |
|||
go.opentelemetry.io/otel/trace v1.14.0/go.mod h1:8avnQLK+CG77yNLUae4ea2JDQ6iT+gozhnZjy/rw9G8= |
|||
go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI= |
|||
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU= |
|||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= |
|||
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= |
|||
golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= |
|||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= |
|||
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= |
|||
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= |
|||
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= |
|||
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= |
|||
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= |
|||
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= |
|||
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= |
|||
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys= |
|||
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE= |
|||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |
|||
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |
|||
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= |
|||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= |
|||
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= |
|||
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |
|||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |
|||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |
|||
golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= |
|||
golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= |
|||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |
|||
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |
|||
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |
|||
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |
|||
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |
|||
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= |
|||
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI= |
|||
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= |
|||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= |
|||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= |
|||
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= |
|||
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= |
|||
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= |
|||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= |
|||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= |
|||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= |
|||
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= |
|||
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= |
|||
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= |
|||
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= |
|||
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= |
|||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= |
|||
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= |
|||
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= |
|||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= |
|||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= |
|||
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= |
|||
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= |
|||
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= |
|||
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= |
|||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= |
|||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= |
|||
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= |
|||
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= |
|||
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= |
|||
@ -0,0 +1,36 @@ |
|||
package article |
|||
|
|||
import ( |
|||
"github.com/gogf/gf/v2/net/ghttp" |
|||
"link_homework/api/v1/article" |
|||
"link_homework/internal/model/dto" |
|||
"link_homework/internal/service" |
|||
) |
|||
|
|||
type cArticle struct{} |
|||
|
|||
func Article() *cArticle { |
|||
return &cArticle{} |
|||
} |
|||
|
|||
func (c cArticle) GetArticleList(r *ghttp.Request) { |
|||
var req *article.GetArticleListReq |
|||
if err := r.Parse(&req); err != nil { |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 400, |
|||
Message: err.Error(), |
|||
}) |
|||
} |
|||
res, err := service.Article().GetArticleList(r.Context(), req.Name) |
|||
if err != nil { |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 400, |
|||
Message: err.Error(), |
|||
}) |
|||
} |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 200, |
|||
Message: "success", |
|||
Data: res, |
|||
}) |
|||
} |
|||
@ -1 +0,0 @@ |
|||
package clientPage |
|||
@ -0,0 +1,105 @@ |
|||
package homework |
|||
|
|||
import ( |
|||
"github.com/gogf/gf/v2/frame/g" |
|||
"github.com/gogf/gf/v2/net/ghttp" |
|||
"link_homework/api/v1/homework" |
|||
"link_homework/internal/model/dto" |
|||
"link_homework/internal/service" |
|||
) |
|||
|
|||
type cHomework struct{} |
|||
|
|||
func Homework() *cHomework { |
|||
return &cHomework{} |
|||
} |
|||
|
|||
func (c cHomework) GetHomeworkList(r *ghttp.Request) { |
|||
var req *homework.GetHomeworkListReq |
|||
if err := r.Parse(&req); err != nil { |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 400, |
|||
Message: err.Error(), |
|||
}) |
|||
} |
|||
res, err := service.Homework().GetHomeworkList(r.Context(), req.PageNo, req.PageSize) |
|||
total, err := service.Homework().GetHomeworkListTotal(r.Context()) |
|||
if err != nil { |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 400, |
|||
Message: err.Error(), |
|||
}) |
|||
} |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 200, |
|||
Message: "success", |
|||
Data: g.Map{ |
|||
"list": res, |
|||
"total": total, |
|||
}, |
|||
}) |
|||
} |
|||
|
|||
func (c cHomework) GetHomework(r *ghttp.Request) { |
|||
var req *homework.GetHomeworkReq |
|||
if err := r.Parse(&req); err != nil { |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 400, |
|||
Message: err.Error(), |
|||
}) |
|||
} |
|||
res, err := service.Homework().GetHomework(r.Context(), req.Id) |
|||
if err != nil { |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 400, |
|||
Message: err.Error(), |
|||
}) |
|||
} |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 200, |
|||
Message: "success", |
|||
Data: res, |
|||
}) |
|||
} |
|||
|
|||
func (c cHomework) AddHomework(r *ghttp.Request) { |
|||
var req *homework.AddHomeworkReq |
|||
if err := r.Parse(&req); err != nil { |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 400, |
|||
Message: err.Error(), |
|||
}) |
|||
} |
|||
err := service.Homework().AddHomework(r.Context(), req) |
|||
if err != nil { |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 400, |
|||
Message: err.Error(), |
|||
}) |
|||
} |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 200, |
|||
Message: "success", |
|||
}) |
|||
} |
|||
|
|||
func (c cHomework) EditHomework(r *ghttp.Request) { |
|||
var req *homework.EditHomeworkReq |
|||
if err := r.Parse(&req); err != nil { |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 400, |
|||
Message: err.Error(), |
|||
}) |
|||
} |
|||
err := service.Homework().EditHomework(r.Context(), req) |
|||
if err != nil { |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 400, |
|||
Message: err.Error(), |
|||
}) |
|||
} |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 200, |
|||
Message: "success", |
|||
}) |
|||
} |
|||
@ -0,0 +1,28 @@ |
|||
package live |
|||
|
|||
import ( |
|||
"github.com/gogf/gf/v2/net/ghttp" |
|||
"link_homework/internal/model/dto" |
|||
"link_homework/internal/service" |
|||
) |
|||
|
|||
type cLive struct{} |
|||
|
|||
func Live() *cLive { |
|||
return &cLive{} |
|||
} |
|||
|
|||
func (c cLive) GetLiveList(r *ghttp.Request) { |
|||
res, err := service.Live().GetLiveList(r.Context()) |
|||
if err != nil { |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 400, |
|||
Message: err.Error(), |
|||
}) |
|||
} |
|||
r.Response.WriteJsonExit(dto.Result{ |
|||
Code: 200, |
|||
Message: "success", |
|||
Data: res, |
|||
}) |
|||
} |
|||
@ -0,0 +1,25 @@ |
|||
package article |
|||
|
|||
import ( |
|||
"context" |
|||
"link_homework/internal/dao" |
|||
"link_homework/internal/model/entity" |
|||
"link_homework/internal/service" |
|||
) |
|||
|
|||
type ( |
|||
sArticle struct{} |
|||
) |
|||
|
|||
func init() { |
|||
service.RegisterArticle(New()) |
|||
} |
|||
|
|||
func New() service.IArticle { |
|||
return &sArticle{} |
|||
} |
|||
|
|||
func (s *sArticle) GetArticleList(ctx context.Context, name string) (articleList []*entity.FxArticle, err error) { |
|||
err = dao.FxArticle.Ctx(ctx).Where("title like ?", "%"+name+"%").OrderDesc("update_time").Limit(8).Scan(&articleList) |
|||
return |
|||
} |
|||
@ -0,0 +1,214 @@ |
|||
package homework |
|||
|
|||
import ( |
|||
"context" |
|||
"encoding/json" |
|||
"fmt" |
|||
"github.com/gogf/gf/v2/database/gdb" |
|||
"github.com/gogf/gf/v2/frame/g" |
|||
"github.com/gogf/gf/v2/os/gtime" |
|||
"link_homework/api/v1/homework" |
|||
"link_homework/internal/dao" |
|||
"link_homework/internal/model/do" |
|||
"link_homework/internal/model/entity" |
|||
"link_homework/internal/service" |
|||
) |
|||
|
|||
type ( |
|||
sHomework struct{} |
|||
) |
|||
|
|||
func init() { |
|||
service.RegisterHomework(New()) |
|||
} |
|||
|
|||
func New() service.IHomework { |
|||
return &sHomework{} |
|||
} |
|||
|
|||
func (s *sHomework) GetHomeworkList(ctx context.Context, pageNo int, pageSize int) (homeworkList []*entity.ActivityInteractiveGroup, err error) { |
|||
// 从Redis中获取数据
|
|||
value, _ := g.Redis().Get(ctx, fmt.Sprintf("%d-%d homeworklist", pageNo, pageSize)) |
|||
if value.String() != "" { |
|||
// 如果Redis中有数据，尝试解析为ActivityInteractiveGroup列表
|
|||
err = json.Unmarshal(value.Bytes(), &homeworkList) //反序列化
|
|||
homeworkList = UpdateHomework(ctx, homeworkList) |
|||
if err != nil { |
|||
return nil, err |
|||
} |
|||
return |
|||
} |
|||
|
|||
// 如果Redis中没有数据，查询数据库
|
|||
err = dao.ActivityInteractiveGroup.Ctx(ctx).With(entity.Live{}).Order("status asc, start_date desc, end_date desc").Page(pageNo, pageSize).Scan(&homeworkList) |
|||
err = g.DB("cms").Model("fx_article").Where("id", gdb.ListItemValuesUnique(homeworkList, "ArticleId")).ScanList(&homeworkList, "Article", "id:ArticleId") |
|||
homeworkList = UpdateHomework(ctx, homeworkList) |
|||
if err != nil { |
|||
return nil, err |
|||
} |
|||
|
|||
// 将查询到的作业列表序列化并存储到Redis,更新频繁变更的数据
|
|||
homeworkListJson, _ := json.Marshal(homeworkList) |
|||
_, err = g.Redis().Set(ctx, fmt.Sprintf("%d-%d homeworklist", pageNo, pageSize), homeworkListJson) |
|||
|
|||
return |
|||
} |
|||
|
|||
func UpdateHomework(ctx context.Context, homeworkList []*entity.ActivityInteractiveGroup) []*entity.ActivityInteractiveGroup { |
|||
for _, v := range homeworkList { |
|||
if v.Status != 2 { |
|||
if v.StartDate.After(gtime.Now()) { |
|||
v.Status = 0 |
|||
} else if v.EndDate.Before(gtime.Now()) { |
|||
v.Status = 2 |
|||
} else { |
|||
v.Status = 1 |
|||
} |
|||
if v.Status == 1 { |
|||
v.Count, _ = dao.ActivityInteractiveRecord.Ctx(ctx).Where("group_id", v.Id).Group("form_id").Limit(1).Count() |
|||
} |
|||
} |
|||
} |
|||
return homeworkList |
|||
} |
|||
|
|||
func (s *sHomework) GetHomeworkListTotal(ctx context.Context) (total int, err error) { |
|||
total, err = dao.ActivityInteractiveGroup.Ctx(ctx).Count() |
|||
if err != nil { |
|||
return 0, err |
|||
} |
|||
return |
|||
} |
|||
|
|||
func (s *sHomework) GetHomework(ctx context.Context, id int) (homework *entity.ActivityInteractiveGroup, err error) { |
|||
err = dao.ActivityInteractiveGroup.Ctx(ctx).Where("id", id).With(entity.Live{}, entity.ActivityInteractiveForm{}).Scan(&homework) |
|||
err = g.DB("cms").Model("fx_article").Where("id", homework.ArticleId).Scan(&homework.Article) |
|||
return |
|||
} |
|||
|
|||
func (s *sHomework) AddHomework(ctx context.Context, req *homework.AddHomeworkReq) (err error) { |
|||
// 判断作业是否已结束
|
|||
status := 0 |
|||
if req.StartDate.Before(gtime.Now()) { |
|||
if req.EndDate.Before(gtime.Now()) { |
|||
return fmt.Errorf("作业时间已过期，无法添加！") |
|||
} else { |
|||
status = 1 |
|||
} |
|||
} |
|||
var Id int64 |
|||
if req.ArticleId == 0 { // 关联文章
|
|||
Id, err = dao.ActivityInteractiveGroup.Ctx(ctx).Data(do.ActivityInteractiveGroup{ |
|||
Name: req.Name, |
|||
Status: status, |
|||
ClubType: req.ClubType, |
|||
LiveId: req.LiveId, |
|||
StartDate: req.StartDate, |
|||
EndDate: req.EndDate, |
|||
}).InsertAndGetId() |
|||
} else if req.LiveId == 0 { // 关联直播
|
|||
Id, err = dao.ActivityInteractiveGroup.Ctx(ctx).Data(do.ActivityInteractiveGroup{ |
|||
Name: req.Name, |
|||
Status: status, |
|||
ClubType: req.ClubType, |
|||
ArticleId: req.ArticleId, |
|||
StartDate: req.StartDate, |
|||
EndDate: req.EndDate, |
|||
}).InsertAndGetId() |
|||
} else { |
|||
return fmt.Errorf("不能同时关联文章和直播！") |
|||
} |
|||
// 添加所有题目
|
|||
for _, v := range req.Questions { |
|||
_, err = dao.ActivityInteractiveForm.Ctx(ctx).Data(do.ActivityInteractiveForm{ |
|||
Name: req.Name, |
|||
Description: v.Description, |
|||
Content: v.Content, |
|||
Status: status, |
|||
Type: v.Type, |
|||
GroupId: Id, |
|||
}).Insert() |
|||
} |
|||
// 添加数据后，删除所有缓存
|
|||
keys, err := g.Redis().Keys(ctx, "*-* homeworklist") |
|||
if len(keys) > 0 { |
|||
_, err = g.Redis().Del(ctx, keys...) |
|||
} |
|||
return |
|||
} |
|||
|
|||
func (s *sHomework) EditHomework(ctx context.Context, req *homework.EditHomeworkReq) (err error) { |
|||
// 判断作业是否已结束
|
|||
var nowhomework *entity.ActivityInteractiveGroup |
|||
err = dao.ActivityInteractiveGroup.Ctx(ctx).WherePri(req.Id).Scan(&nowhomework) |
|||
if nowhomework.EndDate.Before(gtime.Now()) { |
|||
return fmt.Errorf("作业已结束，无法修改！") |
|||
} else { |
|||
// 判断作业是否已开始
|
|||
flag := true |
|||
if nowhomework.StartDate.Before(gtime.Now()) { |
|||
flag = false |
|||
} |
|||
// 判断提交修改表单状态
|
|||
status := 0 |
|||
if req.StartDate.Before(gtime.Now()) { |
|||
if req.EndDate.Before(gtime.Now()) { |
|||
status = 2 |
|||
} else { |
|||
status = 1 |
|||
} |
|||
} |
|||
// 判断是否关联文章或直播
|
|||
if req.ArticleId == 0 { |
|||
_, err = g.Model("activity_interactive_group").Data(g.Map{ |
|||
"name": req.Name, |
|||
"status": status, |
|||
"club_type": req.ClubType, |
|||
"article_id": nil, |
|||
"live_id": req.LiveId, |
|||
"start_date": req.StartDate, |
|||
"end_date": req.EndDate, |
|||
}).WherePri(req.Id).Update() |
|||
} else if req.LiveId == 0 { |
|||
_, err = g.Model("activity_interactive_group").Data(g.Map{ |
|||
"name": req.Name, |
|||
"status": status, |
|||
"club_type": req.ClubType, |
|||
"article_id": req.ArticleId, |
|||
"live_id": nil, |
|||
"start_date": req.StartDate, |
|||
"end_date": req.EndDate, |
|||
}).WherePri(req.Id).Update() |
|||
} else { |
|||
return fmt.Errorf("不能同时关联文章和直播！") |
|||
} |
|||
if flag { // 未开始
|
|||
_, err = dao.ActivityInteractiveForm.Ctx(ctx).Where("group_id", req.Id).Delete() |
|||
for _, v := range req.Questions { |
|||
_, err = dao.ActivityInteractiveForm.Ctx(ctx).Data(do.ActivityInteractiveForm{ |
|||
Name: req.Name, |
|||
Description: v.Description, |
|||
Content: v.Content, |
|||
Status: status, |
|||
Type: v.Type, |
|||
GroupId: req.Id, |
|||
}).Insert() |
|||
} |
|||
} else { // 已开始
|
|||
for _, v := range req.Questions { |
|||
_, err = dao.ActivityInteractiveForm.Ctx(ctx).Data(do.ActivityInteractiveForm{ |
|||
Name: req.Name, |
|||
Description: v.Description, |
|||
Content: v.Content, |
|||
Status: status, |
|||
}).WherePri(v.Id).Update() |
|||
} |
|||
} |
|||
// 修改数据后，删除所有缓存
|
|||
keys, _ := g.Redis().Keys(ctx, "*-* homeworklist") |
|||
if len(keys) > 0 { |
|||
_, _ = g.Redis().Del(ctx, keys...) |
|||
} |
|||
return |
|||
} |
|||
} |
|||
@ -0,0 +1,36 @@ |
|||
package live |
|||
|
|||
import ( |
|||
"context" |
|||
"link_homework/internal/dao" |
|||
"link_homework/internal/model/entity" |
|||
"link_homework/internal/service" |
|||
"time" |
|||
) |
|||
|
|||
type ( |
|||
sLive struct{} |
|||
) |
|||
|
|||
func init() { |
|||
service.RegisterLive(New()) |
|||
} |
|||
|
|||
func New() service.ILive { |
|||
return &sLive{} |
|||
} |
|||
|
|||
func (s *sLive) GetLiveList(ctx context.Context) (liveList []*entity.Live, err error) { |
|||
// 获取当前时间
|
|||
now := time.Now() |
|||
|
|||
// 获取当天时间的0点
|
|||
now = time.Date(now.Year(), now.Month(), now.Day(), 0, 0, 0, 0, now.Location()) |
|||
|
|||
// 计算时间范围
|
|||
startTime := now.AddDate(0, 0, -1).Unix() |
|||
endTime := now.AddDate(0, 0, 8).Unix() |
|||
|
|||
err = dao.Live.Ctx(ctx).Where("start_time >= ? and start_time < ?", startTime, endTime).OrderAsc("start_time").Scan(&liveList) |
|||
return |
|||
} |
|||
@ -1 +1,7 @@ |
|||
package logic |
|||
|
|||
import ( |
|||
_ "link_homework/internal/logic/article" |
|||
_ "link_homework/internal/logic/homework" |
|||
_ "link_homework/internal/logic/live" |
|||
) |
|||
@ -0,0 +1,32 @@ |
|||
// ================================================================================
|
|||
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
|
|||
// You can delete these comments if you wish manually maintain this interface file.
|
|||
// ================================================================================
|
|||
|
|||
package service |
|||
|
|||
import ( |
|||
"context" |
|||
"link_homework/internal/model/entity" |
|||
) |
|||
|
|||
type ( |
|||
IArticle interface { |
|||
GetArticleList(ctx context.Context, name string) (articleList []*entity.FxArticle, err error) |
|||
} |
|||
) |
|||
|
|||
var ( |
|||
localArticle IArticle |
|||
) |
|||
|
|||
func Article() IArticle { |
|||
if localArticle == nil { |
|||
panic("implement not found for interface IArticle, forgot register?") |
|||
} |
|||
return localArticle |
|||
} |
|||
|
|||
func RegisterArticle(i IArticle) { |
|||
localArticle = i |
|||
} |
|||
@ -0,0 +1,37 @@ |
|||
// ================================================================================
|
|||
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
|
|||
// You can delete these comments if you wish manually maintain this interface file.
|
|||
// ================================================================================
|
|||
|
|||
package service |
|||
|
|||
import ( |
|||
"context" |
|||
"link_homework/api/v1/homework" |
|||
"link_homework/internal/model/entity" |
|||
) |
|||
|
|||
type ( |
|||
IHomework interface { |
|||
GetHomeworkList(ctx context.Context, pageNo int, pageSize int) (homeworkList []*entity.ActivityInteractiveGroup, err error) |
|||
GetHomework(ctx context.Context, id int) (homework *entity.ActivityInteractiveGroup, err error) |
|||
AddHomework(ctx context.Context, req *homework.AddHomeworkReq) (err error) |
|||
EditHomework(ctx context.Context, req *homework.EditHomeworkReq) (err error) |
|||
GetHomeworkListTotal(ctx context.Context) (total int, err error) |
|||
} |
|||
) |
|||
|
|||
var ( |
|||
localHomework IHomework |
|||
) |
|||
|
|||
func Homework() IHomework { |
|||
if localHomework == nil { |
|||
panic("implement not found for interface IHomework, forgot register?") |
|||
} |
|||
return localHomework |
|||
} |
|||
|
|||
func RegisterHomework(i IHomework) { |
|||
localHomework = i |
|||
} |
|||
@ -0,0 +1,32 @@ |
|||
// ================================================================================
|
|||
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
|
|||
// You can delete these comments if you wish manually maintain this interface file.
|
|||
// ================================================================================
|
|||
|
|||
package service |
|||
|
|||
import ( |
|||
"context" |
|||
"link_homework/internal/model/entity" |
|||
) |
|||
|
|||
type ( |
|||
ILive interface { |
|||
GetLiveList(ctx context.Context) (liveList []*entity.Live, err error) |
|||
} |
|||
) |
|||
|
|||
var ( |
|||
localLive ILive |
|||
) |
|||
|
|||
func Live() ILive { |
|||
if localLive == nil { |
|||
panic("implement not found for interface ILive, forgot register?") |
|||
} |
|||
return localLive |
|||
} |
|||
|
|||
func RegisterLive(i ILive) { |
|||
localLive = i |
|||
} |
|||
@ -0,0 +1,8 @@ |
|||
// ================================================================================
|
|||
// Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
|
|||
// You can delete these comments if you wish manually maintain this interface file.
|
|||
// ================================================================================
|
|||
|
|||
package service |
|||
|
|||
type () |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue