apps/likeadmin
1
0
Fork 0
mirror of https://github.com/likeshop-github/likeadmin_go.git synced 2025-12-24 13:07:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 隐藏service实现结构体，仅暴露接口和构造函数

Browse Source
This commit is contained in:
geeknonerd
2023-02-22 20:30:24 +08:00
parent f19a9f520f
commit 061593b028
15 changed files with 114 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
server/admin/service/common/album.go
View File

@@ -27,16 +27,16 @@ type IAlbumService interface {
//NewAlbumService 初始化
func NewAlbumService(db *gorm.DB) IAlbumService {
return &AlbumService{db: db}
return &albumService{db: db}
}
//AlbumService 相册服务实现类
type AlbumService struct {
//albumService 相册服务实现类
type albumService struct {
db *gorm.DB
}
//AlbumList 相册文件列表
func (albSrv AlbumService) AlbumList(page request.PageReq, listReq req.CommonAlbumListReq) (res response.PageResp, e error) {
func (albSrv albumService) AlbumList(page request.PageReq, listReq req.CommonAlbumListReq) (res response.PageResp, e error) {
// 分页信息
limit := page.PageSize
offset := page.PageSize * (page.PageNo - 1)
@@ -85,7 +85,7 @@ func (albSrv AlbumService) AlbumList(page request.PageReq, listReq req.CommonAlb
}
//AlbumRename 相册文件重命名
func (albSrv AlbumService) AlbumRename(id uint, name string) (e error) {
func (albSrv albumService) AlbumRename(id uint, name string) (e error) {
var album common.Album
err := albSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&album).Error
if e = response.CheckErrDBNotRecord(err, "文件丢失！"); e != nil {
@@ -101,7 +101,7 @@ func (albSrv AlbumService) AlbumRename(id uint, name string) (e error) {
}
//AlbumMove 相册文件移动
func (albSrv AlbumService) AlbumMove(ids []uint, cid int) (e error) {
func (albSrv albumService) AlbumMove(ids []uint, cid int) (e error) {
var albums []common.Album
err := albSrv.db.Where("id in ? AND is_delete = ?", ids, 0).Find(&albums).Error
if e = response.CheckErr(err, "AlbumMove Find err"); e != nil {
@@ -125,7 +125,7 @@ func (albSrv AlbumService) AlbumMove(ids []uint, cid int) (e error) {
}
//AlbumAdd 相册文件新增
func (albSrv AlbumService) AlbumAdd(addReq req.CommonAlbumAddReq) (res uint, e error) {
func (albSrv albumService) AlbumAdd(addReq req.CommonAlbumAddReq) (res uint, e error) {
var alb common.Album
//var params map[string]interface{}
//if err := mapstructure.Decode(params, &alb); err != nil {
@@ -141,7 +141,7 @@ func (albSrv AlbumService) AlbumAdd(addReq req.CommonAlbumAddReq) (res uint, e e
}
//AlbumDel 相册文件删除
func (albSrv AlbumService) AlbumDel(ids []uint) (e error) {
func (albSrv albumService) AlbumDel(ids []uint) (e error) {
var albums []common.Album
err := albSrv.db.Where("id in ? AND is_delete = ?", ids, 0).Find(&albums).Error
if e = response.CheckErr(err, "AlbumDel Find err"); e != nil {
@@ -157,7 +157,7 @@ func (albSrv AlbumService) AlbumDel(ids []uint) (e error) {
}
//CateList 相册分类列表
func (albSrv AlbumService) CateList(listReq req.CommonCateListReq) (mapList []interface{}, e error) {
func (albSrv albumService) CateList(listReq req.CommonCateListReq) (mapList []interface{}, e error) {
var cates []common.AlbumCate
cateModel := albSrv.db.Where("is_delete = ?", 0).Order("id desc")
if listReq.Type > 0 {
@@ -177,7 +177,7 @@ func (albSrv AlbumService) CateList(listReq req.CommonCateListReq) (mapList []in
}
//CateAdd 分类新增
func (albSrv AlbumService) CateAdd(addReq req.CommonCateAddReq) (e error) {
func (albSrv albumService) CateAdd(addReq req.CommonCateAddReq) (e error) {
var cate common.AlbumCate
response.Copy(&cate, addReq)
err := albSrv.db.Create(&cate).Error
@@ -186,7 +186,7 @@ func (albSrv AlbumService) CateAdd(addReq req.CommonCateAddReq) (e error) {
}
//CateRename 分类重命名
func (albSrv AlbumService) CateRename(id uint, name string) (e error) {
func (albSrv albumService) CateRename(id uint, name string) (e error) {
var cate common.AlbumCate
err := albSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&cate).Error
if e = response.CheckErrDBNotRecord(err, "分类已不存在！"); e != nil {
@@ -202,7 +202,7 @@ func (albSrv AlbumService) CateRename(id uint, name string) (e error) {
}
//CateDel 分类删除
func (albSrv AlbumService) CateDel(id uint) (e error) {
func (albSrv albumService) CateDel(id uint) (e error) {
var cate common.AlbumCate
err := albSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&cate).Error
if e = response.CheckErrDBNotRecord(err, "分类已不存在！"); e != nil {

10
server/admin/service/common/index.go
View File

@@ -16,16 +16,16 @@ type IIndexService interface {
//NewIndexService 初始化
func NewIndexService(db *gorm.DB) IIndexService {
return &IndexService{db: db}
return &indexService{db: db}
}
//IndexService 主页服务实现类
type IndexService struct {
//indexService 主页服务实现类
type indexService struct {
db *gorm.DB
}
//Console 控制台数据
func (iSrv IndexService) Console() (res map[string]interface{}, e error) {
func (iSrv indexService) Console() (res map[string]interface{}, e error) {
// 版本信息
name, err := util.ConfigUtil.GetVal(iSrv.db, "website", "name", "LikeAdmin-Go")
if e = response.CheckErr(err, "Console Get err"); e != nil {
@@ -71,7 +71,7 @@ func (iSrv IndexService) Console() (res map[string]interface{}, e error) {
}
//Config 公共配置
func (iSrv IndexService) Config() (res map[string]interface{}, e error) {
func (iSrv indexService) Config() (res map[string]interface{}, e error) {
website, err := util.ConfigUtil.Get(iSrv.db, "website")
if e = response.CheckErr(err, "Config Get err"); e != nil {
return

12
server/admin/service/common/upload.go
View File

@@ -15,26 +15,26 @@ type IUploadService interface {
//NewUploadService 初始化
func NewUploadService(albSrv IAlbumService) IUploadService {
return &UploadService{albSrv}
return &uploadService{albSrv}
}
//UploadService 上传服务实现类
type UploadService struct {
//uploadService 上传服务实现类
type uploadService struct {
albSrv IAlbumService
}
//UploadImage 上传图片
func (upSrv UploadService) UploadImage(file *multipart.FileHeader, cid uint, aid uint) (res resp.CommonUploadFileResp, e error) {
func (upSrv uploadService) UploadImage(file *multipart.FileHeader, cid uint, aid uint) (res resp.CommonUploadFileResp, e error) {
return upSrv.uploadFile(file, "image", 10, cid, aid)
}
//UploadVideo 上传视频
func (upSrv UploadService) UploadVideo(file *multipart.FileHeader, cid uint, aid uint) (res resp.CommonUploadFileResp, e error) {
func (upSrv uploadService) UploadVideo(file *multipart.FileHeader, cid uint, aid uint) (res resp.CommonUploadFileResp, e error) {
return upSrv.uploadFile(file, "video", 20, cid, aid)
}
//uploadFile 上传文件
func (upSrv UploadService) uploadFile(file *multipart.FileHeader, folder string, fileType int, cid uint, aid uint) (res resp.CommonUploadFileResp, e error) {
func (upSrv uploadService) uploadFile(file *multipart.FileHeader, folder string, fileType int, cid uint, aid uint) (res resp.CommonUploadFileResp, e error) {
var upRes *plugin.UploadFile
if upRes, e = plugin.StorageDriver.Upload(file, folder, fileType); e != nil {
return

10
server/admin/service/setting/copyright.go
View File

@@ -14,16 +14,16 @@ type ISettingCopyrightService interface {
//NewSettingCopyrightService 初始化
func NewSettingCopyrightService(db *gorm.DB) ISettingCopyrightService {
return &SettingCopyrightService{db: db}
return &settingCopyrightService{db: db}
}
//SettingCopyrightService 网站备案服务实现类
type SettingCopyrightService struct {
//settingCopyrightService 网站备案服务实现类
type settingCopyrightService struct {
db *gorm.DB
}
//Detail 获取网站备案信息
func (cSrv SettingCopyrightService) Detail() (res []map[string]interface{}, e error) {
func (cSrv settingCopyrightService) Detail() (res []map[string]interface{}, e error) {
data, err := util.ConfigUtil.GetVal(cSrv.db, "website", "copyright", "[]")
if e = response.CheckErr(err, "Detail GetVal err"); e != nil {
return
@@ -33,7 +33,7 @@ func (cSrv SettingCopyrightService) Detail() (res []map[string]interface{}, e er
}
//Save 保存网站备案信息
func (cSrv SettingCopyrightService) Save(cReqs []req.SettingCopyrightItemReq) (e error) {
func (cSrv settingCopyrightService) Save(cReqs []req.SettingCopyrightItemReq) (e error) {
json, err := util.ToolsUtil.ObjToJson(cReqs)
if e = response.CheckErr(err, "Save ObjToJson err"); e != nil {
return

10
server/admin/service/setting/protocol.go
View File

@@ -14,16 +14,16 @@ type ISettingProtocolService interface {
//NewSettingProtocolService 初始化
func NewSettingProtocolService(db *gorm.DB) ISettingProtocolService {
return &SettingProtocolService{db: db}
return &settingProtocolService{db: db}
}
//SettingProtocolService 政策协议服务实现类
type SettingProtocolService struct {
//settingProtocolService 政策协议服务实现类
type settingProtocolService struct {
db *gorm.DB
}
//Detail 获取政策协议信息
func (cSrv SettingProtocolService) Detail() (res map[string]interface{}, e error) {
func (cSrv settingProtocolService) Detail() (res map[string]interface{}, e error) {
defaultVal := `{"name":"","content":""}`
json, err := util.ConfigUtil.GetVal(cSrv.db, "protocol", "service", defaultVal)
if e = response.CheckErr(err, "Detail GetVal service err"); e != nil {
@@ -48,7 +48,7 @@ func (cSrv SettingProtocolService) Detail() (res map[string]interface{}, e error
}
//Save 保存政策协议信息
func (cSrv SettingProtocolService) Save(pReq req.SettingProtocolReq) (e error) {
func (cSrv settingProtocolService) Save(pReq req.SettingProtocolReq) (e error) {
serviceJson, err := util.ToolsUtil.ObjToJson(pReq.Service)
if e = response.CheckErr(err, "Save ObjToJson service err"); e != nil {
return

14
server/admin/service/setting/storage.go
View File

@@ -17,11 +17,11 @@ type ISettingStorageService interface {
//NewSettingStorageService 初始化
func NewSettingStorageService(db *gorm.DB) ISettingStorageService {
return &SettingStorageService{db: db}
return &settingStorageService{db: db}
}
//SettingStorageService 存储配置服务实现类
type SettingStorageService struct {
//settingStorageService 存储配置服务实现类
type settingStorageService struct {
db *gorm.DB
}
@@ -30,7 +30,7 @@ var storageList = []map[string]interface{}{
}
//List 存储列表
func (sSrv SettingStorageService) List() ([]map[string]interface{}, error) {
func (sSrv settingStorageService) List() ([]map[string]interface{}, error) {
// TODO: engine默认local
engine := "local"
mapList := storageList
@@ -43,7 +43,7 @@ func (sSrv SettingStorageService) List() ([]map[string]interface{}, error) {
}
//Detail 存储详情
func (sSrv SettingStorageService) Detail(alias string) (res map[string]interface{}, e error) {
func (sSrv settingStorageService) Detail(alias string) (res map[string]interface{}, e error) {
// TODO: engine默认local
engine := "local"
cnf, err := util.ConfigUtil.GetMap(sSrv.db, "storage", alias)
@@ -62,7 +62,7 @@ func (sSrv SettingStorageService) Detail(alias string) (res map[string]interface
}
//Edit 存储编辑
func (sSrv SettingStorageService) Edit(editReq req.SettingStorageEditReq) (e error) {
func (sSrv settingStorageService) Edit(editReq req.SettingStorageEditReq) (e error) {
// TODO: engine默认local
engine := "local"
if engine != editReq.Alias {
@@ -86,7 +86,7 @@ func (sSrv SettingStorageService) Edit(editReq req.SettingStorageEditReq) (e err
}
//Change 存储切换
func (sSrv SettingStorageService) Change(alias string, status int) (e error) {
func (sSrv settingStorageService) Change(alias string, status int) (e error) {
// TODO: engine默认local
engine := "local"
if engine != alias {

10
server/admin/service/setting/website.go
View File

@@ -14,16 +14,16 @@ type ISettingWebsiteService interface {
//NewSettingWebsiteService 初始化
func NewSettingWebsiteService(db *gorm.DB) ISettingWebsiteService {
return &SettingWebsiteService{db: db}
return &settingWebsiteService{db: db}
}
//SettingWebsiteService 网站信息配置服务实现类
type SettingWebsiteService struct {
//settingWebsiteService 网站信息配置服务实现类
type settingWebsiteService struct {
db *gorm.DB
}
//Detail 获取网站信息
func (wSrv SettingWebsiteService) Detail() (res map[string]string, e error) {
func (wSrv settingWebsiteService) Detail() (res map[string]string, e error) {
data, err := util.ConfigUtil.Get(wSrv.db, "website")
if e = response.CheckErr(err, "Detail Get err"); e != nil {
return
@@ -39,7 +39,7 @@ func (wSrv SettingWebsiteService) Detail() (res map[string]string, e error) {
}
//Save 保存网站信息
func (wSrv SettingWebsiteService) Save(wsReq req.SettingWebsiteReq) (e error) {
func (wSrv settingWebsiteService) Save(wsReq req.SettingWebsiteReq) (e error) {
err := util.ConfigUtil.Set(wSrv.db, "website", "name", wsReq.Name)
if e = response.CheckErr(err, "Save Set name err"); e != nil {
return

26
server/admin/service/system/admin.go
View File

@@ -33,24 +33,24 @@ type ISystemAuthAdminService interface {
//NewSystemAuthAdminService 初始化
func NewSystemAuthAdminService(db *gorm.DB, permSrv ISystemAuthPermService, roleSrv ISystemAuthRoleService) ISystemAuthAdminService {
return &SystemAuthAdminService{db: db, permSrv: permSrv, roleSrv: roleSrv}
return &systemAuthAdminService{db: db, permSrv: permSrv, roleSrv: roleSrv}
}
//SystemAuthAdminService 系统管理员服务实现类
type SystemAuthAdminService struct {
//systemAuthAdminService 系统管理员服务实现类
type systemAuthAdminService struct {
db *gorm.DB
permSrv ISystemAuthPermService
roleSrv ISystemAuthRoleService
}
//FindByUsername 根据账号查找管理员
func (adminSrv SystemAuthAdminService) FindByUsername(username string) (admin system.SystemAuthAdmin, err error) {
func (adminSrv systemAuthAdminService) FindByUsername(username string) (admin system.SystemAuthAdmin, err error) {
err = adminSrv.db.Where("username = ?", username).Limit(1).First(&admin).Error
return
}
//Self 当前管理员
func (adminSrv SystemAuthAdminService) Self(adminId uint) (res resp.SystemAuthAdminSelfResp, e error) {
func (adminSrv systemAuthAdminService) Self(adminId uint) (res resp.SystemAuthAdminSelfResp, e error) {
// 管理员信息
var sysAdmin system.SystemAuthAdmin
err := adminSrv.db.Where("id = ? AND is_delete = ?", adminId, 0).Limit(1).First(&sysAdmin).Error
@@ -93,7 +93,7 @@ func (adminSrv SystemAuthAdminService) Self(adminId uint) (res resp.SystemAuthAd
}
//List 管理员列表
func (adminSrv SystemAuthAdminService) List(page request.PageReq, listReq req.SystemAuthAdminListReq) (res response.PageResp, e error) {
func (adminSrv systemAuthAdminService) List(page request.PageReq, listReq req.SystemAuthAdminListReq) (res response.PageResp, e error) {
// 分页信息
limit := page.PageSize
offset := page.PageSize * (page.PageNo - 1)
@@ -142,7 +142,7 @@ func (adminSrv SystemAuthAdminService) List(page request.PageReq, listReq req.Sy
}
//Detail 管理员详细
func (adminSrv SystemAuthAdminService) Detail(id uint) (res resp.SystemAuthAdminResp, e error) {
func (adminSrv systemAuthAdminService) Detail(id uint) (res resp.SystemAuthAdminResp, e error) {
var sysAdmin system.SystemAuthAdmin
err := adminSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&sysAdmin).Error
if e = response.CheckErrDBNotRecord(err, "账号已不存在！"); e != nil {
@@ -160,7 +160,7 @@ func (adminSrv SystemAuthAdminService) Detail(id uint) (res resp.SystemAuthAdmin
}
//Add 管理员新增
func (adminSrv SystemAuthAdminService) Add(addReq req.SystemAuthAdminAddReq) (e error) {
func (adminSrv systemAuthAdminService) Add(addReq req.SystemAuthAdminAddReq) (e error) {
var sysAdmin system.SystemAuthAdmin
// 检查username
r := adminSrv.db.Where("username = ? AND is_delete = ?", addReq.Username, 0).Limit(1).Find(&sysAdmin)
@@ -206,7 +206,7 @@ func (adminSrv SystemAuthAdminService) Add(addReq req.SystemAuthAdminAddReq) (e
}
//Edit 管理员编辑
func (adminSrv SystemAuthAdminService) Edit(c *gin.Context, editReq req.SystemAuthAdminEditReq) (e error) {
func (adminSrv systemAuthAdminService) Edit(c *gin.Context, editReq req.SystemAuthAdminEditReq) (e error) {
// 检查id
err := adminSrv.db.Where("id = ? AND is_delete = ?", editReq.ID, 0).Limit(1).First(&system.SystemAuthAdmin{}).Error
if e = response.CheckErrDBNotRecord(err, "账号不存在了!"); e != nil {
@@ -289,7 +289,7 @@ func (adminSrv SystemAuthAdminService) Edit(c *gin.Context, editReq req.SystemAu
}
//Update 管理员更新
func (adminSrv SystemAuthAdminService) Update(c *gin.Context, updateReq req.SystemAuthAdminUpdateReq, adminId uint) (e error) {
func (adminSrv systemAuthAdminService) Update(c *gin.Context, updateReq req.SystemAuthAdminUpdateReq, adminId uint) (e error) {
// 检查id
var admin system.SystemAuthAdmin
err := adminSrv.db.Where("id = ? AND is_delete = ?", adminId, 0).Limit(1).First(&admin).Error
@@ -348,7 +348,7 @@ func (adminSrv SystemAuthAdminService) Update(c *gin.Context, updateReq req.Syst
}
//Del 管理员删除
func (adminSrv SystemAuthAdminService) Del(c *gin.Context, id uint) (e error) {
func (adminSrv systemAuthAdminService) Del(c *gin.Context, id uint) (e error) {
var admin system.SystemAuthAdmin
err := adminSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&admin).Error
if e = response.CheckErrDBNotRecord(err, "账号已不存在!"); e != nil {
@@ -369,7 +369,7 @@ func (adminSrv SystemAuthAdminService) Del(c *gin.Context, id uint) (e error) {
}
//Disable 管理员状态切换
func (adminSrv SystemAuthAdminService) Disable(c *gin.Context, id uint) (e error) {
func (adminSrv systemAuthAdminService) Disable(c *gin.Context, id uint) (e error) {
var admin system.SystemAuthAdmin
err := adminSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).Find(&admin).Error
if e = response.CheckErr(err, "Disable Find err"); e != nil {
@@ -391,7 +391,7 @@ func (adminSrv SystemAuthAdminService) Disable(c *gin.Context, id uint) (e error
}
//CacheAdminUserByUid 缓存管理员
func (adminSrv SystemAuthAdminService) CacheAdminUserByUid(id uint) (err error) {
func (adminSrv systemAuthAdminService) CacheAdminUserByUid(id uint) (err error) {
var admin system.SystemAuthAdmin
err = adminSrv.db.Where("id = ?", id).Limit(1).First(&admin).Error
if err != nil {

18
server/admin/service/system/dept.go
View File

@@ -20,16 +20,16 @@ type ISystemAuthDeptService interface {
//NewSystemAuthDeptService 初始化
func NewSystemAuthDeptService(db *gorm.DB) ISystemAuthDeptService {
return &SystemAuthDeptService{db: db}
return &systemAuthDeptService{db: db}
}
//SystemAuthDeptService 系统部门服务实现类
type SystemAuthDeptService struct {
//systemAuthDeptService 系统部门服务实现类
type systemAuthDeptService struct {
db *gorm.DB
}
//All 部门所有
func (deptSrv SystemAuthDeptService) All() (res []resp.SystemAuthDeptResp, e error) {
func (deptSrv systemAuthDeptService) All() (res []resp.SystemAuthDeptResp, e error) {
var depts []system.SystemAuthDept
err := deptSrv.db.Where("pid > ? AND is_delete = ?", 0, 0).Order("sort desc, id desc").Find(&depts).Error
if e = response.CheckErr(err, "All Find err"); e != nil {
@@ -41,7 +41,7 @@ func (deptSrv SystemAuthDeptService) All() (res []resp.SystemAuthDeptResp, e err
}
//List 部门列表
func (deptSrv SystemAuthDeptService) List(listReq req.SystemAuthDeptListReq) (mapList []interface{}, e error) {
func (deptSrv systemAuthDeptService) List(listReq req.SystemAuthDeptListReq) (mapList []interface{}, e error) {
deptModel := deptSrv.db.Where("is_delete = ?", 0)
if listReq.Name != "" {
deptModel = deptModel.Where("name like ?", "%"+listReq.Name+"%")
@@ -62,7 +62,7 @@ func (deptSrv SystemAuthDeptService) List(listReq req.SystemAuthDeptListReq) (ma
}
//Detail 部门详情
func (deptSrv SystemAuthDeptService) Detail(id uint) (res resp.SystemAuthDeptResp, e error) {
func (deptSrv systemAuthDeptService) Detail(id uint) (res resp.SystemAuthDeptResp, e error) {
var dept system.SystemAuthDept
err := deptSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&dept).Error
if e = response.CheckErrDBNotRecord(err, "部门已不存在!"); e != nil {
@@ -76,7 +76,7 @@ func (deptSrv SystemAuthDeptService) Detail(id uint) (res resp.SystemAuthDeptRes
}
//Add 部门新增
func (deptSrv SystemAuthDeptService) Add(addReq req.SystemAuthDeptAddReq) (e error) {
func (deptSrv systemAuthDeptService) Add(addReq req.SystemAuthDeptAddReq) (e error) {
if addReq.Pid == 0 {
r := deptSrv.db.Where("pid = ? AND is_delete = ?", 0, 0).Limit(1).Find(&system.SystemAuthDept{})
if e = response.CheckErr(r.Error, "Add Find err"); e != nil {
@@ -94,7 +94,7 @@ func (deptSrv SystemAuthDeptService) Add(addReq req.SystemAuthDeptAddReq) (e err
}
//Edit 部门编辑
func (deptSrv SystemAuthDeptService) Edit(editReq req.SystemAuthDeptEditReq) (e error) {
func (deptSrv systemAuthDeptService) Edit(editReq req.SystemAuthDeptEditReq) (e error) {
var dept system.SystemAuthDept
err := deptSrv.db.Where("id = ? AND is_delete = ?", editReq.ID, 0).Limit(1).First(&dept).Error
// 校验
@@ -118,7 +118,7 @@ func (deptSrv SystemAuthDeptService) Edit(editReq req.SystemAuthDeptEditReq) (e
}
//Del 部门删除
func (deptSrv SystemAuthDeptService) Del(id uint) (e error) {
func (deptSrv systemAuthDeptService) Del(id uint) (e error) {
var dept system.SystemAuthDept
err := deptSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&dept).Error
// 校验

10
server/admin/service/system/log.go
View File

@@ -18,16 +18,16 @@ type ISystemLogsServer interface {
//NewSystemLogsServer 初始化
func NewSystemLogsServer(db *gorm.DB) ISystemLogsServer {
return &SystemLogsServer{db: db}
return &systemLogsServer{db: db}
}
//SystemLogsServer 系统日志服务实现类
type SystemLogsServer struct {
//systemLogsServer 系统日志服务实现类
type systemLogsServer struct {
db *gorm.DB
}
//Operate 系统操作日志
func (logSrv SystemLogsServer) Operate(page request.PageReq, logReq req.SystemLogOperateReq) (res response.PageResp, e error) {
func (logSrv systemLogsServer) Operate(page request.PageReq, logReq req.SystemLogOperateReq) (res response.PageResp, e error) {
// 分页信息
limit := page.PageSize
offset := page.PageSize * (page.PageNo - 1)
@@ -83,7 +83,7 @@ func (logSrv SystemLogsServer) Operate(page request.PageReq, logReq req.SystemLo
}
//Login 系统登录日志
func (logSrv SystemLogsServer) Login(page request.PageReq, logReq req.SystemLogLoginReq) (res response.PageResp, e error) {
func (logSrv systemLogsServer) Login(page request.PageReq, logReq req.SystemLogLoginReq) (res response.PageResp, e error) {
// 分页信息
limit := page.PageSize
offset := page.PageSize * (page.PageNo - 1)

12
server/admin/service/system/login.go
View File

@@ -24,17 +24,17 @@ type ISystemLoginService interface {
//NewSystemLoginService 初始化
func NewSystemLoginService(db *gorm.DB, adminSrv ISystemAuthAdminService) ISystemLoginService {
return &SystemLoginService{db: db, adminSrv: adminSrv}
return &systemLoginService{db: db, adminSrv: adminSrv}
}
//SystemLoginService 系统登录服务实现类
type SystemLoginService struct {
//systemLoginService 系统登录服务实现类
type systemLoginService struct {
db *gorm.DB
adminSrv ISystemAuthAdminService
}
//Login 登录
func (loginSrv SystemLoginService) Login(c *gin.Context, req *req.SystemLoginReq) (res resp.SystemLoginResp, e error) {
func (loginSrv systemLoginService) Login(c *gin.Context, req *req.SystemLoginReq) (res resp.SystemLoginResp, e error) {
sysAdmin, err := loginSrv.adminSrv.FindByUsername(req.Username)
if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
if e = loginSrv.RecordLoginLog(c, 0, req.Username, response.LoginAccountError.Msg()); e != nil {
@@ -128,13 +128,13 @@ func (loginSrv SystemLoginService) Login(c *gin.Context, req *req.SystemLoginReq
}
//Logout 退出
func (loginSrv SystemLoginService) Logout(req *req.SystemLogoutReq) (e error) {
func (loginSrv systemLoginService) Logout(req *req.SystemLogoutReq) (e error) {
util.RedisUtil.Del(config.AdminConfig.BackstageTokenKey + req.Token)
return
}
//RecordLoginLog 记录登录日志
func (loginSrv SystemLoginService) RecordLoginLog(c *gin.Context, adminId uint, username string, errStr string) (e error) {
func (loginSrv systemLoginService) RecordLoginLog(c *gin.Context, adminId uint, username string, errStr string) (e error) {
ua := core.UAParser.Parse(c.GetHeader("user-agent"))
var status uint8
if errStr == "" {

18
server/admin/service/system/menu.go
View File

@@ -23,17 +23,17 @@ type ISystemAuthMenuService interface {
//NewSystemAuthMenuService 初始化
func NewSystemAuthMenuService(db *gorm.DB, permSrv ISystemAuthPermService) ISystemAuthMenuService {
return &SystemAuthMenuService{db: db, permSrv: permSrv}
return &systemAuthMenuService{db: db, permSrv: permSrv}
}
//SystemAuthMenuService 系统菜单服务实现类
type SystemAuthMenuService struct {
//systemAuthMenuService 系统菜单服务实现类
type systemAuthMenuService struct {
db *gorm.DB
permSrv ISystemAuthPermService
}
//SelectMenuByRoleId 根据角色ID获取菜单
func (menuSrv SystemAuthMenuService) SelectMenuByRoleId(c *gin.Context, roleId uint) (mapList []interface{}, e error) {
func (menuSrv systemAuthMenuService) SelectMenuByRoleId(c *gin.Context, roleId uint) (mapList []interface{}, e error) {
adminId := config.AdminConfig.GetAdminId(c)
var menuIds []uint
if menuIds, e = menuSrv.permSrv.SelectMenuIdsByRoleId(roleId); e != nil {
@@ -59,7 +59,7 @@ func (menuSrv SystemAuthMenuService) SelectMenuByRoleId(c *gin.Context, roleId u
}
//List 菜单列表
func (menuSrv SystemAuthMenuService) List() (res []interface{}, e error) {
func (menuSrv systemAuthMenuService) List() (res []interface{}, e error) {
var menus []system.SystemAuthMenu
err := menuSrv.db.Order("menu_sort desc, id").Find(&menus).Error
if e = response.CheckErr(err, "List Find err"); e != nil {
@@ -72,7 +72,7 @@ func (menuSrv SystemAuthMenuService) List() (res []interface{}, e error) {
}
//Detail 菜单详情
func (menuSrv SystemAuthMenuService) Detail(id uint) (res resp.SystemAuthMenuResp, e error) {
func (menuSrv systemAuthMenuService) Detail(id uint) (res resp.SystemAuthMenuResp, e error) {
var menu system.SystemAuthMenu
err := menuSrv.db.Where("id = ?", id).Limit(1).First(&menu).Error
if e = response.CheckErrDBNotRecord(err, "菜单已不存在!"); e != nil {
@@ -85,7 +85,7 @@ func (menuSrv SystemAuthMenuService) Detail(id uint) (res resp.SystemAuthMenuRes
return
}
func (menuSrv SystemAuthMenuService) Add(addReq req.SystemAuthMenuAddReq) (e error) {
func (menuSrv systemAuthMenuService) Add(addReq req.SystemAuthMenuAddReq) (e error) {
var menu system.SystemAuthMenu
response.Copy(&menu, addReq)
err := menuSrv.db.Create(&menu).Error
@@ -96,7 +96,7 @@ func (menuSrv SystemAuthMenuService) Add(addReq req.SystemAuthMenuAddReq) (e err
return
}
func (menuSrv SystemAuthMenuService) Edit(editReq req.SystemAuthMenuEditReq) (e error) {
func (menuSrv systemAuthMenuService) Edit(editReq req.SystemAuthMenuEditReq) (e error) {
var menu system.SystemAuthMenu
err := menuSrv.db.Where("id = ?", editReq.ID).Limit(1).Find(&menu).Error
if e = response.CheckErrDBNotRecord(err, "菜单已不存在!"); e != nil {
@@ -115,7 +115,7 @@ func (menuSrv SystemAuthMenuService) Edit(editReq req.SystemAuthMenuEditReq) (e
}
//Del 删除菜单
func (menuSrv SystemAuthMenuService) Del(id uint) (e error) {
func (menuSrv systemAuthMenuService) Del(id uint) (e error) {
var menu system.SystemAuthMenu
err := menuSrv.db.Where("id = ?", id).Limit(1).First(&menu).Error
if e = response.CheckErrDBNotRecord(err, "菜单已不存在!"); e != nil {

16
server/admin/service/system/perm.go
View File

@@ -20,16 +20,16 @@ type ISystemAuthPermService interface {
//NewSystemAuthPermService 初始化
func NewSystemAuthPermService(db *gorm.DB) ISystemAuthPermService {
return &SystemAuthPermService{db: db}
return &systemAuthPermService{db: db}
}
//SystemAuthPermService 系统权限服务实现类
type SystemAuthPermService struct {
//systemAuthPermService 系统权限服务实现类
type systemAuthPermService struct {
db *gorm.DB
}
//SelectMenuIdsByRoleId 根据角色ID获取菜单ID
func (permSrv SystemAuthPermService) SelectMenuIdsByRoleId(roleId uint) (menuIds []uint, e error) {
func (permSrv systemAuthPermService) SelectMenuIdsByRoleId(roleId uint) (menuIds []uint, e error) {
var role system.SystemAuthRole
err := permSrv.db.Where("id = ? AND is_disable = ?", roleId, 0).Limit(1).First(&role).Error
if e = response.CheckErr(err, "SelectMenuIdsByRoleId First err"); e != nil {
@@ -47,7 +47,7 @@ func (permSrv SystemAuthPermService) SelectMenuIdsByRoleId(roleId uint) (menuIds
}
//CacheRoleMenusByRoleId 缓存角色菜单
func (permSrv SystemAuthPermService) CacheRoleMenusByRoleId(roleId uint) (e error) {
func (permSrv systemAuthPermService) CacheRoleMenusByRoleId(roleId uint) (e error) {
var perms []system.SystemAuthPerm
err := permSrv.db.Where("role_id = ?", roleId).Find(&perms).Error
if e = response.CheckErr(err, "CacheRoleMenusByRoleId Find perms err"); e != nil {
@@ -75,7 +75,7 @@ func (permSrv SystemAuthPermService) CacheRoleMenusByRoleId(roleId uint) (e erro
}
//BatchSaveByMenuIds 批量写入角色菜单
func (permSrv SystemAuthPermService) BatchSaveByMenuIds(roleId uint, menuIds string, db *gorm.DB) (e error) {
func (permSrv systemAuthPermService) BatchSaveByMenuIds(roleId uint, menuIds string, db *gorm.DB) (e error) {
if menuIds == "" {
return
}
@@ -98,7 +98,7 @@ func (permSrv SystemAuthPermService) BatchSaveByMenuIds(roleId uint, menuIds str
}
//BatchDeleteByRoleId 批量删除角色菜单(根据角色ID)
func (permSrv SystemAuthPermService) BatchDeleteByRoleId(roleId uint, db *gorm.DB) (e error) {
func (permSrv systemAuthPermService) BatchDeleteByRoleId(roleId uint, db *gorm.DB) (e error) {
if db == nil {
db = permSrv.db
}
@@ -108,7 +108,7 @@ func (permSrv SystemAuthPermService) BatchDeleteByRoleId(roleId uint, db *gorm.D
}
//BatchDeleteByMenuId 批量删除角色菜单(根据菜单ID)
func (permSrv SystemAuthPermService) BatchDeleteByMenuId(menuId uint) (e error) {
func (permSrv systemAuthPermService) BatchDeleteByMenuId(menuId uint) (e error) {
err := permSrv.db.Delete(&system.SystemAuthPerm{}, "menu_id = ?", menuId).Error
e = response.CheckErr(err, "BatchDeleteByMenuId Delete err")
return

18
server/admin/service/system/post.go
View File

@@ -20,16 +20,16 @@ type ISystemAuthPostService interface {
//NewSystemAuthPostService 初始化
func NewSystemAuthPostService(db *gorm.DB) ISystemAuthPostService {
return &SystemAuthPostService{db: db}
return &systemAuthPostService{db: db}
}
//SystemAuthPostService 系统岗位服务实现类
type SystemAuthPostService struct {
//systemAuthPostService 系统岗位服务实现类
type systemAuthPostService struct {
db *gorm.DB
}
//All 岗位所有
func (postSrv SystemAuthPostService) All() (res []resp.SystemAuthPostResp, e error) {
func (postSrv systemAuthPostService) All() (res []resp.SystemAuthPostResp, e error) {
var posts []system.SystemAuthPost
err := postSrv.db.Where("is_delete = ?", 0).Order("sort desc, id desc").Find(&posts).Error
if e = response.CheckErr(err, "All Find err"); e != nil {
@@ -41,7 +41,7 @@ func (postSrv SystemAuthPostService) All() (res []resp.SystemAuthPostResp, e err
}
//List 岗位列表
func (postSrv SystemAuthPostService) List(page request.PageReq, listReq req.SystemAuthPostListReq) (res response.PageResp, e error) {
func (postSrv systemAuthPostService) List(page request.PageReq, listReq req.SystemAuthPostListReq) (res response.PageResp, e error) {
// 分页信息
limit := page.PageSize
offset := page.PageSize * (page.PageNo - 1)
@@ -79,7 +79,7 @@ func (postSrv SystemAuthPostService) List(page request.PageReq, listReq req.Syst
}
//Detail 部门详情
func (postSrv SystemAuthPostService) Detail(id uint) (res resp.SystemAuthPostResp, e error) {
func (postSrv systemAuthPostService) Detail(id uint) (res resp.SystemAuthPostResp, e error) {
var post system.SystemAuthPost
err := postSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&post).Error
if e = response.CheckErrDBNotRecord(err, "岗位不存在!"); e != nil {
@@ -93,7 +93,7 @@ func (postSrv SystemAuthPostService) Detail(id uint) (res resp.SystemAuthPostRes
}
//Add 部门新增
func (postSrv SystemAuthPostService) Add(addReq req.SystemAuthPostAddReq) (e error) {
func (postSrv systemAuthPostService) Add(addReq req.SystemAuthPostAddReq) (e error) {
r := postSrv.db.Where("(code = ? OR name = ?) AND is_delete = ?", addReq.Code, addReq.Name, 0).Limit(1).Find(&system.SystemAuthPost{})
if e = response.CheckErr(r.Error, "Add Find err"); e != nil {
return
@@ -109,7 +109,7 @@ func (postSrv SystemAuthPostService) Add(addReq req.SystemAuthPostAddReq) (e err
}
//Edit 部门编辑
func (postSrv SystemAuthPostService) Edit(editReq req.SystemAuthPostEditReq) (e error) {
func (postSrv systemAuthPostService) Edit(editReq req.SystemAuthPostEditReq) (e error) {
var post system.SystemAuthPost
err := postSrv.db.Where("id = ? AND is_delete = ?", editReq.ID, 0).Limit(1).First(&post).Error
// 校验
@@ -134,7 +134,7 @@ func (postSrv SystemAuthPostService) Edit(editReq req.SystemAuthPostEditReq) (e
}
//Del 部门删除
func (postSrv SystemAuthPostService) Del(id uint) (e error) {
func (postSrv systemAuthPostService) Del(id uint) (e error) {
var post system.SystemAuthPost
err := postSrv.db.Where("id = ? AND is_delete = ?", id, 0).Limit(1).First(&post).Error
// 校验

20
server/admin/service/system/role.go
View File

@@ -25,17 +25,17 @@ type ISystemAuthRoleService interface {
//NewSystemAuthRoleService 初始化
func NewSystemAuthRoleService(db *gorm.DB, permSrv ISystemAuthPermService) ISystemAuthRoleService {
return &SystemAuthRoleService{db: db, permSrv: permSrv}
return &systemAuthRoleService{db: db, permSrv: permSrv}
}
//SystemAuthRoleService 系统角色服务实现类
type SystemAuthRoleService struct {
//systemAuthRoleService 系统角色服务实现类
type systemAuthRoleService struct {
db *gorm.DB
permSrv ISystemAuthPermService
}
//All 角色所有
func (roleSrv SystemAuthRoleService) All() (res []resp.SystemAuthRoleSimpleResp, e error) {
func (roleSrv systemAuthRoleService) All() (res []resp.SystemAuthRoleSimpleResp, e error) {
var roles []system.SystemAuthRole
err := roleSrv.db.Order("sort desc, id desc").Find(&roles).Error
if e = response.CheckErr(err, "All Find err"); e != nil {
@@ -46,7 +46,7 @@ func (roleSrv SystemAuthRoleService) All() (res []resp.SystemAuthRoleSimpleResp,
}
//List 根据角色ID获取菜单ID
func (roleSrv SystemAuthRoleService) List(page request.PageReq) (res response.PageResp, e error) {
func (roleSrv systemAuthRoleService) List(page request.PageReq) (res response.PageResp, e error) {
limit := page.PageSize
offset := page.PageSize * (page.PageNo - 1)
roleModel := roleSrv.db.Model(&system.SystemAuthRole{})
@@ -75,7 +75,7 @@ func (roleSrv SystemAuthRoleService) List(page request.PageReq) (res response.Pa
}
//Detail 角色详情
func (roleSrv SystemAuthRoleService) Detail(id uint) (res resp.SystemAuthRoleResp, e error) {
func (roleSrv systemAuthRoleService) Detail(id uint) (res resp.SystemAuthRoleResp, e error) {
var role system.SystemAuthRole
err := roleSrv.db.Where("id = ?", id).Limit(1).First(&role).Error
if e = response.CheckErrDBNotRecord(err, "角色已不存在!"); e != nil {
@@ -91,14 +91,14 @@ func (roleSrv SystemAuthRoleService) Detail(id uint) (res resp.SystemAuthRoleRes
}
//getMemberCnt 根据角色ID获取成员数量
func (roleSrv SystemAuthRoleService) getMemberCnt(roleId uint) (count int64) {
func (roleSrv systemAuthRoleService) getMemberCnt(roleId uint) (count int64) {
roleSrv.db.Model(&system.SystemAuthAdmin{}).Where(
"role = ? AND is_delete = ?", roleId, 0).Count(&count)
return
}
//Add 新增角色
func (roleSrv SystemAuthRoleService) Add(addReq req.SystemAuthRoleAddReq) (e error) {
func (roleSrv systemAuthRoleService) Add(addReq req.SystemAuthRoleAddReq) (e error) {
var role system.SystemAuthRole
if r := roleSrv.db.Where("name = ?", strings.Trim(addReq.Name, " ")).Limit(1).First(&role); r.RowsAffected > 0 {
return response.AssertArgumentError.Make("角色名称已存在!")
@@ -120,7 +120,7 @@ func (roleSrv SystemAuthRoleService) Add(addReq req.SystemAuthRoleAddReq) (e err
}
//Edit 编辑角色
func (roleSrv SystemAuthRoleService) Edit(editReq req.SystemAuthRoleEditReq) (e error) {
func (roleSrv systemAuthRoleService) Edit(editReq req.SystemAuthRoleEditReq) (e error) {
err := roleSrv.db.Where("id = ?", editReq.ID).Limit(1).First(&system.SystemAuthRole{}).Error
if e = response.CheckErrDBNotRecord(err, "角色已不存在!"); e != nil {
return
@@ -158,7 +158,7 @@ func (roleSrv SystemAuthRoleService) Edit(editReq req.SystemAuthRoleEditReq) (e
}
//Del 删除角色
func (roleSrv SystemAuthRoleService) Del(id uint) (e error) {
func (roleSrv systemAuthRoleService) Del(id uint) (e error) {
err := roleSrv.db.Where("id = ?", id).Limit(1).First(&system.SystemAuthRole{}).Error
if e = response.CheckErrDBNotRecord(err, "角色已不存在!"); e != nil {
return