liuzhihang/micro-document
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: liuzhihang:9cbcee58f3051ffae744413642224b76242ce123
Branches Tags
liuzhihang:main
liuzhihang:sxy
liuzhihang:dev-lzh
liuzhihang:dev
..
compare: liuzhihang:aa20d4386af39b9b05b15a0421a0de1601f7f44f
Branches Tags
liuzhihang:main
liuzhihang:sxy
liuzhihang:dev-lzh
liuzhihang:dev

No commits in common. "9cbcee58f3051ffae744413642224b76242ce123" and "aa20d4386af39b9b05b15a0421a0de1601f7f44f" have entirely different histories.
9cbcee58f3 ... aa20d4386a

4 changed files with 15 additions and 57 deletions
Show Stats Expand all files Collapse all files

19
internel/dao/governance.go.go
View File

@ -1,7 +1,6 @@
package dao
import (
"errors"
"micro-document/api/governance"
"micro-document/internel/model"
"micro-document/pkg/db"
@ -42,7 +41,7 @@ func (governanceDao) Delete(req *governance.DeleteReq) (err error) {
}
func (governanceDao) Edit(req *governance.EditReq) (err error) {
err = db.DocDB.Model(&model.Governance{}).Where("id = ?", req.Id).UpdateColumns(&model.Governance{
return db.DocDB.Model(&model.Governance{}).Where("id = ?", req.Id).UpdateColumns(&model.Governance{
Sort: int(req.Sort),
Status: int(req.Status),
Title: req.Title,
@ -54,17 +53,10 @@ func (governanceDao) Edit(req *governance.EditReq) (err error) {
UpdatedAt: time.Now(),
},
}).Error
if err != nil {
if errors.Is(err, gorm.ErrDuplicatedKey) {
return errors.New("已存在标题相同的数据！")
}
return errors.New("操作失败")
}
return
}
func (governanceDao) Create(req *governance.CreateReq) (err error) {
err = db.DocDB.Model(&model.Governance{}).Create(&model.Governance{
return db.DocDB.Model(&model.Governance{}).Create(&model.Governance{
Sort: int(req.Sort),
Status: int(req.Status),
Title: req.Title,
@ -73,13 +65,6 @@ func (governanceDao) Create(req *governance.CreateReq) (err error) {
Operator: req.Operator,
OperatorID: int(req.OperatorId),
}).Error
if err != nil {
if errors.Is(err, gorm.ErrDuplicatedKey) {
return errors.New("已存在标题相同的数据！")
}
return errors.New("操作失败")
}
return
}
func (governanceDao) DisplayList() (data []model.Governance, err error) {

15
internel/dao/press_releases.go
View File

@ -7,7 +7,6 @@ import (
"micro-document/pkg/db"
"time"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"github.com/duke-git/lancet/v2/datetime"
"gorm.io/gorm"
"gorm.io/gorm/clause"
@ -97,19 +96,16 @@ func (pressReleasesDao) Edit(req *pressreleases.EditReq) (err error) {
},
}).Error
if err != nil {
if errors.Is(err, gorm.ErrDuplicatedKey) {
return errors.New("已存在标题相同的数据！")
}
return errors.New("操作失败")
return err
}
var n int64
if err := tx.Model(&model.PressReleases{}).Where("display = ?", 2).Count(&n).Error; err != nil {
logger.Error(err)
return errors.New("操作失败")
return err
}
if n > 5 {
return errors.New("展示数量不能超过5个")
}
return nil
})
}
@ -133,10 +129,7 @@ func (pressReleasesDao) Create(req *pressreleases.CreateReq) (err error) {
},
}).Error
if err != nil {
if errors.Is(err, gorm.ErrDuplicatedKey) {
return errors.New("已存在标题相同的数据！")
}
return errors.New("操作失败")
return err
}
var n int64
if err := tx.Model(&model.PressReleases{}).Where("display = ?", 2).Count(&n).Error; err != nil {

17
internel/logic/governance.go.go
View File

@ -1,12 +1,10 @@
package logic
import (
"errors"
"micro-document/api/governance"
"micro-document/internel/dao"
"micro-document/internel/model"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"github.com/samber/lo"
)
@ -18,8 +16,7 @@ func (governanceLogic) List(req *governance.ListReq) (*governance.ListResp, erro
result := &governance.ListResp{}
data, total, err := dao.GovernanceDao.List(req)
if err != nil {
logger.Error(err)
return nil, errors.New("查询失败")
return nil, err
}
result.Data = lo.Map(data, func(m model.Governance, i int) *governance.Item {
return &governance.Item{
@ -37,27 +34,19 @@ func (governanceLogic) List(req *governance.ListReq) (*governance.ListResp, erro
return result, nil
}
func (governanceLogic) Delete(req *governance.DeleteReq) (*governance.DeleteResp, error) {
if err := dao.GovernanceDao.Delete(req); err != nil {
logger.Error(err)
return nil, errors.New("操作失败")
}
return nil, nil
return nil, dao.GovernanceDao.Delete(req)
}
func (governanceLogic) Edit(req *governance.EditReq) (*governance.EditResp, error) {
return nil, dao.GovernanceDao.Edit(req)
}
func (governanceLogic) Create(req *governance.CreateReq) (*governance.CreateResp, error) {
return nil, dao.GovernanceDao.Create(req)
}
func (governanceLogic) Display() (*governance.DisplayResp, error) {
result := &governance.DisplayResp{}
data, err := dao.GovernanceDao.DisplayList()
if err != nil {
logger.Error(err)
return nil, errors.New("查询失败")
return nil, err
}
result.Data = lo.Map(data, func(m model.Governance, i int) *governance.Item {
return &governance.Item{

21
internel/logic/press_releases.go
View File

@ -1,12 +1,10 @@
package logic
import (
"errors"
"micro-document/api/pressreleases"
"micro-document/internel/dao"
"micro-document/internel/model"
"dubbo.apache.org/dubbo-go/v3/common/logger"
"github.com/samber/lo"
)
@ -17,8 +15,7 @@ type pressReleasesLogic struct{}
func (pressReleasesLogic) List(req *pressreleases.ListReq) (*pressreleases.ListResp, error) {
data, total, err := dao.PressReleaseDao.List(req)
if err != nil {
logger.Error(err)
return nil, errors.New("查询失败")
return nil, err
}
var result = new(pressreleases.ListResp)
result.Total = uint64(total)
@ -44,8 +41,7 @@ func (pressReleasesLogic) List(req *pressreleases.ListReq) (*pressreleases.ListR
func (pressReleasesLogic) Display(req *pressreleases.DisplayReq) (*pressreleases.DisplayResp, error) {
data, total, err := dao.PressReleaseDao.Display(req)
if err != nil {
logger.Error(err)
return nil, errors.New("查询失败")
return nil, err
}
var result = new(pressreleases.DisplayResp)
result.Total = total
@ -64,26 +60,21 @@ func (pressReleasesLogic) Display(req *pressreleases.DisplayReq) (*pressreleases
}
func (pressReleasesLogic) Edit(req *pressreleases.EditReq) (*pressreleases.EditResp, error) {
return nil, dao.PressReleaseDao.Edit(req)
return &pressreleases.EditResp{}, dao.PressReleaseDao.Edit(req)
}
func (pressReleasesLogic) Create(req *pressreleases.CreateReq) (*pressreleases.CreateResp, error) {
return nil, dao.PressReleaseDao.Create(req)
return &pressreleases.CreateResp{}, dao.PressReleaseDao.Create(req)
}
func (pressReleasesLogic) Delete(req *pressreleases.DeleteReq) (*pressreleases.DeleteResp, error) {
if err := dao.PressReleaseDao.Delete(req); err != nil {
logger.Error(err)
return nil, errors.New("操作失败")
}
return nil, nil
return &pressreleases.DeleteResp{}, dao.PressReleaseDao.Delete(req)
}
func (pressReleasesLogic) Get(req *pressreleases.GetReq) (*pressreleases.GetResp, error) {
data, err := dao.PressReleaseDao.GetById(int(req.Id))
if err != nil {
logger.Error(err)
return nil, errors.New("查询失败")
return nil, err
}
result := &pressreleases.GetResp{
Title: data.Title,