diff --git a/app/jbxh/apis/banner.go b/app/jbxh/apis/banner.go new file mode 100644 index 0000000..064015f --- /dev/null +++ b/app/jbxh/apis/banner.go @@ -0,0 +1,192 @@ +package apis + +import ( + "fmt" + + "github.com/gin-gonic/gin" + "github.com/gin-gonic/gin/binding" + "github.com/go-admin-team/go-admin-core/sdk/api" + "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user" + _ "github.com/go-admin-team/go-admin-core/sdk/pkg/response" + + "go-admin/app/jbxh/models" + "go-admin/app/jbxh/service" + "go-admin/app/jbxh/service/dto" + "go-admin/common/actions" +) + +type Banner struct { + api.Api +} + +// GetPage 获取轮播图列表 +// @Summary 获取轮播图列表 +// @Description 获取轮播图列表 +// @Tags 轮播图 +// @Param pageSize query int false "页条数" +// @Param pageIndex query int false "页码" +// @Success 200 {object} response.Response{data=response.Page{list=[]models.Banner}} "{"code": 200, "data": [...]}" +// @Router /api/v1/banner [get] +// @Security Bearer +func (e Banner) GetPage(c *gin.Context) { + req := dto.BannerGetPageReq{} + s := service.Banner{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req, binding.Form). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + p := actions.GetPermissionFromContext(c) + list := make([]models.Banner, 0) + var count int64 + + err = s.GetPage(&req, p, &list, &count) + if err != nil { + e.Error(500, err, fmt.Sprintf("获取轮播图失败,\r\n失败信息 %s", err.Error())) + return + } + + e.PageOK(list, int(count), req.GetPageIndex(), req.GetPageSize(), "查询成功") +} + +// Get 获取轮播图 +// @Summary 获取轮播图 +// @Description 获取轮播图 +// @Tags 轮播图 +// @Param id path int false "id" +// @Success 200 {object} response.Response{data=models.Banner} "{"code": 200, "data": [...]}" +// @Router /api/v1/banner/{id} [get] +// @Security Bearer +func (e Banner) Get(c *gin.Context) { + req := dto.BannerGetReq{} + s := service.Banner{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + var object models.Banner + + p := actions.GetPermissionFromContext(c) + err = s.Get(&req, p, &object) + if err != nil { + e.Error(500, err, fmt.Sprintf("获取轮播图失败,\r\n失败信息 %s", err.Error())) + return + } + + e.OK(object, "查询成功") +} + +// Insert 创建轮播图 +// @Summary 创建轮播图 +// @Description 创建轮播图 +// @Tags 轮播图 +// @Accept application/json +// @Product application/json +// @Param data body dto.BannerInsertReq true "data" +// @Success 200 {object} response.Response "{"code": 200, "message": "添加成功"}" +// @Router /api/v1/banner [post] +// @Security Bearer +func (e Banner) Insert(c *gin.Context) { + req := dto.BannerInsertReq{} + s := service.Banner{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + // 设置创建人 + req.SetCreateBy(user.GetUserId(c)) + + err = s.Insert(&req) + if err != nil { + e.Error(500, err, fmt.Sprintf("创建轮播图失败,\r\n失败信息 %s", err.Error())) + return + } + + e.OK(req.GetId(), "创建成功") +} + +// Update 修改轮播图 +// @Summary 修改轮播图 +// @Description 修改轮播图 +// @Tags 轮播图 +// @Accept application/json +// @Product application/json +// @Param id path int true "id" +// @Param data body dto.BannerUpdateReq true "body" +// @Success 200 {object} response.Response "{"code": 200, "message": "修改成功"}" +// @Router /api/v1/banner/{id} [put] +// @Security Bearer +func (e Banner) Update(c *gin.Context) { + req := dto.BannerUpdateReq{} + s := service.Banner{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + req.SetUpdateBy(user.GetUserId(c)) + p := actions.GetPermissionFromContext(c) + + err = s.Update(&req, p) + if err != nil { + e.Error(500, err, fmt.Sprintf("修改轮播图失败,\r\n失败信息 %s", err.Error())) + return + } + e.OK(req.GetId(), "修改成功") +} + +// Delete 删除轮播图 +// @Summary 删除轮播图 +// @Description 删除轮播图 +// @Tags 轮播图 +// @Param data body dto.BannerDeleteReq true "body" +// @Success 200 {object} response.Response "{"code": 200, "message": "删除成功"}" +// @Router /api/v1/banner [delete] +// @Security Bearer +func (e Banner) Delete(c *gin.Context) { + s := service.Banner{} + req := dto.BannerDeleteReq{} + err := e.MakeContext(c). + MakeOrm(). + Bind(&req). + MakeService(&s.Service). + Errors + if err != nil { + e.Logger.Error(err) + e.Error(500, err, err.Error()) + return + } + + // req.SetUpdateBy(user.GetUserId(c)) + p := actions.GetPermissionFromContext(c) + + err = s.Remove(&req, p) + if err != nil { + e.Error(500, err, fmt.Sprintf("删除轮播图失败,\r\n失败信息 %s", err.Error())) + return + } + e.OK(req.GetId(), "删除成功") +} diff --git a/app/jbxh/models/banner.go b/app/jbxh/models/banner.go new file mode 100644 index 0000000..a02a490 --- /dev/null +++ b/app/jbxh/models/banner.go @@ -0,0 +1,34 @@ +package models + +import ( + "time" + + "go-admin/common/models" +) + +type Banner struct { + models.Model + + Title string `json:"title" gorm:"type:varchar(1023);comment:标题"` + Url string `json:"url" gorm:"type:text;comment:内容"` + Slug string `json:"slug" gorm:"type:varchar(127);comment:slug"` + Type int64 `json:"type" gorm:"type:int;comment:类型"` + Order int64 `json:"order" gorm:"type:int;comment:排序"` + Status int64 `json:"status" gorm:"type:int;comment:状态"` + PublishAt time.Time `json:"publishAt" gorm:"type:datetime;comment:发布时间"` + models.ModelTime + models.ControlBy +} + +func (Banner) TableName() string { + return "banner" +} + +func (e *Banner) Generate() models.ActiveRecord { + o := *e + return &o +} + +func (e *Banner) GetId() interface{} { + return e.Id +} diff --git a/app/jbxh/router/banner.go b/app/jbxh/router/banner.go new file mode 100644 index 0000000..ad8d728 --- /dev/null +++ b/app/jbxh/router/banner.go @@ -0,0 +1,31 @@ +package router + +import ( + "github.com/gin-gonic/gin" + jwt "github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth" + + "go-admin/app/jbxh/apis" + "go-admin/common/actions" + "go-admin/common/middleware" +) + +func init() { + routerCheckRole = append(routerCheckRole, registerBannerRouter) +} + +// registerBannerRouter +func registerBannerRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddleware) { + api := apis.Banner{} + r := v1.Group("/banner").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()) + { + r.GET("", actions.PermissionAction(), api.GetPage) + r.GET("/:id", actions.PermissionAction(), api.Get) + r.POST("", api.Insert) + r.PUT("/:id", actions.PermissionAction(), api.Update) + r.DELETE("", api.Delete) + } + f := v1.Group("") + { + f.GET("/fe/banner", api.GetPage) + } +} diff --git a/app/jbxh/router/category.go b/app/jbxh/router/category.go index d3ef6d6..d8e9059 100644 --- a/app/jbxh/router/category.go +++ b/app/jbxh/router/category.go @@ -24,8 +24,8 @@ func registerCategoryRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddl r.PUT("/:id", actions.PermissionAction(), api.Update) r.DELETE("", api.Delete) } - f := v1.Group("/fe/category") + f := v1.Group("") { - f.GET("", api.GetPageAll) + f.GET("/fe/category", api.GetPageAll) } } diff --git a/app/jbxh/service/banner.go b/app/jbxh/service/banner.go new file mode 100644 index 0000000..8268145 --- /dev/null +++ b/app/jbxh/service/banner.go @@ -0,0 +1,109 @@ +package service + +import ( + "errors" + + "github.com/go-admin-team/go-admin-core/sdk/service" + "gorm.io/gorm" + + "go-admin/app/jbxh/models" + "go-admin/app/jbxh/service/dto" + "go-admin/common/actions" + cDto "go-admin/common/dto" +) + +type Banner struct { + service.Service +} + +// GetPage 获取Banner列表 +func (e *Banner) GetPage(c *dto.BannerGetPageReq, p *actions.DataPermission, list *[]models.Banner, count *int64) error { + var err error + var data models.Banner + + err = e.Orm.Model(&data). + Scopes( + cDto.MakeCondition(c.GetNeedSearch()), + cDto.Paginate(c.GetPageSize(), c.GetPageIndex()), + actions.Permission(data.TableName(), p), + ). + Find(list).Limit(-1).Offset(-1). + Count(count).Error + if err != nil { + e.Log.Errorf("BannerService GetPage error:%s \r\n", err) + return err + } + return nil +} + +// Get 获取Banner对象 +func (e *Banner) Get(d *dto.BannerGetReq, p *actions.DataPermission, model *models.Banner) error { + var data models.Banner + + err := e.Orm.Model(&data). + Scopes( + actions.Permission(data.TableName(), p), + ). + First(model, d.GetId()).Error + if err != nil && errors.Is(err, gorm.ErrRecordNotFound) { + err = errors.New("查看对象不存在或无权查看") + e.Log.Errorf("Service GetBanner error:%s \r\n", err) + return err + } + if err != nil { + e.Log.Errorf("db error:%s", err) + return err + } + return nil +} + +// Insert 创建Banner对象 +func (e *Banner) Insert(c *dto.BannerInsertReq) error { + var err error + var data models.Banner + c.Generate(&data) + err = e.Orm.Create(&data).Error + if err != nil { + e.Log.Errorf("BannerService Insert error:%s \r\n", err) + return err + } + return nil +} + +// Update 修改Banner对象 +func (e *Banner) Update(c *dto.BannerUpdateReq, p *actions.DataPermission) error { + var err error + var data = models.Banner{} + e.Orm.Scopes( + actions.Permission(data.TableName(), p), + ).First(&data, c.GetId()) + c.Generate(&data) + + db := e.Orm.Save(&data) + if err = db.Error; err != nil { + e.Log.Errorf("BannerService Save error:%s \r\n", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("无权更新该数据") + } + return nil +} + +// Remove 删除Banner +func (e *Banner) Remove(d *dto.BannerDeleteReq, p *actions.DataPermission) error { + var data models.Banner + + db := e.Orm.Model(&data). + Scopes( + actions.Permission(data.TableName(), p), + ).Delete(&data, d.GetId()) + if err := db.Error; err != nil { + e.Log.Errorf("Service RemoveBanner error:%s \r\n", err) + return err + } + if db.RowsAffected == 0 { + return errors.New("无权删除该数据") + } + return nil +} diff --git a/app/jbxh/service/dto/banner.go b/app/jbxh/service/dto/banner.go new file mode 100644 index 0000000..06250a3 --- /dev/null +++ b/app/jbxh/service/dto/banner.go @@ -0,0 +1,112 @@ +package dto + +import ( + "time" + + "go-admin/app/jbxh/models" + "go-admin/common/dto" + common "go-admin/common/models" +) + +type BannerGetPageReq struct { + dto.Pagination `search:"-"` + BannerOrder +} + +type BannerOrder struct { + Id string `form:"idOrder" search:"type:order;column:id;table:banner"` + Title string `form:"titleOrder" search:"type:order;column:title;table:banner"` + Url string `form:"urlOrder" search:"type:order;column:url;table:banner"` + Slug string `form:"slugOrder" search:"type:order;column:slug;table:banner"` + Type string `form:"typeOrder" search:"type:order;column:type;table:banner"` + Order string `form:"orderOrder" search:"type:order;column:order;table:banner"` + Status string `form:"statusOrder" search:"type:order;column:status;table:banner"` + CreateBy string `form:"createByOrder" search:"type:order;column:create_by;table:banner"` + UpdateBy string `form:"updateByOrder" search:"type:order;column:update_by;table:banner"` + PublishAt string `form:"publishAtOrder" search:"type:order;column:publish_at;table:banner"` + CreatedAt string `form:"createdAtOrder" search:"type:order;column:created_at;table:banner"` + UpdatedAt string `form:"updatedAtOrder" search:"type:order;column:updated_at;table:banner"` + DeletedAt string `form:"deletedAtOrder" search:"type:order;column:deleted_at;table:banner"` +} + +func (m *BannerGetPageReq) GetNeedSearch() interface{} { + return *m +} + +type BannerInsertReq struct { + Id int `json:"-" comment:"编码"` // 编码 + Title string `json:"title" comment:"标题"` + Url string `json:"url" comment:"内容"` + Slug string `json:"slug" comment:"slug"` + Type int64 `json:"type" comment:"类型"` + Order int64 `json:"order" comment:"排序"` + Status int64 `json:"status" comment:"状态"` + PublishAt time.Time `json:"publishAt" comment:"发布时间"` + common.ControlBy +} + +func (s *BannerInsertReq) Generate(model *models.Banner) { + if s.Id == 0 { + model.Model = common.Model{Id: s.Id} + } + model.Title = s.Title + model.Url = s.Url + model.Slug = s.Slug + model.Type = s.Type + model.Order = s.Order + model.Status = s.Status + model.CreateBy = s.CreateBy // 添加这而,需要记录是被谁创建的 + model.PublishAt = s.PublishAt +} + +func (s *BannerInsertReq) GetId() interface{} { + return s.Id +} + +type BannerUpdateReq struct { + Id int `uri:"id" comment:"编码"` // 编码 + Title string `json:"title" comment:"标题"` + Url string `json:"url" comment:"内容"` + Slug string `json:"slug" comment:"slug"` + Type int64 `json:"type" comment:"类型"` + Order int64 `json:"order" comment:"排序"` + Status int64 `json:"status" comment:"状态"` + PublishAt time.Time `json:"publishAt" comment:"发布时间"` + common.ControlBy +} + +func (s *BannerUpdateReq) Generate(model *models.Banner) { + if s.Id == 0 { + model.Model = common.Model{Id: s.Id} + } + model.Title = s.Title + model.Url = s.Url + model.Slug = s.Slug + model.Type = s.Type + model.Order = s.Order + model.Status = s.Status + model.UpdateBy = s.UpdateBy // 添加这而,需要记录是被谁更新的 + model.PublishAt = s.PublishAt +} + +func (s *BannerUpdateReq) GetId() interface{} { + return s.Id +} + +// BannerGetReq 功能获取请求参数 +type BannerGetReq struct { + Id int `uri:"id"` +} + +func (s *BannerGetReq) GetId() interface{} { + return s.Id +} + +// BannerDeleteReq 功能删除请求参数 +type BannerDeleteReq struct { + Ids []int `json:"ids"` +} + +func (s *BannerDeleteReq) GetId() interface{} { + return s.Ids +} diff --git a/app/other/apis/file.go b/app/other/apis/file.go index 4548edd..7992b3c 100644 --- a/app/other/apis/file.go +++ b/app/other/apis/file.go @@ -178,8 +178,8 @@ func (e File) singleFile(c *gin.Context, fileResponse FileResponse, urlPerfix st // e.Error(200, errors.New(""), "上传第三方失败") // return FileResponse{}, true //} - fileResponse.Path = "/static/uploadfile/" + fileName - fileResponse.FullPath = "/static/uploadfile/" + fileName + //fileResponse.Path = "/static/uploadfile/" + fileName + //fileResponse.FullPath = "/static/uploadfile/" + fileName return fileResponse, false } @@ -201,4 +201,4 @@ func ossUpload(name string, path string) error { func qiniuUpload(name string, path string) error { oss := file_store.ALiYunOSS{} return oss.UpLoad(name, path) -} \ No newline at end of file +} diff --git a/config/jbxy/sql.sql b/config/jbxy/sql.sql index b0a6eda..8102e51 100644 --- a/config/jbxy/sql.sql +++ b/config/jbxy/sql.sql @@ -76,3 +76,25 @@ insert into category values (28, '互嵌式发展专题', 'hqsfzzt', '互嵌式 insert into category values (29, '旅游振兴专题', 'lyzxzt', '旅游振兴专题-分类', 24, 0, 0, 0, 0, current_timestamp, current_timestamp, null); insert into category values (30, '会员天地', 'hytd', '会员天地-分类', 0, 0, 0, 0, 0, current_timestamp, current_timestamp, null); + +drop table `banner`; +create table `banner` +( + `id` bigint unsigned NOT NULL AUTO_INCREMENT comment '编码', + `title` varchar(1023) DEFAULT NULL comment '标题', + `url` text DEFAULT NULL comment '地址', + `slug` varchar(127) not null comment 'slug', + `type` int(2) DEFAULT 0 comment '类型', + `order` int DEFAULT 0 comment '排序', + `status` int(1) DEFAULT NULL comment '状态', + `create_by` bigint unsigned DEFAULT NULL, + `update_by` bigint unsigned DEFAULT NULL, + `publish_at` datetime NULL DEFAULT NULL comment '发布时间', + `created_at` datetime not null default current_timestamp comment '创建时间', + `updated_at` datetime not null default current_timestamp on update current_timestamp comment '更新时间', + `deleted_at` datetime NULL DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE = InnoDB + AUTO_INCREMENT = 1 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_general_ci comment ='轮播图'; \ No newline at end of file