From 33e58a3118fc371cd61765f401a7d4500ac00270 Mon Sep 17 00:00:00 2001 From: TsMask <340112800@qq.com> Date: Mon, 15 Jul 2024 18:00:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BD=91=E5=85=83=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=BA=94=E7=94=A8=E7=94=B3=E8=AF=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8A=9F=E8=83=BD=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/pt_ne_config_apply.go | 18 ++++++------------ .../practical_training/practical_training.go | 4 ++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/modules/practical_training/controller/pt_ne_config_apply.go b/src/modules/practical_training/controller/pt_ne_config_apply.go index 6a53b900..e1e2b508 100644 --- a/src/modules/practical_training/controller/pt_ne_config_apply.go +++ b/src/modules/practical_training/controller/pt_ne_config_apply.go @@ -26,20 +26,14 @@ type PtNeConfigApplyController struct { ptNeConfigDataService service.IPtNeConfigDataService } -// 网元参数配置应用申请信息 +// 网元参数配置应用申请列表 // -// GET / -func (s *PtNeConfigApplyController) Info(c *gin.Context) { - language := ctx.AcceptLanguage(c) - id, idOk := c.GetQuery("id") - if !idOk { - c.JSON(400, result.CodeMsg(400, i18n.TKey(language, "app.common.err400"))) - return - } +// GET /list +func (s *PtNeConfigApplyController) List(c *gin.Context) { + querys := ctx.QueryMap(c) + data := s.ptNeConfigApplyService.SelectPage(querys) - data := s.ptNeConfigApplyService.SelectById(id) - - c.JSON(200, result.OkData(data)) + c.JSON(200, result.Ok(data)) } // 网元参数配置应用申请提交(仅学生操作) diff --git a/src/modules/practical_training/practical_training.go b/src/modules/practical_training/practical_training.go index 6a5159eb..e60088de 100644 --- a/src/modules/practical_training/practical_training.go +++ b/src/modules/practical_training/practical_training.go @@ -66,9 +66,9 @@ func Setup(router *gin.Engine) { // 网元参数配置应用申请 neConfigApplyGroup := ptGroup.Group("/neConfigApply") { - neConfigApplyGroup.GET("", + neConfigApplyGroup.GET("/list", middleware.PreAuthorize(nil), - controller.NewPtNeConfigApply.Info, + controller.NewPtNeConfigApply.List, ) neConfigApplyGroup.POST("", middleware.PreAuthorize(map[string][]string{"hasRoles": {"student"}}),