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

10
module/base/mgt/internal/logic/role/create.go
View File

@@ -3,9 +3,11 @@ package role
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,15 +40,15 @@ func Create(c *gin.Context) {
return
}
db := models.DBService.Model(&models.MgtRole{})
db := impl.DBService.Model(&models.MgtRole{})
if err = db.Where("name = ? ", request.Name).First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
return
}
var deletedData models.MgtRole
if err = models.DBService.Unscoped().Where("name = ?", request.Name).First(&deletedData).Error; err == nil {
if err = models.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
if err = impl.DBService.Unscoped().Where("name = ?", request.Name).First(&deletedData).Error; err == nil {
if err = impl.DBService.Unscoped().Delete(&deletedData).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
@@ -62,7 +64,7 @@ func Create(c *gin.Context) {
Name: request.Name,
Std_IICUDS: coreTypes.Std_IICUDS{Identity: coreutils.UUID(), Status: 1},
}
if err = models.DBService.Model(&models.MgtRole{}).Create(&dataModel).Error; err != nil {
if err = impl.DBService.Model(&models.MgtRole{}).Create(&dataModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

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

@@ -1,9 +1,11 @@
package role
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"
@@ -35,13 +37,13 @@ func Del(c *gin.Context) {
return
}
if err := models.DBService.Model(&models.MgtLinkRolePmn{}).Where("role_id=?", request.ID).Pluck("pmn_id", &pmnId).Error; err != nil {
if err := impl.DBService.Model(&models.MgtLinkRolePmn{}).Where("role_id=?", request.ID).Pluck("pmn_id", &pmnId).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}
if len(pmnId) > 0 {
if err := models.DBService.Model(&models.MgtLinkUserRole{}).
if err := impl.DBService.Model(&models.MgtLinkUserRole{}).
Where("role_id = ?", request.ID).
Pluck("user_id", &userIds).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
@@ -49,7 +51,7 @@ func Del(c *gin.Context) {
}
}
if err := models.DBService.Transaction(func(tx *gorm.DB) error {
if err := impl.DBService.Transaction(func(tx *gorm.DB) error {
if len(pmnId) > 0 && len(userIds) > 0 {
if err := tx.Where("user_id in ? and pmn_id in ?", userIds, pmnId).
Delete(&models.MgtLinkUserPmn{}).Error; err != nil {

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

@@ -3,9 +3,11 @@ package role
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.MgtRole{}).Select("id", "identity", "name", "description").Where("id = ?", request.ID).First(&data).Error; err != nil {
if err = impl.DBService.Model(&models.MgtRole{}).Select("id", "identity", "name", "description").Where("id = ?", request.ID).First(&data).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrRecordNotFound)
return

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

@@ -1,10 +1,12 @@
package role
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"
"github.com/gin-gonic/gin"
@@ -15,7 +17,7 @@ func Fetch(c *gin.Context) {
request = types.RoleReq{}
count int64 = 0
data = make([]models.MgtRole, 0)
db = models.DBService.Model(&models.MgtRole{}).Select("id", "identity", "name", "description")
db = impl.DBService.Model(&models.MgtRole{}).Select("id", "identity", "name", "description")
)
// 解析JSON请求

10
module/base/mgt/internal/logic/role/fetch_other.go
View File

@@ -1,9 +1,11 @@
package role
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"
"github.com/gin-gonic/gin"
@@ -14,7 +16,7 @@ func PermissionsFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtRole, 0)
db = models.DBService.Model(&models.MgtRole{})
db = impl.DBService.Model(&models.MgtRole{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)
@@ -42,7 +44,7 @@ func PermissionsFetchTree(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtRole, 0)
db = models.DBService.Model(&models.MgtRole{})
db = impl.DBService.Model(&models.MgtRole{})
)
if err := c.ShouldBindJSON(&request); err != nil {
@@ -83,7 +85,7 @@ func ApplicationsFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtRole, 0)
db = models.DBService.Model(&models.MgtRole{})
db = impl.DBService.Model(&models.MgtRole{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)
@@ -109,7 +111,7 @@ func UserFetch(c *gin.Context) {
var (
request = types.FetchBase{}
data = make([]models.MgtRole, 0)
db = models.DBService.Model(&models.MgtRole{})
db = impl.DBService.Model(&models.MgtRole{})
)
if err := c.ShouldBindJSON(&request); err != nil {
infra.Response.Error(c, errcode.ErrJsonUnmarshal)

6
module/base/mgt/internal/logic/role/modify.go
View File

@@ -3,9 +3,11 @@ package role
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 Midify(c *gin.Context) {
}
if request.Name != "" {
db := models.DBService.Model(&models.MgtRole{})
db := impl.DBService.Model(&models.MgtRole{})
if err = db.Where("name = ? and id<> ?", request.Name, request.ID).First(&data).Error; err != nil {
if !errors.Is(err, gorm.ErrRecordNotFound) {
infra.Response.Error(c, errcode.ErrDB)
@@ -57,7 +59,7 @@ func Midify(c *gin.Context) {
Description: request.Description,
Std_IICUDS: coreTypes.Std_IICUDS{Status: request.Status},
}
if err := models.DBService.Model(&models.MgtRole{}).Where("id = ?", request.ID).Updates(&roleModel).Error; err != nil {
if err := impl.DBService.Model(&models.MgtRole{}).Where("id = ?", request.ID).Updates(&roleModel).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return
}

8
module/base/mgt/internal/logic/role/set.go
View File

@@ -1,9 +1,11 @@
package role
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"
@@ -45,7 +47,7 @@ func SetPmn(c *gin.Context) {
Appdta = models.MgtLinkRoleApp{AppId: appId, RoleId: 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.Clauses(clause.OnConflict{
Columns: []clause.Column{{Name: "app_id"}, {Name: "pmn_id"}, {Name: "role_id"}},
DoUpdates: clause.AssignmentColumns([]string{"app_id", "pmn_id", "role_id"}),
@@ -104,7 +106,7 @@ func ModifyPmn(c *gin.Context) {
Appdta = models.MgtLinkRoleApp{AppId: appId, RoleId: 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("app_id = ? and role_id = ?", appId, request.Id).Delete(&models.MgtLinkRolePmn{}).Error; err != nil {
printer.Error("删除角色权限关联失败: %v", err)
return err
@@ -159,7 +161,7 @@ func DelPmn(c *gin.Context) {
}
pmnIds = append(pmnIds, v)
}
if err := models.DBService.Where("app_id = ? AND role_id = ? AND pmn_id in ?", appId, request.Id, pmnIds).
if err := impl.DBService.Where("app_id = ? AND role_id = ? AND pmn_id in ?", appId, request.Id, pmnIds).
Delete(&models.MgtLinkRolePmn{}).Error; err != nil {
infra.Response.Error(c, errcode.ErrDB)
return