open
/
open-dbtool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

文案修改

Browse Source
master
wangbing 4 years ago
parent 326899bd64
commit ad568f9b86
14 changed files with 172 additions and 92 deletions
Show Stats Download Patch File Download Diff File

12
src/main/resources/modules/SpringBoot/java/module/wsys/ent/Profiles.java
Unescape View File

@ -16,21 +16,21 @@ import ${domain}.frame.excel.annotation.ExcelSheet;
public class Profiles extends BaseEntity {
/**
* ACTIVE - 环境
* ACTIVE - 配置环境
*/
@ExcelProperty("环境")
@ExcelProperty("配置环境")
@ExcelNote("")
private String active;
/**
* KEY - 配置键
* KEY - 配置项名
*/
@ExcelProperty("配置键")
@ExcelProperty("配置项名")
@ExcelNote("")
private String key;
/**
* VALUE - 配置值
* VALUE - 配置项值
*/
@ExcelProperty("配置值")
@ExcelProperty("配置项值")
@ExcelNote("")
private String value;

4
src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java
Unescape View File

@ -53,7 +53,7 @@ public class ProfilesManagerImpl implements ${domain}.module.wsys.mgr.ProfilesMa
return response;
}
{// 配置键唯一检查
{// 配置项名唯一检查
ProfilesFindRequest profilesFindRequest = new ProfilesFindRequest();
profilesFindRequest.setKey(request.getKey());
ProfilesFindResponse profilesFindResponse = this.find(profilesFindRequest, token);
@ -61,7 +61,7 @@ public class ProfilesManagerImpl implements ${domain}.module.wsys.mgr.ProfilesMa
response.addErrors(profilesFindResponse.getErrors());
return response;
} else if (profilesFindResponse.getTotalCount() > 0) {
response.addError(ErrorType.UNIQUENESS_ERROR, "[key]配置键已存在，请检查!");
response.addError(ErrorType.UNIQUENESS_ERROR, "[key]配置项名已存在，请检查!");
return response;
}
}

16
src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesCreateRequest.java
Unescape View File

@ -17,24 +17,24 @@ import javax.validation.constraints.NotNull;
public class ProfilesCreateRequest extends BaseRequest {
/**
* 环境.
* 配置环境.
*/
@NotNull(message = "[active]环境不能为NULL")
@NotNull(message = "[active]配置环境不能为NULL")
@Select({"dev", "prod"})
private String active;
/**
* 配置键.
* 配置项名.
*/
@NotBlank(message = "[key]配置键不能为空")
@Length(min = 0, max = 50, message = "[key]配置键长度不合法(0-50)")
@NotBlank(message = "[key]配置项名不能为空")
@Length(min = 0, max = 50, message = "[key]配置项名长度不合法(0-50)")
private String key;
/**
* 配置值.
* 配置项值.
*/
@NotBlank(message = "[value]配置值不能为空")
@Length(min = 0, max = 50, message = "[value]配置值长度不合法(0-50)")
@NotBlank(message = "[value]配置项值不能为空")
@Length(min = 0, max = 50, message = "[value]配置项值长度不合法(0-50)")
private String value;
public String getActive() {

4
src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesFindRequest.java
Unescape View File

@ -15,13 +15,13 @@ import java.util.Date;
public class ProfilesFindRequest extends BaseFindRequest {
/**
* 环境.
* 配置环境.
*/
@Select({"dev", "prod"})
private String active;
/**
* 配置键.
* 配置项名.
*/
private String key;

16
src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesUpdateRequest.java
Unescape View File

@ -23,24 +23,24 @@ public class ProfilesUpdateRequest extends BaseUpdateRequest {
private Long id;
/**
* 环境.
* 配置环境.
*/
@NotNull(message = "[active]环境不能为NULL")
@NotNull(message = "[active]配置环境不能为NULL")
@Select({"dev", "prod"})
private String active;
/**
* 配置键.
* 配置项名.
*/
@NotBlank(message = "[key]配置键不能为空")
@Length(min = 0, max = 50, message = "[key]配置键长度不合法(0-50)")
@NotBlank(message = "[key]配置项名不能为空")
@Length(min = 0, max = 50, message = "[key]配置项名长度不合法(0-50)")
private String key;
/**
* 配置值.
* 配置项值.
*/
@NotBlank(message = "[value]配置值不能为空")
@Length(min = 0, max = 50, message = "[value]配置值长度不合法(0-50)")
@NotBlank(message = "[value]配置项值不能为空")
@Length(min = 0, max = 50, message = "[value]配置项值长度不合法(0-50)")
private String value;
public Long getId() {

6
src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml
Unescape View File

@ -51,12 +51,12 @@
</table>
<table ajax="true" api="false" create="true" delete="true" find="true" get="false" html="true" methods="[]" msvr="false" pageAdd="true" pageExp="true" pageImp="true" search="false" sys="true" tableComment="系统配置" tableName="PROFILES" update="true">
<field defaultValue="" fieldComment="主键" fieldLength="0" fieldName="ID" fieldType="Long" isLike="false" isMust="true" isPrimaryKey="true" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
<field defaultValue="NULL" fieldComment="环境" fieldLength="20" fieldName="ACTIVE" fieldType="Select" isLike="false" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false">
<field defaultValue="NULL" fieldComment="配置环境" fieldLength="20" fieldName="ACTIVE" fieldType="Select" isLike="false" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="false">
<selectItem label="开发环境" value="dev"/>
<selectItem label="生产环境" value="prod"/>
</field>
<field defaultValue="NULL" fieldComment="配置键" fieldLength="50" fieldName="KEY" fieldType="String_var50" isLike="false" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="true"/>
<field defaultValue="NULL" fieldComment="配置值" fieldLength="50" fieldName="VALUE" fieldType="String_var50" isLike="false" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
<field defaultValue="NULL" fieldComment="配置项名" fieldLength="50" fieldName="KEY" fieldType="String_var50" isLike="false" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false" isSystem="false" isUnique="true"/>
<field defaultValue="NULL" fieldComment="配置项值" fieldLength="50" fieldName="VALUE" fieldType="String_var50" isLike="false" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="false" isUnique="false"/>
<field defaultValue="" fieldComment="行版本" fieldLength="0" fieldName="ROW_VERSION" fieldType="Long" isLike="false" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
<field defaultValue="0" fieldComment="是否已删除" fieldLength="0" fieldName="IS_DELETED" fieldType="Boolean" isLike="false" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>
<field defaultValue="" fieldComment="创建用户" fieldLength="0" fieldName="CREATE_BY" fieldType="Long" isLike="false" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false" isSystem="true" isUnique="false"/>

6
src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql
Unescape View File

@ -346,9 +346,9 @@ PRIMARY KEY (`ID`)
-- ----------------------------
CREATE TABLE `SYS_PROFILES` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
`ACTIVE` VARCHAR(20) NOT NULL COMMENT '环境',
`KEY` VARCHAR(50) NOT NULL COMMENT '配置键',
`VALUE` VARCHAR(50) NOT NULL COMMENT '配置值',
`ACTIVE` VARCHAR(20) NOT NULL COMMENT '配置环境',
`KEY` VARCHAR(50) NOT NULL COMMENT '配置项名',
`VALUE` VARCHAR(50) NOT NULL COMMENT '配置项值',
`ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
`IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除',
`CREATE_BY` BIGINT(20) NOT NULL COMMENT '创建用户',

6
src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_PROFILES.sql
Unescape View File

@ -6,9 +6,9 @@
-- ----------------------------
CREATE TABLE `SYS_PROFILES` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
`ACTIVE` VARCHAR(20) NOT NULL COMMENT '环境',
`KEY` VARCHAR(50) NOT NULL COMMENT '配置键',
`VALUE` VARCHAR(50) NOT NULL COMMENT '配置值',
`ACTIVE` VARCHAR(20) NOT NULL COMMENT '配置环境',
`KEY` VARCHAR(50) NOT NULL COMMENT '配置项名',
`VALUE` VARCHAR(50) NOT NULL COMMENT '配置项值',
`ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
`IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除',
`CREATE_BY` BIGINT(20) NOT NULL COMMENT '创建用户',

6
src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql
Unescape View File

@ -550,9 +550,9 @@ CREATE TABLE "SYS_PROFILES" (
);
COMMENT ON TABLE "SYS_PROFILES" is '系统配置';
COMMENT ON COLUMN "SYS_PROFILES"."ID" is '主键';
COMMENT ON COLUMN "SYS_PROFILES"."ACTIVE" is '环境';
COMMENT ON COLUMN "SYS_PROFILES"."KEY" is '配置键';
COMMENT ON COLUMN "SYS_PROFILES"."VALUE" is '配置值';
COMMENT ON COLUMN "SYS_PROFILES"."ACTIVE" is '配置环境';
COMMENT ON COLUMN "SYS_PROFILES"."KEY" is '配置项名';
COMMENT ON COLUMN "SYS_PROFILES"."VALUE" is '配置项值';
COMMENT ON COLUMN "SYS_PROFILES"."ROW_VERSION" is '行版本';
COMMENT ON COLUMN "SYS_PROFILES"."IS_DELETED" is '是否已删除';
COMMENT ON COLUMN "SYS_PROFILES"."CREATE_BY" is '创建用户';

6
src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_PROFILES.sql
Unescape View File

@ -19,9 +19,9 @@ CREATE TABLE "SYS_PROFILES" (
COMMENT ON TABLE "SYS_PROFILES" is '系统配置';
COMMENT ON COLUMN "SYS_PROFILES"."ID" is '主键';
COMMENT ON COLUMN "SYS_PROFILES"."ACTIVE" is '环境';
COMMENT ON COLUMN "SYS_PROFILES"."KEY" is '配置键';
COMMENT ON COLUMN "SYS_PROFILES"."VALUE" is '配置值';
COMMENT ON COLUMN "SYS_PROFILES"."ACTIVE" is '配置环境';
COMMENT ON COLUMN "SYS_PROFILES"."KEY" is '配置项名';
COMMENT ON COLUMN "SYS_PROFILES"."VALUE" is '配置项值';
COMMENT ON COLUMN "SYS_PROFILES"."ROW_VERSION" is '行版本';
COMMENT ON COLUMN "SYS_PROFILES"."IS_DELETED" is '是否已删除';
COMMENT ON COLUMN "SYS_PROFILES"."CREATE_BY" is '创建用户';

64
src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/dept.ftl
Unescape View File

@ -218,16 +218,33 @@
@opened="onTreeOpened"
size="600px">
<el-page-header slot="title" @back="treeShow = false" content="资源树状展示"></el-page-header>
<el-page-header slot="title" @back="treeShow = false" content="结构展示"></el-page-header>
<el-container style="height:100%">
<el-header>
<el-input
size="mini"
placeholder="输入资源名称、资源代码或资源值"
prefix-icon="el-icon-search"
v-model="treeFilter">
</el-input>
<el-row>
<el-col :span="12">
<el-input
clearable
size="mini"
v-model="treeFilter"
prefix-icon="el-icon-search"
placeholder="输入过滤关键字"/>
</el-col>
<el-col :span="11" offset="1">
<el-button-group>
<el-tooltip effect="dark" content="过滤树" placement="bottom">
<el-button size="mini" type="primary" icon="el-icon-search" @click="$refs.tree.filter(treeFilter)">过滤</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="批量删除" placement="bottom">
<el-button size="mini" type="primary" icon="el-icon-delete" @click="onTreeDelete">删除</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="刷新" placement="bottom">
<el-button size="mini" type="primary" icon="el-icon-refresh" @click="onTreeLoad">刷新</el-button>
</el-tooltip>
</el-button-group>
</el-col>
</el-row>
</el-header>
<el-main style="height:100%;padding: 0 20px 20px 20px;">
@ -237,6 +254,8 @@
ref="tree"
accordion
show-checkbox
check-strictly="true"
default-expand-all="true"
:filter-node-method="onTreeFilter"
:expand-on-click-node="false">
<div class="tree" slot-scope="{ node, data }">
@ -363,6 +382,32 @@
this.form.deptAlias = "";
this.form.valid = true;
},
onTreeDelete: function () {
var select = this.$refs.tree.getCheckedNodes();
this.$confirm('将删除已选择的项, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function () {
nav.tipShow("删除中...");
select.forAsync(function (item, next) {
new Ajax("wsys", "dept").delete({id: item.id}, function (response) {
if (response.errors.length > 0) {
nav.e(response.errors[0].message);
} else {
this.result.remove(item)
}
next();
}.bind(this))
}.bind(this), function () {
nav.tipClose();
nav.i("批量删除结束.")
this.onTreeLoad();
}.bind(this))
}.bind(this)).catch(function (action) {
});
},
onTreeEdit: function (item) {
this.form.formTitle = "部门编辑";
this.form.formShow = true;
@ -390,11 +435,6 @@
this.onTreeLoad();
}
},
watch: {
treeFilter: function (val) {
this.$refs.tree.filter(val);
}
},
mounted: function () {
this.onFind();
}

36
src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl
Unescape View File

@ -1,14 +1,14 @@
<div id="app" v-cloak>
<el-card class="box-card">
<el-form class="search" :inline="true" :model="vm" ref="vm" label-position="right" label-width="90px">
<el-form-item label="环境" prop="active">
<el-select v-model="vm.active" clearable size="mini" filterable placeholder="请输入环境">
<el-form-item label="配置环境" prop="active">
<el-select v-model="vm.active" clearable size="mini" filterable placeholder="请输入配置环境">
<el-option key="dev" label="开发环境" value="dev"></el-option>
<el-option key="prod" label="生产环境" value="prod"></el-option>
</el-select>
</el-form-item>
<el-form-item label="配置键" prop="key">
<el-input v-model="vm.key" clearable size="mini" placeholder="请输入配置键"></el-input>
<el-form-item label="配置项名" prop="key">
<el-input v-model="vm.key" clearable size="mini" placeholder="请输入配置项名"></el-input>
</el-form-item>
<el-form-item label="开始日期" prop="startDate">
<el-date-picker v-model="vm.startDate" clearable size="mini" placeholder="请输入开始日期" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
@ -84,19 +84,19 @@
align="center"
min-width="100"
prop="active"
label="环境">
label="配置环境">
</el-table-column>
<el-table-column
align="center"
min-width="180"
prop="key"
label="配置键">
label="配置项名">
</el-table-column>
<el-table-column
align="center"
min-width="180"
prop="value"
label="配置值">
label="配置项值">
</el-table-column>
<el-table-column
align="center"
@ -147,17 +147,17 @@
<el-page-header slot="title" @back="form.formShow = false" :content="form.formTitle"></el-page-header>
<el-form class="form" :model="form" :inline="true" :rules="formRules" ref="form" label-position="right" label-width="90px">
<el-form-item label="环境" prop="active">
<el-select v-model="form.active" clearable size="mini" filterable placeholder="请输入环境">
<el-form-item label="配置环境" prop="active">
<el-select v-model="form.active" clearable size="mini" filterable placeholder="请输入配置环境">
<el-option key="dev" label="开发环境" value="dev"></el-option>
<el-option key="prod" label="生产环境" value="prod"></el-option>
</el-select>
</el-form-item>
<el-form-item label="配置键" prop="key">
<el-input v-model="form.key" clearable size="mini" placeholder="请输入配置键" maxlength="50"></el-input>
<el-form-item label="配置项名" prop="key">
<el-input v-model="form.key" clearable size="mini" placeholder="请输入配置项名" maxlength="50"></el-input>
</el-form-item>
<el-form-item label="配置值" prop="value">
<el-input v-model="form.value" clearable size="mini" placeholder="请输入配置值" maxlength="50"></el-input>
<el-form-item label="配置项值" prop="value">
<el-input v-model="form.value" clearable size="mini" placeholder="请输入配置项值" maxlength="50"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@ -195,15 +195,15 @@
},
formRules: {
active: [
{required: true, message: '环境不能为空', trigger: 'blur'},
{required: true, message: '配置环境不能为空', trigger: 'blur'},
],
key: [
{required: true, message: '配置键不能为空', trigger: 'blur'},
{min: 1, max: 50, message: '配置键长度在 1 到 50 个字符', trigger: 'blur'}
{required: true, message: '配置项名不能为空', trigger: 'blur'},
{min: 1, max: 50, message: '配置项名长度在 1 到 50 个字符', trigger: 'blur'}
],
value: [
{required: true, message: '配置值不能为空', trigger: 'blur'},
{min: 1, max: 50, message: '配置值长度在 1 到 50 个字符', trigger: 'blur'}
{required: true, message: '配置项值不能为空', trigger: 'blur'},
{min: 1, max: 50, message: '配置项值长度在 1 到 50 个字符', trigger: 'blur'}
],
}
},

64
src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/res.ftl
Unescape View File

@ -236,16 +236,33 @@
@opened="onTreeOpened"
size="600px">
<el-page-header slot="title" @back="treeShow = false" content="资源树状展示"></el-page-header>
<el-page-header slot="title" @back="treeShow = false" content="结构展示"></el-page-header>
<el-container style="height:100%">
<el-header>
<el-input
size="mini"
placeholder="输入资源名称、资源代码或资源值"
prefix-icon="el-icon-search"
v-model="treeFilter">
</el-input>
<el-row>
<el-col :span="12">
<el-input
clearable
size="mini"
v-model="treeFilter"
prefix-icon="el-icon-search"
placeholder="输入过滤关键字"/>
</el-col>
<el-col :span="11" offset="1">
<el-button-group>
<el-tooltip effect="dark" content="过滤树" placement="bottom">
<el-button size="mini" type="primary" icon="el-icon-search" @click="$refs.tree.filter(treeFilter)">过滤</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="批量删除" placement="bottom">
<el-button size="mini" type="primary" icon="el-icon-delete" @click="onTreeDelete">删除</el-button>
</el-tooltip>
<el-tooltip effect="dark" content="刷新" placement="bottom">
<el-button size="mini" type="primary" icon="el-icon-refresh" @click="onTreeLoad">刷新</el-button>
</el-tooltip>
</el-button-group>
</el-col>
</el-row>
</el-header>
<el-main style="height:100%;padding: 0 20px 20px 20px;">
@ -255,6 +272,8 @@
ref="tree"
accordion
show-checkbox
check-strictly="true"
default-expand-all="true"
:filter-node-method="onTreeFilter"
:expand-on-click-node="false">
<div class="tree" slot-scope="{ node, data }">
@ -396,6 +415,32 @@
this.form.free = false;
this.form.valid = true;
},
onTreeDelete: function () {
var select = this.$refs.tree.getCheckedNodes();
this.$confirm('将删除已选择的项, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(function () {
nav.tipShow("删除中...");
select.forAsync(function (item, next) {
new Ajax("wsys", "res").delete({id: item.id}, function (response) {
if (response.errors.length > 0) {
nav.e(response.errors[0].message);
} else {
this.result.remove(item)
}
next();
}.bind(this))
}.bind(this), function () {
nav.tipClose();
nav.i("批量删除结束.")
this.onTreeLoad();
}.bind(this))
}.bind(this)).catch(function (action) {
});
},
onTreeEdit: function (pItem) {
this.form.formTitle = "资源编辑";
this.form.formShow = true;
@ -429,11 +474,6 @@
this.onTreeLoad();
}
},
watch: {
treeFilter: function (val) {
this.$refs.tree.filter(val);
}
},
mounted: function () {
this.onFind();
}

18
src/main/resources/modules/SpringBoot/test/wsys/ProfilesTest.java
Unescape View File

@ -41,8 +41,8 @@ public class ProfilesTest {
public void testCreate() {
ProfilesCreateRequest request = new ProfilesCreateRequest();
request.setActive("value");
request.setKey("配置键");
request.setValue("配置值");
request.setKey("配置项名");
request.setValue("配置项值");
ProfilesCreateResponse response = profilesManager.create(request,token);
@ -55,8 +55,8 @@ public class ProfilesTest {
//创建数据
ProfilesCreateRequest createRequest = new ProfilesCreateRequest();
createRequest.setActive("value");
createRequest.setKey("配置键");
createRequest.setValue("配置值");
createRequest.setKey("配置项名");
createRequest.setValue("配置项值");
ProfilesCreateResponse createResponse = profilesManager.create(createRequest,token);
@ -75,8 +75,8 @@ public class ProfilesTest {
//创建数据
ProfilesCreateRequest createRequest = new ProfilesCreateRequest();
createRequest.setActive("value");
createRequest.setKey("配置键");
createRequest.setValue("配置值");
createRequest.setKey("配置项名");
createRequest.setValue("配置项值");
ProfilesCreateResponse createResponse = profilesManager.create(createRequest, token);
@ -86,8 +86,8 @@ public class ProfilesTest {
ProfilesUpdateRequest request = new ProfilesUpdateRequest();
request.setId(createResponse.getId());
request.setActive("value");
request.setKey("配置键");
request.setValue("配置值");
request.setKey("配置项名");
request.setValue("配置项值");
ProfilesUpdateResponse response = profilesManager.update(request,token);
@ -98,7 +98,7 @@ public class ProfilesTest {
public void testFind() {
ProfilesFindRequest request = new ProfilesFindRequest();
request.setActive("value");
request.setKey("配置键");
request.setKey("配置项名");
ProfilesFindResponse response = profilesManager.find(request,token);

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.