refactor🎨: 调整SysChinaAreaData Api的函数名称以及路由引用

app/other/apis/sys_china_area_data.go

@@ -1,9 +1,10 @@
 package apis
 
 import (
-	models2 "go-admin/app/other/models"
-	service2 "go-admin/app/other/service"
-	dto2 "go-admin/app/other/service/dto"
+	"github.com/gin-gonic/gin/binding"
+	"go-admin/app/other/models"
+	"go-admin/app/other/service"
+	"go-admin/app/other/service/dto"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -17,77 +18,62 @@ type SysChinaAreaData struct {
 	api.Api
 }
 
-func (e SysChinaAreaData) GetSysChinaAreaDataList(c *gin.Context) {
-	e.MakeContext(c)
-	log := e.GetLogger()
-	d := new(dto2.SysChinaAreaDataSearch)
-	db, err := e.GetOrm()
+func (e SysChinaAreaData) GetPage(c *gin.Context) {
+	s := service.SysChinaAreaData{}
+	req := dto.SysChinaAreaDataSearch{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
 	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	//查询列表
-	err = d.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
 		return
 	}
 
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
 
-	list := make([]models2.SysChinaAreaData, 0)
+	list := make([]models.SysChinaAreaData, 0)
 	var count int64
-	serviceStudent := service2.SysChinaAreaData{}
-	serviceStudent.Log = log
-	serviceStudent.Orm = db
-	err = serviceStudent.GetSysChinaAreaDataPage(d, p, &list, &count)
+	err = s.GetPage(&req, p, &list, &count)
 	if err != nil {
 		e.Error(http.StatusInternalServerError, err, "查询失败")
 		return
 	}
 
-	e.PageOK(list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
+	e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功")
 }
 
-func (e SysChinaAreaData) GetSysChinaAreaData(c *gin.Context) {
-	e.MakeContext(c)
-	log := e.GetLogger()
-	control := new(dto2.SysChinaAreaDataById)
-	db, err := e.GetOrm()
+func (e SysChinaAreaData) Get(c *gin.Context) {
+	s := service.SysChinaAreaData{}
+	req := dto.SysChinaAreaDataById{}
+	err := e.MakeContext(c).
+		MakeOrm().
+		Bind(&req, binding.Form).
+		MakeService(&s.Service).
+		Errors
 	if err != nil {
-		log.Error(err)
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
 		return
 	}
-
-	//查看详情
-	err = control.Bind(c)
-	if err != nil {
-		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")
-		return
-	}
-	var object models2.SysChinaAreaData
-
-	//数据权限检查
+	var object models.SysChinaAreaData
 	p := actions.GetPermissionFromContext(c)
-
-	serviceSysChinaAreaData := service2.SysChinaAreaData{}
-	serviceSysChinaAreaData.Log = log
-	serviceSysChinaAreaData.Orm = db
-	err = serviceSysChinaAreaData.GetSysChinaAreaData(control, p, &object)
+	err = s.Get(&req, p, &object)
 	if err != nil {
 		e.Error(http.StatusUnprocessableEntity, err, "查询失败")
 		return
 	}
 
-	e.OK(object, "查看成功")
+	e.OK(object, "查询成功")
 }
 
-func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
+func (e SysChinaAreaData) Insert(c *gin.Context) {
 	e.MakeContext(c)
 	log := e.GetLogger()
-	control := new(dto2.SysChinaAreaDataControl)
+	control := new(dto.SysChinaAreaDataControl)
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Error(err)
@@ -108,10 +94,10 @@ func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
 	// 设置创建人
 	object.SetCreateBy(user.GetUserId(c))
 
-	serviceSysChinaAreaData := service2.SysChinaAreaData{}
+	serviceSysChinaAreaData := service.SysChinaAreaData{}
 	serviceSysChinaAreaData.Orm = db
 	serviceSysChinaAreaData.Log = log
-	err = serviceSysChinaAreaData.InsertSysChinaAreaData(object)
+	err = serviceSysChinaAreaData.Insert(object)
 	if err != nil {
 		log.Error(err)
 		e.Error(http.StatusInternalServerError, err, "创建失败")
@@ -121,10 +107,10 @@ func (e SysChinaAreaData) InsertSysChinaAreaData(c *gin.Context) {
 	e.OK(object.GetId(), "创建成功")
 }
 
-func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
+func (e SysChinaAreaData) Update(c *gin.Context) {
 	e.MakeContext(c)
 	log := e.GetLogger()
-	control := new(dto2.SysChinaAreaDataControl)
+	control := new(dto.SysChinaAreaDataControl)
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Error(err)
@@ -147,10 +133,10 @@ func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
 	//数据权限检查
 	p := actions.GetPermissionFromContext(c)
 
-	serviceSysChinaAreaData := service2.SysChinaAreaData{}
+	serviceSysChinaAreaData := service.SysChinaAreaData{}
 	serviceSysChinaAreaData.Orm = db
 	serviceSysChinaAreaData.Log = log
-	err = serviceSysChinaAreaData.UpdateSysChinaAreaData(object, p)
+	err = serviceSysChinaAreaData.Update(object, p)
 	if err != nil {
 		log.Error(err)
 		return
@@ -158,10 +144,10 @@ func (e SysChinaAreaData) UpdateSysChinaAreaData(c *gin.Context) {
 	e.OK(object.GetId(), "更新成功")
 }
 
-func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
+func (e SysChinaAreaData) Delete(c *gin.Context) {
 	e.MakeContext(c)
 	log := e.GetLogger()
-	control := new(dto2.SysChinaAreaDataById)
+	control := new(dto.SysChinaAreaDataById)
 	db, err := e.GetOrm()
 	if err != nil {
 		log.Error(err)
@@ -182,10 +168,10 @@ func (e SysChinaAreaData) DeleteSysChinaAreaData(c *gin.Context) {
 	// 数据权限检查
 	p := actions.GetPermissionFromContext(c)
 
-	serviceSysChinaAreaData := service2.SysChinaAreaData{}
+	serviceSysChinaAreaData := service.SysChinaAreaData{}
 	serviceSysChinaAreaData.Orm = db
 	serviceSysChinaAreaData.Log = log
-	err = serviceSysChinaAreaData.RemoveSysChinaAreaData(control, p)
+	err = serviceSysChinaAreaData.Remove(control, p)
 	if err != nil {
 		log.Errorf("RemoveSysChinaAreaData error, %s", err)
 		e.Error(http.StatusInternalServerError, err, "删除失败")