Skip to content

Commit a295a47

Browse files
author
piexlMax(奇淼
committed
refactor(version): 简化版本管理删除逻辑并移除无用字段
移除版本管理中的状态、创建者、更新者和删除者字段 简化删除和批量删除方法的实现,去除事务和用户ID参数 更新自动生成配置的默认值说明
1 parent 81d4877 commit a295a47

File tree

4 files changed

+8
-32
lines changed

4 files changed

+8
-32
lines changed

server/api/v1/system/sys_version.go

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ func (sysVersionApi *SysVersionApi) DeleteSysVersion(c *gin.Context) {
119119
ctx := c.Request.Context()
120120

121121
ID := c.Query("ID")
122-
userID := utils.GetUserID(c)
123-
err := sysVersionService.DeleteSysVersion(ctx, ID, userID)
122+
err := sysVersionService.DeleteSysVersion(ctx, ID)
124123
if err != nil {
125124
global.GVA_LOG.Error("删除失败!", zap.Error(err))
126125
response.FailWithMessage("删除失败:"+err.Error(), c)
@@ -142,8 +141,7 @@ func (sysVersionApi *SysVersionApi) DeleteSysVersionByIds(c *gin.Context) {
142141
ctx := c.Request.Context()
143142

144143
IDs := c.QueryArray("IDs[]")
145-
userID := utils.GetUserID(c)
146-
err := sysVersionService.DeleteSysVersionByIds(ctx, IDs, userID)
144+
err := sysVersionService.DeleteSysVersionByIds(ctx, IDs)
147145
if err != nil {
148146
global.GVA_LOG.Error("批量删除失败!", zap.Error(err))
149147
response.FailWithMessage("批量删除失败:"+err.Error(), c)
@@ -310,7 +308,6 @@ func (sysVersionApi *SysVersionApi) ExportVersion(c *gin.Context) {
310308
Description: utils.Pointer(req.Description),
311309
VersionData: utils.Pointer(string(jsonData)),
312310
}
313-
version.CreatedBy = utils.GetUserID(c)
314311

315312
err = sysVersionService.CreateSysVersion(ctx, &version)
316313
if err != nil {
@@ -431,7 +428,6 @@ func (sysVersionApi *SysVersionApi) ImportVersion(c *gin.Context) {
431428
Description: utils.Pointer(fmt.Sprintf("导入版本: %v", versionInfo["description"])),
432429
VersionData: utils.Pointer(string(jsonData)),
433430
}
434-
version.CreatedBy = utils.GetUserID(c)
435431

436432
err = sysVersionService.CreateSysVersion(ctx, &version)
437433
if err != nil {

server/mcp/gva_auto_generate.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,10 +312,10 @@ func (t *AutomationModuleAnalyzer) handleAnalyze(ctx context.Context, request mc
312312
"humpPackageName": "一般是结构体名的下划线分割的小驼峰 例如:sys_user",
313313
"gvaModel": true,
314314
"autoMigrate": true,
315-
"autoCreateResource": true,
315+
"autoCreateResource": true/false 用户不特地强调开启资源标识则为false,
316316
"autoCreateApiToSql": true,
317317
"autoCreateMenuToSql": true,
318-
"autoCreateBtnAuth": true,
318+
"autoCreateBtnAuth": false/true 用户不特地强调创建按钮权限则为false,
319319
"onlyTemplate": false,
320320
"isTree": false,
321321
"treeJson": "",

server/model/system/sys_version.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ type SysVersion struct {
1212
VersionCode *string `json:"versionCode" form:"versionCode" gorm:"comment:版本号;column:version_code;size:100;" binding:"required"` //版本号
1313
Description *string `json:"description" form:"description" gorm:"comment:版本描述;column:description;size:500;"` //版本描述
1414
VersionData *string `json:"versionData" form:"versionData" gorm:"comment:版本数据JSON;column:version_data;type:text;"` //版本数据
15-
Status *int `json:"status" form:"status" gorm:"default:1;comment:状态 1:草稿 2:已发布;column:status;" binding:"required"` //状态
16-
CreatedBy uint `gorm:"column:created_by;comment:创建者"`
17-
UpdatedBy uint `gorm:"column:updated_by;comment:更新者"`
18-
DeletedBy uint `gorm:"column:deleted_by;comment:删除者"`
1915
}
2016

2117
// TableName 版本管理 SysVersion自定义表名 sys_versions

server/service/system/sys_version.go

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,15 @@ func (sysVersionService *SysVersionService) CreateSysVersion(ctx context.Context
2121

2222
// DeleteSysVersion 删除版本管理记录
2323
// Author [yourname](https://github.com/yourname)
24-
func (sysVersionService *SysVersionService) DeleteSysVersion(ctx context.Context, ID string, userID uint) (err error) {
25-
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
26-
if err := tx.Model(&system.SysVersion{}).Where("id = ?", ID).Update("deleted_by", userID).Error; err != nil {
27-
return err
28-
}
29-
if err = tx.Delete(&system.SysVersion{}, "id = ?", ID).Error; err != nil {
30-
return err
31-
}
32-
return nil
33-
})
24+
func (sysVersionService *SysVersionService) DeleteSysVersion(ctx context.Context, ID string) (err error) {
25+
err = global.GVA_DB.Delete(&system.SysVersion{}, "id = ?", ID).Error
3426
return err
3527
}
3628

3729
// DeleteSysVersionByIds 批量删除版本管理记录
3830
// Author [yourname](https://github.com/yourname)
39-
func (sysVersionService *SysVersionService) DeleteSysVersionByIds(ctx context.Context, IDs []string, deleted_by uint) (err error) {
40-
err = global.GVA_DB.Transaction(func(tx *gorm.DB) error {
41-
if err := tx.Model(&system.SysVersion{}).Where("id in ?", IDs).Update("deleted_by", deleted_by).Error; err != nil {
42-
return err
43-
}
44-
if err := tx.Where("id in ?", IDs).Delete(&system.SysVersion{}).Error; err != nil {
45-
return err
46-
}
47-
return nil
48-
})
31+
func (sysVersionService *SysVersionService) DeleteSysVersionByIds(ctx context.Context, IDs []string) (err error) {
32+
err = global.GVA_DB.Where("id in ?", IDs).Delete(&system.SysVersion{}).Error
4933
return err
5034
}
5135

0 commit comments

Comments
 (0)