update:

- pgsql 获取表名, 获取表字段(todo), 获取数据库名 refactor: - 自动化代码与自动化代码历史代码规范化 - mysql 获取表名, 获取表字段, 获取数据库名 - enter 代码优化
2021-11-20 22:46:05 +08:00
parent 77a9b20346
commit 6cc495de95
28 changed files with 449 additions and 250 deletions
--- a/server/api/v1/autocode/auto_code_example.go
+++ b/server/api/v1/autocode/auto_code_example.go
--- a/server/api/v1/enter.go
+++ b/server/api/v1/enter.go
@@ -7,8 +7,8 @@ import (
 )

 type ApiGroup struct {
-	ExampleApiGroup  example.ApiGroup
 	SystemApiGroup   system.ApiGroup
+	ExampleApiGroup  example.ApiGroup
 	AutoCodeApiGroup autocode.ApiGroup
 }

--- a/server/api/v1/example/enter.go
+++ b/server/api/v1/example/enter.go
@@ -3,11 +3,11 @@ package example
 import "github.com/flipped-aurora/gin-vue-admin/server/service"

 type ApiGroup struct {
-	CustomerApi
 	ExcelApi
+	CustomerApi
 	FileUploadAndDownloadApi
 }

-var fileUploadAndDownloadService = service.ServiceGroupApp.ExampleServiceGroup.FileUploadAndDownloadService
-var customerService = service.ServiceGroupApp.ExampleServiceGroup.CustomerService
 var excelService = service.ServiceGroupApp.ExampleServiceGroup.ExcelService
+var customerService = service.ServiceGroupApp.ExampleServiceGroup.CustomerService
+var fileUploadAndDownloadService = service.ServiceGroupApp.ExampleServiceGroup.FileUploadAndDownloadService
--- a/server/api/v1/system/enter.go
+++ b/server/api/v1/system/enter.go
@@ -3,31 +3,32 @@ package system
 import "github.com/flipped-aurora/gin-vue-admin/server/service"

 type ApiGroup struct {
-	SystemApiApi
-	AuthorityApi
-	AutoCodeApi
-	BaseApi
-	CasbinApi
-	DictionaryApi
-	DictionaryDetailApi
-	SystemApi
 	DBApi
 	JwtApi
-	OperationRecordApi
+	BaseApi
+	SystemApi
+	CasbinApi
+	AutoCodeApi
+	SystemApiApi
+	AuthorityApi
+	DictionaryApi
 	AuthorityMenuApi
+	OperationRecordApi
+	AutoCodeHistoryApi
+	DictionaryDetailApi
 }

-var authorityService = service.ServiceGroupApp.SystemServiceGroup.AuthorityService
 var apiService = service.ServiceGroupApp.SystemServiceGroup.ApiService
+var jwtService = service.ServiceGroupApp.SystemServiceGroup.JwtService
 var menuService = service.ServiceGroupApp.SystemServiceGroup.MenuService
+var userService = service.ServiceGroupApp.SystemServiceGroup.UserService
+var initDBService = service.ServiceGroupApp.SystemServiceGroup.InitDBService
 var casbinService = service.ServiceGroupApp.SystemServiceGroup.CasbinService
 var autoCodeService = service.ServiceGroupApp.SystemServiceGroup.AutoCodeService
-var autoCodeHistoryService = service.ServiceGroupApp.SystemServiceGroup.AutoCodeHistoryService
-var dictionaryService = service.ServiceGroupApp.SystemServiceGroup.DictionaryService
-var dictionaryDetailService = service.ServiceGroupApp.SystemServiceGroup.DictionaryDetailService
-var initDBService = service.ServiceGroupApp.SystemServiceGroup.InitDBService
-var jwtService = service.ServiceGroupApp.SystemServiceGroup.JwtService
 var baseMenuService = service.ServiceGroupApp.SystemServiceGroup.BaseMenuService
-var operationRecordService = service.ServiceGroupApp.SystemServiceGroup.OperationRecordService
-var userService = service.ServiceGroupApp.SystemServiceGroup.UserService
+var authorityService = service.ServiceGroupApp.SystemServiceGroup.AuthorityService
+var dictionaryService = service.ServiceGroupApp.SystemServiceGroup.DictionaryService
 var systemConfigService = service.ServiceGroupApp.SystemServiceGroup.SystemConfigService
+var operationRecordService = service.ServiceGroupApp.SystemServiceGroup.OperationRecordService
+var autoCodeHistoryService = service.ServiceGroupApp.SystemServiceGroup.AutoCodeHistoryService
+var dictionaryDetailService = service.ServiceGroupApp.SystemServiceGroup.DictionaryDetailService
--- a/server/api/v1/system/sys_auto_code.go
+++ b/server/api/v1/system/sys_auto_code.go
@@ -9,99 +9,15 @@ import (
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
-	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
 	"github.com/flipped-aurora/gin-vue-admin/server/utils"

 	"github.com/gin-gonic/gin"
 	"go.uber.org/zap"
 )

-type AutoCodeApi struct {
-}
-
-// @Tags AutoCode
-// @Summary 删除回滚记录
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body systemReq.AutoHistoryByID true "删除回滚记录"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"删除成功"}"
-// @Router /autoCode/delSysHistory [post]
-func (autoApi *AutoCodeApi) DelSysHistory(c *gin.Context) {
-	var id systemReq.AutoHistoryByID
-	_ = c.ShouldBindJSON(&id)
-	err := autoCodeHistoryService.DeletePage(id.ID)
-	if err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Error(err))
-		response.FailWithMessage("获取失败", c)
-	}
-	response.OkWithMessage("删除成功", c)
-
-}
-
-// @Tags AutoCode
-// @Summary 查询回滚记录
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body systemReq.SysAutoHistory true "查询回滚记录"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /autoCode/getSysHistory [post]
-func (autoApi *AutoCodeApi) GetSysHistory(c *gin.Context) {
-	var search systemReq.SysAutoHistory
-	_ = c.ShouldBindJSON(&search)
-	err, list, total := autoCodeHistoryService.GetSysHistoryPage(search.PageInfo)
-	if err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Error(err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(response.PageResult{
-			List:     list,
-			Total:    total,
-			Page:     search.Page,
-			PageSize: search.PageSize,
-		}, "获取成功", c)
-	}
-}
-
-// @Tags AutoCode
-// @Summary 回滚
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body systemReq.AutoHistoryByID true "回滚自动生成代码"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"回滚成功"}"
-// @Router /autoCode/rollback [post]
-func (autoApi *AutoCodeApi) RollBack(c *gin.Context) {
-	var id systemReq.AutoHistoryByID
-	_ = c.ShouldBindJSON(&id)
-	if err := autoCodeHistoryService.RollBack(id.ID); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	}
-	response.OkWithMessage("回滚成功", c)
-}
-
-// @Tags AutoCode
-// @Summary 回滚
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Param data body systemReq.AutoHistoryByID true "获取meta信息"
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /autoCode/getMeta [post]
-func (autoApi *AutoCodeApi) GetMeta(c *gin.Context) {
-	var id systemReq.AutoHistoryByID
-	_ = c.ShouldBindJSON(&id)
-	if v, err := autoCodeHistoryService.GetMeta(id.ID); err != nil {
-		response.FailWithMessage(err.Error(), c)
-		return
-	} else {
-		response.OkWithDetailed(gin.H{"meta": v}, "获取成功", c)
-	}
-
-}
+type AutoCodeApi struct{}

+// PreviewTemp
 // @Tags AutoCode
 // @Summary 预览创建后的代码
 // @Security ApiKeyAuth
@@ -126,6 +42,7 @@ func (autoApi *AutoCodeApi) PreviewTemp(c *gin.Context) {
 	}
 }

+// CreateTemp
 // @Tags AutoCode
 // @Summary 自动代码模板
 // @Security ApiKeyAuth
@@ -171,6 +88,24 @@ func (autoApi *AutoCodeApi) CreateTemp(c *gin.Context) {
 	}
 }

+// GetDB
+// @Tags AutoCode
+// @Summary 获取当前所有数据库
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
+// @Router /autoCode/getDatabase [get]
+func (autoApi *AutoCodeApi) GetDB(c *gin.Context) {
+	dbs, err := autoCodeService.Database().GetDB()
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+	}
+	response.OkWithDetailed(gin.H{"dbs": dbs}, "获取成功", c)
+}
+
+// GetTables
 // @Tags AutoCode
 // @Summary 获取当前数据库所有表
 // @Security ApiKeyAuth
@@ -180,7 +115,7 @@ func (autoApi *AutoCodeApi) CreateTemp(c *gin.Context) {
 // @Router /autoCode/getTables [get]
 func (autoApi *AutoCodeApi) GetTables(c *gin.Context) {
 	dbName := c.DefaultQuery("dbName", global.GVA_CONFIG.Mysql.Dbname)
-	err, tables := autoCodeService.GetTables(dbName)
+	tables, err := autoCodeService.Database().GetTables(dbName)
 	if err != nil {
 		global.GVA_LOG.Error("查询table失败!", zap.Error(err))
 		response.FailWithMessage("查询table失败", c)
@@ -189,22 +124,7 @@ func (autoApi *AutoCodeApi) GetTables(c *gin.Context) {
 	}
 }

-// @Tags AutoCode
-// @Summary 获取当前所有数据库
-// @Security ApiKeyAuth
-// @accept application/json
-// @Produce application/json
-// @Success 200 {string} string "{"success":true,"data":{},"msg":"获取成功"}"
-// @Router /autoCode/getDatabase [get]
-func (autoApi *AutoCodeApi) GetDB(c *gin.Context) {
-	if err, dbs := autoCodeService.GetDB(); err != nil {
-		global.GVA_LOG.Error("获取失败!", zap.Error(err))
-		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"dbs": dbs}, "获取成功", c)
-	}
-}
-
+// GetColumn
 // @Tags AutoCode
 // @Summary 获取当前表所有字段
 // @Security ApiKeyAuth
@@ -215,10 +135,10 @@ func (autoApi *AutoCodeApi) GetDB(c *gin.Context) {
 func (autoApi *AutoCodeApi) GetColumn(c *gin.Context) {
 	dbName := c.DefaultQuery("dbName", global.GVA_CONFIG.Mysql.Dbname)
 	tableName := c.Query("tableName")
-	if err, columns := autoCodeService.GetColumn(tableName, dbName); err != nil {
+	columns, err := autoCodeService.Database().GetColumn(tableName, dbName)
+	if err != nil {
 		global.GVA_LOG.Error("获取失败!", zap.Error(err))
 		response.FailWithMessage("获取失败", c)
-	} else {
-		response.OkWithDetailed(gin.H{"columns": columns}, "获取成功", c)
 	}
+	response.OkWithDetailed(gin.H{"columns": columns}, "获取成功", c)
 }
--- a/server/api/v1/system/sys_auto_code_history.go
+++ b/server/api/v1/system/sys_auto_code_history.go
@@ -0,0 +1,98 @@
+package system
+
+import (
+	"github.com/flipped-aurora/gin-vue-admin/server/global"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/request"
+	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
+	systemReq "github.com/flipped-aurora/gin-vue-admin/server/model/system/request"
+	"github.com/gin-gonic/gin"
+	"go.uber.org/zap"
+)
+
+type AutoCodeHistoryApi struct{}
+
+// First
+// @Tags AutoCode
+// @Summary 获取meta信息
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.GetById true "请求参数"
+// @Success 200 {object} response.Response{} "获取成功!"
+// @Router /autoCode/getMeta [post]
+func (a *AutoCodeHistoryApi) First(c *gin.Context) {
+	var info request.GetById
+	_ = c.ShouldBindJSON(&info)
+	data, err := autoCodeHistoryService.First(&info)
+	if err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	response.OkWithDetailed(gin.H{"meta": data}, "获取成功", c)
+}
+
+// Delete
+// @Tags AutoCode
+// @Summary 删除回滚记录
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.GetById true "请求参数"
+// @Success 200 {object} response.Response{} "删除成功!"
+// @Router /autoCode/delSysHistory [post]
+func (a *AutoCodeHistoryApi) Delete(c *gin.Context) {
+	var info request.GetById
+	_ = c.ShouldBindJSON(&info)
+	err := autoCodeHistoryService.Delete(&info)
+	if err != nil {
+		global.GVA_LOG.Error("删除失败!", zap.Error(err))
+		response.FailWithMessage("删除失败", c)
+		return
+	}
+	response.OkWithMessage("删除成功", c)
+}
+
+// RollBack
+// @Tags AutoCode
+// @Summary 回滚自动生成代码
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body request.GetById true "请求参数"
+// @Success 200 {object} response.Response{} "回滚成功!"
+// @Router /autoCode/rollback [post]
+func (a *AutoCodeHistoryApi) RollBack(c *gin.Context) {
+	var info request.GetById
+	_ = c.ShouldBindJSON(&info)
+	if err := autoCodeHistoryService.RollBack(&info); err != nil {
+		response.FailWithMessage(err.Error(), c)
+		return
+	}
+	response.OkWithMessage("回滚成功", c)
+}
+
+// GetList
+// @Tags AutoCode
+// @Summary 查询回滚记录
+// @Security ApiKeyAuth
+// @accept application/json
+// @Produce application/json
+// @Param data body systemReq.SysAutoHistory true "请求参数"
+// @Success 200 {object} response.Response{} "获取成功!"
+// @Router /autoCode/getSysHistory [post]
+func (a *AutoCodeHistoryApi) GetList(c *gin.Context) {
+	var search systemReq.SysAutoHistory
+	_ = c.ShouldBindJSON(&search)
+	list, total, err := autoCodeHistoryService.GetList(search.PageInfo)
+	if err != nil {
+		global.GVA_LOG.Error("获取失败!", zap.Error(err))
+		response.FailWithMessage("获取失败", c)
+		return
+	}
+	response.OkWithDetailed(response.PageResult{
+		List:     list,
+		Total:    total,
+		Page:     search.Page,
+		PageSize: search.PageSize,
+	}, "获取成功", c)
+}
--- a/server/api/v1/system/sys_initdb.go
+++ b/server/api/v1/system/sys_initdb.go
@@ -9,9 +9,9 @@ import (
 	"github.com/gin-gonic/gin"
 )

-type DBApi struct {
-}
+type DBApi struct{}

+// InitDB
 // @Tags InitDB
 // @Summary 初始化用户数据库
 // @Produce  application/json
@@ -38,6 +38,7 @@ func (i *DBApi) InitDB(c *gin.Context) {
 	response.OkWithData("自动创建数据库成功", c)
 }

+// CheckDB
 // @Tags CheckDB
 // @Summary 初始化用户数据库
 // @Produce  application/json