TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-11-04 08:20:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: 支持保存多个sql模板内容

Browse Source
This commit is contained in:
meilin.huang
2021-12-20 20:42:52 +08:00
parent 8d30d7103c
commit 423a33c9ff
7 changed files with 130 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

95
mayfly_go_web/src/views/ops/db/SqlExec.vue
View File

@@ -25,11 +25,28 @@
<el-aside id="sqlcontent" width="65%" style="background-color: rgb(238, 241, 246)">
<div class="toolbar">
<div class="fl">
<el-select
v-model="sqlName"
placeholder="选择or输入SQL模板名"
@change="changeSqlTemplate"
filterable
allow-create
default-first-option
size="mini"
class="mr5"
>
<el-option v-for="item in sqlNames" :key="item" :label="item.database" :value="item">
{{ item }}
</el-option>
</el-select>
<el-button v-waves @click="runSql" type="success" icon="el-icon-video-play" size="mini" plain>执行</el-button>
<el-button v-waves @click="formatSql" type="primary" icon="el-icon-magic-stick" size="mini" plain>格式化</el-button>
<el-button v-waves @click="saveSql" type="primary" icon="el-icon-document-add" size="mini" plain>保存</el-button>
<el-button v-waves @click="deleteSql" type="danger" icon="el-icon-delete" size="mini" plain>删除</el-button>
</div>
<div style="float: right" class="fl">
@@ -110,7 +127,7 @@ import 'codemirror/addon/hint/sql-hint.js';
import sqlFormatter from 'sql-formatter';
import { notNull, notEmpty } from '@/common/assert';
import { ElMessage } from 'element-plus';
import { ElMessage, ElMessageBox } from 'element-plus';
import ProjectEnvSelect from '../component/ProjectEnvSelect.vue';
import config from '@/common/config';
import { getSession } from '@/common/utils/storage';
@@ -133,6 +150,8 @@ export default defineComponent({
tableName: '',
tableMetadata: [],
columnMetadata: [],
sqlName: '',
sqlNames: [],
sql: '',
sqlTabs: {
tabs: [] as any,
@@ -302,9 +321,9 @@ export default defineComponent({
// 设置最小宽度
flexWidth = 80;
}
if (flexWidth > 350) {
if (flexWidth > 500) {
// 设置最大宽度
flexWidth = 350;
flexWidth = 500;
}
return flexWidth + 'px';
};
@@ -321,13 +340,6 @@ export default defineComponent({
return selectSql;
};
const saveSql = async () => {
notEmpty(state.sql, 'sql内容不能为空');
notNull(state.dbId, '请先选择数据库');
await dbApi.saveSql.request({ id: state.dbId, sql: state.sql, type: 1 });
ElMessage.success('保存成功');
};
/**
* 更改数据库事件
*/
@@ -353,13 +365,72 @@ export default defineComponent({
state.cmOptions.hintOptions.tables = res;
});
dbApi.getSql.request({ id, type: 1 }).then((res) => {
getSqlNames();
};
const changeSqlTemplate = () => {
getUserSql();
};
const getUserSql = () => {
notNull(state.dbId, '请先选择数据库');
dbApi.getSql.request({ id: state.dbId, type: 1, name: state.sqlName }).then((res) => {
if (res) {
state.sql = res.sql;
} else {
state.sql = '';
}
});
};
const getSqlNames = () => {
dbApi.getSqlNames
.request({
id: state.dbId,
})
.then((res) => {
if (res && res.length > 0) {
state.sqlNames = res.map((r: any) => r.name);
state.sqlName = state.sqlNames[0];
} else {
state.sqlNames = ['default'] as any;
state.sqlName = 'default';
}
getUserSql();
});
};
const saveSql = async () => {
notEmpty(state.sql, 'sql内容不能为空');
notNull(state.dbId, '请先选择数据库');
await dbApi.saveSql.request({ id: state.dbId, sql: state.sql, type: 1, name: state.sqlName });
ElMessage.success('保存成功');
dbApi.getSqlNames
.request({
id: state.dbId,
})
.then((res) => {
if (res) {
state.sqlNames = res.map((r: any) => r.name);
}
});
};
const deleteSql = async () => {
try {
await ElMessageBox.confirm(`确定删除【${state.sqlName}】该SQL模板?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
});
await dbApi.deleteDbSql.request({ id: state.dbId, name: state.sqlName });
ElMessage.success('删除成功');
getSqlNames();
} catch (err) {}
};
// 清空数据库事件
const clearDb = () => {
state.tableName = '';
@@ -427,6 +498,8 @@ export default defineComponent({
getUploadSqlFileUrl,
execSqlFileSuccess,
flexColumnWidth,
changeSqlTemplate,
deleteSql,
saveSql,
changeDb,
clearDb,

13
mayfly_go_web/src/views/ops/db/api.ts
View File

@@ -17,14 +17,7 @@ export const dbApi = {
saveSql: Api.create("/dbs/{id}/sql", 'post'),
// 获取保存的sql
getSql: Api.create("/dbs/{id}/sql", 'get'),
lsFile: Api.create("/devops/machines/files/{fileId}/ls", 'get'),
rmFile: Api.create("/devops/machines/files/{fileId}/rm", 'delete'),
uploadFile: Api.create("/devops/machines/files/upload", 'post'),
fileContent: Api.create("/devops/machines/files/{fileId}/cat", 'get'),
// 修改文件内容
updateFileContent: Api.create("/devops/machines/files/{id}", 'put'),
// 添加文件or目录
addConf: Api.create("/devops/machines/{machineId}/files", 'post'),
// 删除配置的文件or目录
delConf: Api.create("/devops/machines/files/{id}", 'delete'),
// 获取保存的sql names
getSqlNames: Api.create("/dbs/{id}/sql-names", 'get'),
deleteDbSql: Api.create("/dbs/{id}/sql", 'delete'),
}

31
server/devops/api/db.go
View File

@@ -49,7 +49,7 @@ func (d *Db) Save(rc *ctx.ReqCtx) {
}
func (d *Db) DeleteDb(rc *ctx.ReqCtx) {
d.DbApp.Delete(uint64(ginx.PathParamInt(rc.GinCtx, "id")))
d.DbApp.Delete(GetDbId(rc.GinCtx))
}
func (d *Db) TableInfos(rc *ctx.ReqCtx) {
@@ -202,7 +202,7 @@ func (d *Db) SaveSql(rc *ctx.ReqCtx) {
biz.ErrIsNil(err, "该数据库信息不存在")
// 获取用于是否有该dbsql的保存记录，有则更改，否则新增
dbSql := &entity.DbSql{Type: dbSqlForm.Type, DbId: dbId}
dbSql := &entity.DbSql{Type: dbSqlForm.Type, DbId: dbId, Name: dbSqlForm.Name}
dbSql.CreatorId = account.Id
e := model.GetBy(dbSql)
@@ -216,11 +216,34 @@ func (d *Db) SaveSql(rc *ctx.ReqCtx) {
}
}
// @router /api/db/:dbId/sql [get]
func (d *Db) GetSql(rc *ctx.ReqCtx) {
// 获取所有保存的sql names
func (d *Db) GetSqlNames(rc *ctx.ReqCtx) {
// 获取用于是否有该dbsql的保存记录，有则更改，否则新增
dbSql := &entity.DbSql{Type: 1, DbId: GetDbId(rc.GinCtx)}
dbSql.CreatorId = rc.LoginAccount.Id
var sqls []entity.DbSql
model.ListBy(dbSql, &sqls, "id", "name")
rc.ResData = sqls
}
// 删除保存的sql
func (d *Db) DeleteSql(rc *ctx.ReqCtx) {
dbSql := &entity.DbSql{Type: 1, DbId: GetDbId(rc.GinCtx)}
dbSql.CreatorId = rc.LoginAccount.Id
dbSql.Name = rc.GinCtx.Query("name")
model.DeleteByCondition(dbSql)
}
// @router /api/db/:dbId/sql [get]
func (d *Db) GetSql(rc *ctx.ReqCtx) {
// 根据创建者id， 数据库id，以及sql模板名称查询保存的sql信息
dbSql := &entity.DbSql{Type: 1, DbId: GetDbId(rc.GinCtx)}
dbSql.CreatorId = rc.LoginAccount.Id
dbSql.Name = rc.GinCtx.Query("name")
e := model.GetBy(dbSql)
if e != nil {
return

1
server/devops/api/form/form.go
View File

@@ -38,6 +38,7 @@ type MachineScriptForm struct {
}
type DbSqlSaveForm struct {
Name string
Sql string `binding:"required"`
Type int `binding:"required"`
}

3
server/devops/domain/entity/db_sql.go
View File

@@ -7,7 +7,8 @@ import (
type DbSql struct {
model.Model `orm:"-"`
DbId uint64 `json:"db_id"`
DbId uint64 `json:"dbId"`
Type int `json:"type"` // 类型
Sql string `json:"sql"`
Name string `json:"name"`
}

13
server/devops/router/db.go
View File

@@ -29,7 +29,7 @@ func InitDbRouter(router *gin.RouterGroup) {
})
deleteDb := ctx.NewLogInfo("删除数据库信息")
db.DELETE(":id", func(c *gin.Context) {
db.DELETE(":dbId", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).
WithLog(deleteDb).
Handle(d.DeleteDb)
@@ -65,10 +65,13 @@ func InitDbRouter(router *gin.RouterGroup) {
db.GET(":dbId/c-metadata", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).Handle(d.ColumnMA)
})
db.GET(":dbId/hint-tables", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).Handle(d.HintTables)
})
/** db sql相关接口 */
db.POST(":dbId/sql", func(c *gin.Context) {
rc := ctx.NewReqCtxWithGin(c)
rc.Handle(d.SaveSql)
@@ -77,5 +80,13 @@ func InitDbRouter(router *gin.RouterGroup) {
db.GET(":dbId/sql", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).Handle(d.GetSql)
})
db.DELETE(":dbId/sql", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).Handle(d.DeleteSql)
})
db.GET(":dbId/sql-names", func(c *gin.Context) {
ctx.NewReqCtxWithGin(c).Handle(d.GetSqlNames)
})
}
}

1
server/mayfly-go.sql
View File

@@ -58,6 +58,7 @@ DROP TABLE IF EXISTS `t_db_sql`;
CREATE TABLE `t_db_sql` (
`id` bigint(20) NOT NULL AUTO_INCREMENT,
`db_id` bigint(20) NOT NULL COMMENT '数据库id',
`name` varchar(60) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'sql模板名',
`sql` text COLLATE utf8mb4_bin,
`type` tinyint(8) NOT NULL,
`creator_id` bigint(20) NOT NULL,