bsm-infra/full
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor all service dependency injection

Browse Source
This commit is contained in:
yanweidong
2026-08-10 11:35:48 +08:00
parent 007a7ba38a
commit c883cc52a2
152 changed files with 1030 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/base/mgt/internal/logic/department/create.go
View File

@@ -3,9 +3,11 @@ package department
import (
"errors"
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -55,7 +57,7 @@ func Create(c *gin.Context) {
}
// 同一应用下部门名称唯一
if err = models.DBService.Model(&models.MgtDepartment{}).
if err = impl.DBService.Model(&models.MgtDepartment{}).
Where("app_id = ? and name = ?", appId, request.Name).First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
@@ -70,7 +72,7 @@ func Create(c *gin.Context) {
// 若有父部门，校验父部门属于同一应用
if request.ParentID > 0 {
var parent models.MgtDepartment
if err = models.DBService.Select("id", "app_id").Where("id = ?", request.ParentID).First(&parent).Error; err != nil {
if err = impl.DBService.Select("id", "app_id").Where("id = ?", request.ParentID).First(&parent).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -93,7 +95,7 @@ func Create(c *gin.Context) {
LeaderID: request.LeaderID,
Name: request.Name,
}
if err = models.DBService.Create(&dataModel).Error; err != nil {
if err = impl.DBService.Create(&dataModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

8
module/base/mgt/internal/logic/department/del.go
View File

@@ -3,9 +3,11 @@ package department
import (
"errors"
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"github.com/gin-gonic/gin"
@@ -58,7 +60,7 @@ func Del(c *gin.Context) {
}
var dept models.MgtDepartment
if err := models.DBService.Select("id", "app_id").Where("id = ?", request.ID).First(&dept).Error; err != nil {
if err := impl.DBService.Select("id", "app_id").Where("id = ?", request.ID).First(&dept).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -67,13 +69,13 @@ func Del(c *gin.Context) {
return
}
allDeptIds, err := getDepartmentIdsRecursive(models.DBService, dept.AppID, request.ID)
allDeptIds, err := getDepartmentIdsRecursive(impl.DBService, dept.AppID, request.ID)
if err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
if err := models.DBService.Transaction(func(tx *gorm.DB) error {
if err := impl.DBService.Transaction(func(tx *gorm.DB) error {
if err := tx.Where("dpt_id in ?", allDeptIds).Delete(&models.MgtLinkUserDpt{}).Error; err != nil {
return err
}

4
module/base/mgt/internal/logic/department/detail.go
View File

@@ -3,9 +3,11 @@ package department
import (
"errors"
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -38,7 +40,7 @@ func Detail(c *gin.Context) {
return
}
if err = models.DBService.Model(&models.MgtDepartment{}).
if err = impl.DBService.Model(&models.MgtDepartment{}).
Select("id", "identity", "name", "app_id", "parent_id", "leader_id").Preload("Leader", func(db *gorm.DB) *gorm.DB {
return db.Select("id", "identity", "name")
}).Where("id = ?", request.ID).First(&data).Error; err != nil {

4
module/base/mgt/internal/logic/department/fetch.go
View File

@@ -1,10 +1,12 @@
package department
import (
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/logic/tool"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -16,7 +18,7 @@ func Fetch(c *gin.Context) {
request = types.DptReq{}
count int64 = 0
data = make([]models.MgtDepartment, 0)
db = models.DBService.Model(&models.MgtDepartment{}).Select("id", "identity", "name", "app_id", "parent_id")
db = impl.DBService.Model(&models.MgtDepartment{}).Select("id", "identity", "name", "app_id", "parent_id")
)
err := c.ShouldBindJSON(&request)

8
module/base/mgt/internal/logic/department/fetch_pmn.go
View File

@@ -1,9 +1,11 @@
package department
import (
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -15,7 +17,7 @@ func PermissionsFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtDepartment, 0)
db = models.DBService.Model(&models.MgtDepartment{})
db = impl.DBService.Model(&models.MgtDepartment{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)
@@ -55,7 +57,7 @@ func PermissionsFetch(c *gin.Context) {
deptIds = append(deptIds, d.ID)
}
var links []models.MgtLinkDptPmn
if err := models.DBService.Where("app_id = ? and dpt_id in ?", appId, deptIds).Find(&links).Error; err != nil {
if err := impl.DBService.Where("app_id = ? and dpt_id in ?", appId, deptIds).Find(&links).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -71,7 +73,7 @@ func PermissionsFetch(c *gin.Context) {
}
var perms []models.MgtPermission
if len(pmnIds) > 0 {
if err := models.DBService.Select("id", "identity", "title", "title_en", "sort_key", "parent_id").
if err := impl.DBService.Select("id", "identity", "title", "title_en", "sort_key", "parent_id").
Where("id in ?", pmnIds).Find(&perms).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return

8
module/base/mgt/internal/logic/department/fetch_pmn_tree.go
View File

@@ -1,9 +1,11 @@
package department
import (
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -15,7 +17,7 @@ func PermissionsFetchTree(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtDepartment, 0)
db = models.DBService.Model(&models.MgtDepartment{})
db = impl.DBService.Model(&models.MgtDepartment{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)
@@ -55,7 +57,7 @@ func PermissionsFetchTree(c *gin.Context) {
deptIds = append(deptIds, d.ID)
}
var links []models.MgtLinkDptPmn
if err := models.DBService.Where("app_id = ? and dpt_id in ?", appId, deptIds).Find(&links).Error; err != nil {
if err := impl.DBService.Where("app_id = ? and dpt_id in ?", appId, deptIds).Find(&links).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -71,7 +73,7 @@ func PermissionsFetchTree(c *gin.Context) {
}
var perms []models.MgtPermission
if len(pmnIds) > 0 {
if err := models.DBService.Select("id", "identity", "title", "title_en", "sort_key", "parent_id", "menu_path", "code", "component", "is_web_page", "is_new_tab", "web_url").
if err := impl.DBService.Select("id", "identity", "title", "title_en", "sort_key", "parent_id", "menu_path", "code", "component", "is_web_page", "is_new_tab", "web_url").
Where("id in ?", pmnIds).Order("sort_key").Find(&perms).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return

4
module/base/mgt/internal/logic/department/fetch_tree.go
View File

@@ -1,9 +1,11 @@
package department
import (
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -37,7 +39,7 @@ func FetchTree(c *gin.Context) {
return
}
if err := models.DBService.Model(&models.MgtDepartment{}).
if err := impl.DBService.Model(&models.MgtDepartment{}).
Where("app_id = ?", appId).
Select("id", "identity", "name", "app_id", "parent_id").
Order("parent_id asc").Find(&data).Error; err != nil {

4
module/base/mgt/internal/logic/department/list.go
View File

@@ -1,9 +1,11 @@
package department
import (
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -38,7 +40,7 @@ func List(c *gin.Context) {
return
}
db := models.DBService.Model(&models.MgtDepartment{}).
db := impl.DBService.Model(&models.MgtDepartment{}).
Where("app_id = ?", appId).
Select("id", "identity", "name", "app_id", "parent_id")
if request.Keyword != "" {

12
module/base/mgt/internal/logic/department/modify.go
View File

@@ -3,9 +3,11 @@ package department
import (
"errors"
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -36,7 +38,7 @@ func Modify(c *gin.Context) {
return
}
if err = models.DBService.Select("id", "app_id", "identity").Where("id = ?", request.ID).First(&data).Error; err != nil {
if err = impl.DBService.Select("id", "app_id", "identity").Where("id = ?", request.ID).First(&data).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -52,7 +54,7 @@ func Modify(c *gin.Context) {
infra.Response.Error(c, errcode.ErrInvalidArgument)
return
}
descendantIds, err := getDepartmentIdsRecursive(models.DBService, appId, request.ID)
descendantIds, err := getDepartmentIdsRecursive(impl.DBService, appId, request.ID)
if err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
@@ -68,7 +70,7 @@ func Modify(c *gin.Context) {
if request.Name != "" {
var exist models.MgtDepartment
if err = models.DBService.Model(&models.MgtDepartment{}).
if err = impl.DBService.Model(&models.MgtDepartment{}).
Where("app_id = ? and name = ? and id <> ?", appId, request.Name, request.ID).First(&exist).Error; err == nil {
infra.Response.Error(c, errcode.ErrAlreadyExists)
return
@@ -81,7 +83,7 @@ func Modify(c *gin.Context) {
if request.ParentID > 0 {
var parent models.MgtDepartment
if err = models.DBService.Select("id", "app_id").Where("id = ?", request.ParentID).First(&parent).Error; err != nil {
if err = impl.DBService.Select("id", "app_id").Where("id = ?", request.ParentID).First(&parent).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrInvalidArgument)
return
@@ -102,7 +104,7 @@ func Modify(c *gin.Context) {
LeaderID: request.LeaderID,
Std_IICUDS: coreTypes.Std_IICUDS{Status: request.Status},
}
if err := models.DBService.Model(&models.MgtDepartment{}).Where("id = ?", request.ID).Updates(&dataModel).Error; err != nil {
if err := impl.DBService.Model(&models.MgtDepartment{}).Where("id = ?", request.ID).Updates(&dataModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

14
module/base/mgt/internal/logic/department/set_pmn.go
View File

@@ -3,9 +3,11 @@ package department
import (
"errors"
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -38,7 +40,7 @@ func SetPmn(c *gin.Context) {
}
var dpt models.MgtDepartment
if err := models.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if err := impl.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -61,7 +63,7 @@ func SetPmn(c *gin.Context) {
pmnData = append(pmnData, models.MgtLinkDptPmn{AppId: appId, PmnId: v, DptId: request.Id})
}
if err := models.DBService.Clauses(clause.OnConflict{
if err := impl.DBService.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "dpt_id"}, {Name: "app_id"}, {Name: "pmn_id"}},
DoUpdates: clause.AssignmentColumns([]string{"dpt_id", "app_id", "pmn_id"}),
}).Create(&pmnData).Error; err != nil {
@@ -97,7 +99,7 @@ func ModifyPmn(c *gin.Context) {
}
var dpt models.MgtDepartment
if err := models.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if err := impl.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -120,7 +122,7 @@ func ModifyPmn(c *gin.Context) {
pmnData = append(pmnData, models.MgtLinkDptPmn{AppId: appId, PmnId: v, DptId: request.Id})
}
if err := models.DBService.Transaction(func(tx *gorm.DB) error {
if err := impl.DBService.Transaction(func(tx *gorm.DB) error {
if err := tx.Where("dpt_id = ? and app_id = ?", request.Id, appId).Delete(&models.MgtLinkDptPmn{}).Error; err != nil {
return err
}
@@ -165,7 +167,7 @@ func DelPmn(c *gin.Context) {
}
var dpt models.MgtDepartment
if err := models.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if err := impl.DBService.Select("id", "app_id").Where("id = ?", request.Id).First(&dpt).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -188,7 +190,7 @@ func DelPmn(c *gin.Context) {
}
pmnIds = append(pmnIds, v)
}
if err := models.DBService.Where("dpt_id = ? AND app_id = ? AND pmn_id in ?", request.Id, appId, pmnIds).
if err := impl.DBService.Where("dpt_id = ? AND app_id = ? AND pmn_id in ?", request.Id, appId, pmnIds).
Delete(&models.MgtLinkDptPmn{}).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return

10
module/base/mgt/internal/logic/department/user.go
View File

@@ -3,9 +3,11 @@ package department
import (
"errors"
"bsm/full/module/base/mgt/internal/impl"
"bsm/full/module/base/mgt/internal/libs"
"bsm/full/module/base/mgt/internal/models"
"bsm/full/module/base/mgt/internal/types"
"git.apinb.com/bsm-sdk/core/errcode"
"git.apinb.com/bsm-sdk/core/infra"
"git.apinb.com/bsm-sdk/core/printer"
@@ -27,7 +29,7 @@ func SetUser(c *gin.Context) {
}
var dpt models.MgtDepartment
if err := models.DBService.Select("id").Where("id = ?", request.DptId).First(&dpt).Error; err != nil {
if err := impl.DBService.Select("id").Where("id = ?", request.DptId).First(&dpt).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return
@@ -40,7 +42,7 @@ func SetUser(c *gin.Context) {
for _, uid := range request.UserIds {
list = append(list, models.MgtLinkUserDpt{UserId: uid, DptId: request.DptId})
}
if err := models.DBService.Clauses(clause.OnConflict{
if err := impl.DBService.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "user_id"}, {Name: "dpt_id"}},
DoNothing: true,
}).Create(&list).Error; err != nil {
@@ -64,7 +66,7 @@ func DelUser(c *gin.Context) {
return
}
result := models.DBService.Where("dpt_id = ? and user_id in ?", request.DptId, request.UserIds).
result := impl.DBService.Where("dpt_id = ? and user_id in ?", request.DptId, request.UserIds).
Delete(&models.MgtLinkUserDpt{})
if result.Error != nil {
infra.Response.Error(c, errcode.ErrDB)
@@ -80,7 +82,7 @@ func UserFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtDepartment, 0)
db = models.DBService.Model(&models.MgtDepartment{})
db = impl.DBService.Model(&models.MgtDepartment{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)