From 52faf6c60e488e07e5da2bebb8d6e0d97a61ee57 Mon Sep 17 00:00:00 2001 From: lijikun Date: Wed, 18 Dec 2024 11:22:12 +0800 Subject: [PATCH] =?UTF-8?q?12=E6=9C=8818=E6=97=A5=E8=B0=83=E6=95=B4logic?= =?UTF-8?q?=E5=B1=82=E4=B8=8Eservice=E5=B1=82=E5=90=8D=E5=AD=97=EF=BC=8C?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=9C=AA=E5=8F=98=E5=8A=A8,=E5=AF=B9?= =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E8=B0=83=E6=95=B4=E6=94=B9=E9=94=99=E5=90=8D?= =?UTF-8?q?=E5=AD=97=E7=9A=84=E6=94=B9=E6=88=90=E4=BA=86=E6=AD=A3=E7=A1=AE?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../internal/controller/clientPage/clientPage.go | 7 +++---- .../logic/{record/record.go => client/client.go} | 12 ++++++------ link_homework/internal/logic/logic.go | 2 +- .../internal/service/{record.go => client.go} | 18 +++++++++--------- 4 files changed, 19 insertions(+), 20 deletions(-) rename link_homework/internal/logic/{record/record.go => client/client.go} (88%) rename link_homework/internal/service/{record.go => client.go} (66%) diff --git a/link_homework/internal/controller/clientPage/clientPage.go b/link_homework/internal/controller/clientPage/clientPage.go index 8a3d956..9329225 100644 --- a/link_homework/internal/controller/clientPage/clientPage.go +++ b/link_homework/internal/controller/clientPage/clientPage.go @@ -16,7 +16,7 @@ func NewClientPage() *ClientPage { // 查询作业列表 func (c *ClientPage) GetHomeworkList(r *ghttp.Request) { //请求中不需要携带任何参数 - result, err := service.Record().GetHomeworkList(r.Context()) + result, err := service.Client().ClientGetHomeworkList(r.Context()) if err != nil { r.Response.WriteJsonExit(dto.Result{ Code: 400, @@ -39,8 +39,7 @@ func (c *ClientPage) GetHomeworkQuestion(r *ghttp.Request) { Message: err.Error(), }) } - groupId := req.Id - result, err := service.Record().GetHomeworkQuestion(r.Context(), groupId) + result, err := service.Client().GetHomeworkQuestion(r.Context(), req.Id) if err != nil { r.Response.WriteJsonExit(dto.Result{ Code: 400, @@ -64,7 +63,7 @@ func (c *ClientPage) CommitHomework(r *ghttp.Request) { }) } - err := service.Record().CommitHomework(r.Context(), req, jwcode) + err := service.Client().CommitHomework(r.Context(), req, jwcode) if err != nil { r.Response.WriteJsonExit(dto.Result{ Code: 400, diff --git a/link_homework/internal/logic/record/record.go b/link_homework/internal/logic/client/client.go similarity index 88% rename from link_homework/internal/logic/record/record.go rename to link_homework/internal/logic/client/client.go index 798aaa5..378d3a0 100644 --- a/link_homework/internal/logic/record/record.go +++ b/link_homework/internal/logic/client/client.go @@ -1,4 +1,4 @@ -package homework +package client import ( "context" @@ -10,13 +10,13 @@ import ( "link_homework/internal/service" ) -type sRecord struct{} +type sClient struct{} func init() { - service.RegisterRecord(&sRecord{}) + service.RegisterClient(&sClient{}) } -func (s *sRecord) GetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error) { +func (s *sClient) ClientGetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error) { var jwcode = 90038794 //需要从token中获取当前的数据 err = dao.ActivityInteractiveGroup.Ctx(ctx).Fields("id", "name", "DATE_FORMAT(end_date, '%Y-%m-%d') as end_date"). Where("end_date>?", gtime.Now()).OrderDesc("end_date").Scan(&homeworkList) @@ -41,13 +41,13 @@ func (s *sRecord) GetHomeworkList(ctx context.Context) (homeworkList []ClientPag return } -func (s *sRecord) GetHomeworkQuestion(ctx context.Context, groupId int) (questions []ClientPage.GetHomeworkQuestionRes, err error) { +func (s *sClient) GetHomeworkQuestion(ctx context.Context, groupId int) (questions []ClientPage.GetHomeworkQuestionRes, err error) { err = dao.ActivityInteractiveForm.Ctx(ctx).Fields("id", "name", "content", "status", "type"). Where("group_id", groupId).Scan(&questions) return } -func (s *sRecord) CommitHomework(ctx context.Context, req ClientPage.CommitHomeworkReq, jwcode int) (err error) { +func (s *sClient) CommitHomework(ctx context.Context, req ClientPage.CommitHomeworkReq, jwcode int) (err error) { //req中需要有:作业id,提交的每一个题的答案,每一个提的类型 for _, answer := range req.CommitedAnswer { if answer.Type == 1 { //单选或者多选 diff --git a/link_homework/internal/logic/logic.go b/link_homework/internal/logic/logic.go index a38656e..0c10339 100644 --- a/link_homework/internal/logic/logic.go +++ b/link_homework/internal/logic/logic.go @@ -1,5 +1,5 @@ package logic import ( - _ "link_homework/internal/logic/record" + _ "link_homework/internal/logic/client" ) diff --git a/link_homework/internal/service/record.go b/link_homework/internal/service/client.go similarity index 66% rename from link_homework/internal/service/record.go rename to link_homework/internal/service/client.go index a4637b0..57314c2 100644 --- a/link_homework/internal/service/record.go +++ b/link_homework/internal/service/client.go @@ -11,24 +11,24 @@ import ( ) type ( - IRecord interface { - GetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error) + IClient interface { + ClientGetHomeworkList(ctx context.Context) (homeworkList []ClientPage.GetHomeworkListRse, err error) GetHomeworkQuestion(ctx context.Context, groupId int) (questions []ClientPage.GetHomeworkQuestionRes, err error) CommitHomework(ctx context.Context, req ClientPage.CommitHomeworkReq, jwcode int) (err error) } ) var ( - localRecord IRecord + localClient IClient ) -func Record() IRecord { - if localRecord == nil { - panic("implement not found for interface IRecord, forgot register?") +func Client() IClient { + if localClient == nil { + panic("implement not found for interface IClient, forgot register?") } - return localRecord + return localClient } -func RegisterRecord(i IRecord) { - localRecord = i +func RegisterClient(i IClient) { + localClient = i }