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

1、优化

Browse Source 
Former-commit-id: b7fc15f3bbe5b14c0c68b9a39fb344358031611b
master
王兵 5 years ago
parent ad6d24757f
commit c33542cd5c
9 changed files with 138 additions and 18 deletions
Show Stats Download Patch File Download Diff File

17
src/main/resources/modules/SpringBoot/java/module/system/ent/Res.java
Unescape View File

@ -1,6 +1,7 @@
package ${basePackage}.module.system.ent;
import ${basePackage}.frame.excel.annotation.ColumnDescription;
import ${basePackage}.frame.excel.annotation.ColumnList;
import ${basePackage}.frame.excel.annotation.ColumnName;
import ${basePackage}.frame.excel.annotation.SheetName;
import ${basePackage}.frame.base.BaseEntity;
@ -51,11 +52,19 @@ public class Res extends BaseEntity {
@ColumnName("上级名称")
@ColumnDescription("")
private String supName;
/**
* FREE - 是否免费
*/
@ColumnName("是否免费")
@ColumnDescription("")
@ColumnList({"是","否"})
private Boolean free;
/**
* VALID - 是否有效
*/
@ColumnName("是否有效")
@ColumnDescription("")
@ColumnList({"是","否"})
private Boolean valid;
public String getResCode() {
@ -106,6 +115,14 @@ public class Res extends BaseEntity {
this.supName = supName;
}
public Boolean getFree() {
return this.free;
}
public void setFree(Boolean free) {
this.free = free;
}
public Boolean getValid() {
return this.valid;
}

9
src/main/resources/modules/SpringBoot/java/module/system/mpr/MySQL_ResMapper.xml
Unescape View File

@ -10,7 +10,7 @@
<sql id="table">`SYS_RES`</sql>
<sql id="entityColumnList">
`ID`,`RES_CODE`,`RES_NAME`,`RES_TYPE`,`RES_VALUE`,`SUP_CODE`,`SUP_NAME`,`VALID`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME`
`ID`,`RES_CODE`,`RES_NAME`,`RES_TYPE`,`RES_VALUE`,`SUP_CODE`,`SUP_NAME`,`FREE`,`VALID`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME`
</sql>
<resultMap id="res" type="${basePackage}.module.system.ent.Res">
@ -21,6 +21,7 @@
<result column="RES_VALUE" jdbcType="VARCHAR" property="resValue"/>
<result column="SUP_CODE" jdbcType="VARCHAR" property="supCode"/>
<result column="SUP_NAME" jdbcType="VARCHAR" property="supName"/>
<result column="FREE" jdbcType="BIT" property="free"/>
<result column="VALID" jdbcType="BIT" property="valid"/>
<result column="ROW_VERSION" jdbcType="BIGINT" property="rowVersion"/>
<result column="IS_DELETED" jdbcType="BIT" property="isDeleted"/>
@ -55,6 +56,9 @@
<if test="request.supName != null and request.supName != ''">
AND `SUP_NAME` = ${r'#'}{request.supName}
</if>
<if test="request.free != null">
AND `FREE` = ${r'#'}{request.free}
</if>
<if test="request.valid != null">
AND `VALID` = ${r'#'}{request.valid}
</if>
@ -105,6 +109,7 @@
${r'#'}{request.resValue,jdbcType=VARCHAR},
${r'#'}{request.supCode,jdbcType=VARCHAR},
${r'#'}{request.supName,jdbcType=VARCHAR},
${r'#'}{request.free,jdbcType=BIT},
${r'#'}{request.valid,jdbcType=BIT},
0,
0,
@ -131,6 +136,7 @@
${r'#'}{item.resValue,jdbcType=VARCHAR},
${r'#'}{item.supCode,jdbcType=VARCHAR},
${r'#'}{item.supName,jdbcType=VARCHAR},
${r'#'}{item.free,jdbcType=BIT},
${r'#'}{item.valid,jdbcType=BIT},
0,
0,
@ -160,6 +166,7 @@
`RES_VALUE` = ${r'#'}{request.resValue,jdbcType=VARCHAR},
`SUP_CODE` = ${r'#'}{request.supCode,jdbcType=VARCHAR},
`SUP_NAME` = ${r'#'}{request.supName,jdbcType=VARCHAR},
`FREE` = ${r'#'}{request.free,jdbcType=BIT},
`VALID` = ${r'#'}{request.valid,jdbcType=BIT},
`ROW_VERSION` = `ROW_VERSION` + 1,
`LAST_UPDATE_BY` = ${r'#'}{token.userId},

13
src/main/resources/modules/SpringBoot/java/module/system/req/ResCreateRequest.java
Unescape View File

@ -42,6 +42,11 @@ public class ResCreateRequest extends BaseRequest {
@Length(min = 0, max = 255, message = "[resValue]资源内容长度不合法(0-255)")
private String resValue;
/**
* 是否免费
*/
private Boolean free;
/**
* 是否有效
*/
@ -80,6 +85,14 @@ public class ResCreateRequest extends BaseRequest {
this.resValue = resValue;
}
public Boolean getFree() {
return this.free;
}
public void setFree(Boolean free) {
this.free = free;
}
public Boolean getValid() {
return this.valid;
}

13
src/main/resources/modules/SpringBoot/java/module/system/req/ResFindRequest.java
Unescape View File

@ -43,6 +43,11 @@ public class ResFindRequest extends BaseFindRequest {
*/
private String supName;
/**
* 是否免费
*/
private Boolean free;
/**
* 是否有效
*/
@ -106,6 +111,14 @@ public class ResFindRequest extends BaseFindRequest {
this.supName = supName;
}
public Boolean getFree() {
return this.free;
}
public void setFree(Boolean free) {
this.free = free;
}
public Boolean getValid() {
return this.valid;
}

14
src/main/resources/modules/SpringBoot/java/module/system/req/ResUpdateRequest.java
Unescape View File

@ -60,6 +60,11 @@ public class ResUpdateRequest extends BaseUpdateRequest {
@Length(min = 0, max = 50, message = "[supName]上级名称长度不合法(0-50)")
private String supName;
/**
* 是否免费
*/
private Boolean free;
/**
* 是否有效
*/
@ -122,6 +127,14 @@ public class ResUpdateRequest extends BaseUpdateRequest {
this.supName = supName;
}
public Boolean getFree() {
return this.free;
}
public void setFree(Boolean free) {
this.free = free;
}
public Boolean getValid() {
return this.valid;
}
@ -130,4 +143,3 @@ public class ResUpdateRequest extends BaseUpdateRequest {
this.valid = valid;
}
}

45
src/main/resources/modules/SpringBoot/resources/dbtool/system/MySQL_ALL_TABLE.sql
Unescape View File

@ -2,7 +2,7 @@
-- Table structure for DICT - 字典
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-01-08
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_DICT` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
@ -23,7 +23,7 @@ PRIMARY KEY (`ID`)
-- Table structure for DICT_ITEM - 字典项
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-01-08
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_DICT_ITEM` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
@ -45,7 +45,7 @@ PRIMARY KEY (`ID`)
-- Table structure for RES - 资源
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-01-08
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_RES` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
@ -55,6 +55,7 @@ CREATE TABLE `SYS_RES` (
`RES_VALUE` VARCHAR(250) COMMENT '资源内容',
`SUP_CODE` VARCHAR(50) COMMENT '上级代码',
`SUP_NAME` VARCHAR(50) COMMENT '上级名称',
`FREE` TINYINT(1) COMMENT '是否免费',
`VALID` TINYINT(1) NOT NULL COMMENT '是否有效',
`ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
`IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除',
@ -69,7 +70,7 @@ PRIMARY KEY (`ID`)
-- Table structure for USER - 用户
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-01-08
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_USER` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
@ -94,7 +95,7 @@ PRIMARY KEY (`ID`)
-- Table structure for DEPT - 部门
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-01-08
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_DEPT` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
@ -117,7 +118,7 @@ PRIMARY KEY (`ID`)
-- Table structure for ROLE - 角色
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-01-08
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_ROLE` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
@ -137,7 +138,7 @@ PRIMARY KEY (`ID`)
-- Table structure for TOKENS - 通行证
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-01-08
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_TOKENS` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
@ -166,7 +167,7 @@ PRIMARY KEY (`ID`)
-- Table structure for FILE - 文件
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-01-08
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_FILE` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
@ -190,7 +191,7 @@ PRIMARY KEY (`ID`)
-- Table structure for USER_ROLE - 用户角色授权
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-01-08
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_USER_ROLE` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
@ -211,7 +212,7 @@ PRIMARY KEY (`ID`)
-- Table structure for ROLE_RES - 角色资源关系
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-01-08
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_ROLE_RES` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
@ -228,3 +229,27 @@ CREATE TABLE `SYS_ROLE_RES` (
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='角色资源关系';
-- ----------------------------
-- Table structure for LOG_ERR - 错误日志
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_LOG_ERR` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
`LOG_ERR_TYPE` VARCHAR(20) COMMENT '错误类型',
`TITLE` VARCHAR(50) NOT NULL COMMENT '错误标题',
`CONTENT` TEXT COMMENT '错误内容',
`LOG_ERR_RESULT` VARCHAR(20) NOT NULL COMMENT '处理结果',
`ATTRIBUTE1` VARCHAR(50) COMMENT '属性1',
`ATTRIBUTE2` VARCHAR(50) COMMENT '属性2',
`ATTRIBUTE3` VARCHAR(50) COMMENT '属性3',
`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 '创建用户',
`CREATE_TIME` DATETIME NOT NULL COMMENT '创建时间',
`LAST_UPDATE_BY` BIGINT(20) DEFAULT NULL COMMENT '最后更新用户',
`LAST_UPDATE_TIME` DATETIME DEFAULT NULL COMMENT '最后更新时间',
PRIMARY KEY (`ID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='错误日志';

3
src/main/resources/modules/SpringBoot/resources/dbtool/system/MySQL_RES.sql
Unescape View File

@ -2,7 +2,7 @@
-- Table structure for RES - 资源
-- Target : MySQL
-- Author : wangbing
-- Date: : 2020-01-05
-- Date: : 2020-05-15
-- ----------------------------
CREATE TABLE `SYS_RES` (
`ID` BIGINT(20) NOT NULL COMMENT '主键',
@ -12,6 +12,7 @@ CREATE TABLE `SYS_RES` (
`RES_VALUE` VARCHAR(250) COMMENT '资源内容',
`SUP_CODE` VARCHAR(50) COMMENT '上级代码',
`SUP_NAME` VARCHAR(50) COMMENT '上级名称',
`FREE` TINYINT(1) COMMENT '是否免费',
`VALID` TINYINT(1) NOT NULL COMMENT '是否有效',
`ROW_VERSION` BIGINT(20) NOT NULL DEFAULT 0 COMMENT '行版本',
`IS_DELETED` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否已删除',

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

@ -3,14 +3,18 @@
<projectName>wadmin</projectName>
<projectBasePackage>xyz.wbsite</projectBasePackage>
<projectAuthor>wangbing</projectAuthor>
<multiDB>false</multiDB>
<sysMD>false</sysMD>
<needMoreDB>false</needMoreDB>
<needEMail>false</needEMail>
<needSys>false</needSys>
<needCloud>false</needCloud>
<needAsync>false</needAsync>
<database>MySQL</database>
<modules>
<module>
<moduleComment>系统</moduleComment>
<modulePrefix>SYS_</modulePrefix>
<moduleName>system</moduleName>
<hasSysFields>true</hasSysFields>
<hasSysFields/>
<tables>
<table create="true" delete="true" find="true" get="true" html="true" search="false" sys="true" tableComment="字典" tableName="DICT" update="true">
<fields>
@ -52,12 +56,13 @@
<field IsSystem="false" defaultValue="NULL" fieldComment="资源内容" fieldLength="255" fieldName="RES_VALUE" fieldType="String_var255" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false"/>
<field IsSystem="false" defaultValue="NULL" fieldComment="上级代码" fieldLength="50" fieldName="SUP_CODE" fieldType="String_var50" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false"/>
<field IsSystem="false" defaultValue="NULL" fieldComment="上级名称" fieldLength="50" fieldName="SUP_NAME" fieldType="String_var50" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false"/>
<field IsSystem="false" defaultValue="NULL" fieldComment="是否免费" fieldLength="0" fieldName="FREE" fieldType="Boolean" isMust="false" isPrimaryKey="false" isQuery="true" isSearch="false"/>
<field IsSystem="false" defaultValue="NULL" fieldComment="是否有效" fieldLength="0" fieldName="VALID" fieldType="Boolean" isMust="true" isPrimaryKey="false" isQuery="true" isSearch="false"/>
<field IsSystem="true" defaultValue="" fieldComment="行版本" fieldLength="0" fieldName="ROW_VERSION" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false"/>
<field IsSystem="true" defaultValue="0" fieldComment="是否已删除" fieldLength="0" fieldName="IS_DELETED" fieldType="Boolean" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false"/>
<field IsSystem="true" defaultValue="" fieldComment="创建用户" fieldLength="0" fieldName="CREATE_BY" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false"/>
<field IsSystem="true" defaultValue="" fieldComment="创建用户" fieldLength="19" fieldName="CREATE_BY" fieldType="Long" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false"/>
<field IsSystem="true" defaultValue="NULL" fieldComment="创建时间" fieldLength="0" fieldName="CREATE_TIME" fieldType="Date" isMust="true" isPrimaryKey="false" isQuery="false" isSearch="false"/>
<field IsSystem="true" defaultValue="" fieldComment="最后更新用户" fieldLength="0" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false"/>
<field IsSystem="true" defaultValue="" fieldComment="最后更新用户" fieldLength="19" fieldName="LAST_UPDATE_BY" fieldType="Long" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false"/>
<field IsSystem="true" defaultValue="" fieldComment="最后更新时间" fieldLength="0" fieldName="LAST_UPDATE_TIME" fieldType="Date" isMust="false" isPrimaryKey="false" isQuery="false" isSearch="false"/>
</fields>
</table>

27
src/main/resources/modules/SpringBoot/resources/templates/screen/module/system/res.ftl
Unescape View File

@ -18,6 +18,12 @@
<el-form-item label="资源内容" prop="resValue">
<el-input v-model="vm.resValue" clearable size="mini" placeholder="请输入资源内容"></el-input>
</el-form-item>
<el-form-item label="是否免费" prop="free">
<el-radio-group v-model="vm.free" clearable size="mini">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否有效" prop="valid">
<el-radio-group v-model="vm.valid" clearable size="mini">
<el-radio :label="true">是</el-radio>
@ -109,6 +115,15 @@
width="200"
label="资源内容">
</el-table-column>
<el-table-column
align="center"
prop="free"
label="是否免费">
<template slot-scope="scope">
<el-tag size="mini" effect="dark" type="success" v-if="scope.row.free">免费</el-tag>
<el-tag size="mini" effect="dark" type="danger" v-if="!scope.row.free">授权</el-tag>
</template>
</el-table-column>
<el-table-column
align="center"
prop="createTime"
@ -208,6 +223,9 @@
<el-input v-model="form.resValue" clearable size="mini"
placeholder="请输入资源描述"></el-input>
</el-form-item>
<el-form-item label="是否免费" prop="free">
<el-switch v-model="form.free" active-text="免费" inactive-text="授权" clearable size="mini"></el-switch>
</el-form-item>
<el-form-item label="是否有效" prop="valid">
<el-radio-group v-model="form.valid" clearable size="mini">
<el-radio :label="true">是</el-radio>
@ -243,6 +261,7 @@
resName: "",
resType: "",
resValue: "",
free: "",
valid: "",
pageNumber: 1,
pageSize: 10,
@ -258,6 +277,7 @@
resName: "",
resType: "",
resValue: "",
free: "",
valid: "",
rowVersion: ""
},
@ -276,6 +296,9 @@
resValue: [
{min: 1, max: 255, message: '资源内容长度在 1 到 255 个字符', trigger: 'blur'}
],
free: [
{required: true, message: '是否免费不能为空', trigger: 'blur'},
],
valid: [
{required: true, message: '是否有效不能为空', trigger: 'blur'},
],
@ -292,6 +315,7 @@
this.form.resName = "";
this.form.resType = "";
this.form.resValue = "";
this.form.free = false;
this.form.valid = true;
},
onEdit: function (item) {
@ -302,6 +326,7 @@
this.form.resName = item.resName;
this.form.resType = item.resType;
this.form.resValue = item.resValue;
this.form.free = item.free;
this.form.valid = item.valid;
this.form.rowVersion = item.rowVersion;
},
@ -331,6 +356,7 @@
this.form.resName = "";
this.form.resType = "";
this.form.resValue = "";
this.form.free = false;
this.form.valid = true;
},
onTreeEdit: function (pItem) {
@ -341,6 +367,7 @@
this.form.resName = pItem.resName;
this.form.resType = pItem.resType;
this.form.resValue = pItem.resValue;
this.form.free = pItem.free;
this.form.valid = pItem.valid;
this.form.rowVersion = pItem.rowVersion;
},

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.