From f1e5588caf806469f97b370aecaef0229428573b Mon Sep 17 00:00:00 2001 From: wangbing Date: Tue, 24 Nov 2020 16:12:03 +0800 Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/module/wsys/ent/Profiles.java | 14 +++++++++++++ .../java/module/wsys/mgr/ProfilesManager.java | 6 +++--- .../module/wsys/mgr/ProfilesManagerImpl.java | 6 +++--- .../module/wsys/mpr/MySQL_DictItemMapper.xml | 2 +- .../module/wsys/mpr/MySQL_ProfilesMapper.xml | 12 ++++++++++- .../java/module/wsys/mpr/MySQL_ResMapper.xml | 2 +- .../module/wsys/mpr/Oracle_ProfilesMapper.xml | 9 +++++++- .../module/wsys/mpr/SQLite_ProfilesMapper.xml | 15 +++++++++---- .../wsys/req/ProfilesCreateRequest.java | 15 +++++++++++++ .../module/wsys/req/ProfilesFindRequest.java | 13 ++++++++++++ .../wsys/req/ProfilesUpdateRequest.java | 15 +++++++++++++ .../SpringBoot/resources/dbtool/wadmin.xml | 1 + .../dbtool/wsys_table/MySQL_ALL_TABLE.sql | 1 + .../dbtool/wsys_table/MySQL_PROFILES.sql | 1 + .../dbtool/wsys_table/Oracle_ALL_TABLE.sql | 2 ++ .../dbtool/wsys_table/Oracle_PROFILES.sql | 2 ++ .../dbtool/wsys_table/SQLite_ALL_TABLE.sql | 1 + .../dbtool/wsys_table/SQLite_PROFILES.sql | 1 + .../templates/screen/module/wsys/profiles.ftl | 21 ++++++++++++++++++- .../SpringBoot/test/wsys/ProfilesTest.java | 4 ++++ 20 files changed, 128 insertions(+), 15 deletions(-) diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Profiles.java b/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Profiles.java index 0fada77a..2c475124 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Profiles.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/ent/Profiles.java @@ -33,6 +33,12 @@ public class Profiles extends BaseEntity { @ExcelProperty("配置项值") @ExcelNote("") private String value; + /** + * NOTE - 配置描述 + */ + @ExcelProperty("配置描述") + @ExcelNote("") + private String note; public String getActive() { return this.active; @@ -57,4 +63,12 @@ public class Profiles extends BaseEntity { public void setValue(String value) { this.value = value; } + + public String getNote() { + return this.note; + } + + public void setNote(String note) { + this.note = note; + } } \ No newline at end of file diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManager.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManager.java index 355c922c..01f22dfa 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManager.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManager.java @@ -58,7 +58,7 @@ public interface ProfilesManager { /** * 获得当前环境配置 * - * @param key 键 + * @param key 配置项名 * @param defaultValue 默认值 * @return */ @@ -67,7 +67,7 @@ public interface ProfilesManager { /** * 获得当前环境配置 * - * @param key 键 + * @param key 配置项名 * @param defaultValue 默认值 * @return */ @@ -76,7 +76,7 @@ public interface ProfilesManager { /** * 获得当前环境配置 * - * @param key 键 + * @param key 配置项名 * @param defaultValue 默认值 * @return */ diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java index 89e00efd..e8412302 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mgr/ProfilesManagerImpl.java @@ -170,7 +170,7 @@ public class ProfilesManagerImpl implements ${domain}.module.wsys.mgr.ProfilesMa /** * 获得当前环境配置 * - * @param key 键 + * @param key 配置项名 * @param defaultValue 默认值 * @return */ @@ -200,7 +200,7 @@ public class ProfilesManagerImpl implements ${domain}.module.wsys.mgr.ProfilesMa /** * 获得当前环境配置 * - * @param key 键 + * @param key 配置项名 * @param defaultValue 默认值 * @return */ @@ -220,7 +220,7 @@ public class ProfilesManagerImpl implements ${domain}.module.wsys.mgr.ProfilesMa /** * 获得当前环境配置 * - * @param key 键 + * @param key 配置项名 * @param defaultValue 默认值 * @return */ diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictItemMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictItemMapper.xml index 37539625..bf2e0f07 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictItemMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_DictItemMapper.xml @@ -5,7 +5,7 @@ - + `SYS_DICT_ITEM` diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ProfilesMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ProfilesMapper.xml index 452313d0..fffa9d83 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ProfilesMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ProfilesMapper.xml @@ -4,10 +4,13 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + + `SYS_PROFILES` - `ID`,`ACTIVE`,`KEY`,`VALUE`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME` + `ID`,`ACTIVE`,`KEY`,`VALUE`,`NOTE`,`ROW_VERSION`,`IS_DELETED`,`CREATE_BY`,`CREATE_TIME`,`LAST_UPDATE_BY`,`LAST_UPDATE_TIME` @@ -15,6 +18,7 @@ + @@ -35,6 +39,7 @@ ${r'#'}{request.active,jdbcType=VARCHAR}, ${r'#'}{request.key,jdbcType=VARCHAR}, ${r'#'}{request.value,jdbcType=VARCHAR}, + ${r'#'}{request.note,jdbcType=VARCHAR}, 0, 0, ${r'#'}{token.userId,jdbcType=NUMERIC}, @@ -56,6 +61,7 @@ ${r'#'}{item.active,jdbcType=VARCHAR}, ${r'#'}{item.key,jdbcType=VARCHAR}, ${r'#'}{item.value,jdbcType=VARCHAR}, + ${r'#'}{item.note,jdbcType=VARCHAR}, 0, 0, ${r'#'}{token.userId,jdbcType=NUMERIC}, @@ -91,6 +97,7 @@ `ACTIVE` = ${r'#'}{request.active,jdbcType=VARCHAR}, `KEY` = ${r'#'}{request.key,jdbcType=VARCHAR}, `VALUE` = ${r'#'}{request.value,jdbcType=VARCHAR}, + `NOTE` = ${r'#'}{request.note,jdbcType=VARCHAR}, `ROW_VERSION` = `ROW_VERSION` + 1, `LAST_UPDATE_BY` = ${r'#'}{token.userId}, `LAST_UPDATE_TIME` = sysdate() @@ -139,6 +146,9 @@ AND `KEY` = ${r'#'}{request.key} + + AND `NOTE` LIKE CONCAT("%",${r'#'}{request.noteLike},"%") + AND `CREATE_TIME` >= ${r'#'}{request.startDate} diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml index 6b7d65d8..d47b5dfb 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/MySQL_ResMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + `SYS_RES` diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_ProfilesMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_ProfilesMapper.xml index 0b88c5fe..95920c89 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_ProfilesMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/Oracle_ProfilesMapper.xml @@ -7,7 +7,7 @@ "SYS_PROFILES" - "ID","ACTIVE","KEY","VALUE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" + "ID","ACTIVE","KEY","VALUE","NOTE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" @@ -15,6 +15,7 @@ + @@ -35,6 +36,7 @@ ${r'#'}{request.active,jdbcType=VARCHAR}, ${r'#'}{request.key,jdbcType=VARCHAR}, ${r'#'}{request.value,jdbcType=VARCHAR}, + ${r'#'}{request.note,jdbcType=VARCHAR}, 0, 0, ${r'#'}{token.userId,jdbcType=NUMERIC}, @@ -57,6 +59,7 @@ ${r'#'}{item.active,jdbcType=VARCHAR}, ${r'#'}{item.key,jdbcType=VARCHAR}, ${r'#'}{item.value,jdbcType=VARCHAR}, + ${r'#'}{item.note,jdbcType=VARCHAR}, 0, 0, ${r'#'}{token.userId,jdbcType=NUMERIC}, @@ -93,6 +96,7 @@ "ACTIVE" = ${r'#'}{request.active,jdbcType=VARCHAR}, "KEY" = ${r'#'}{request.key,jdbcType=VARCHAR}, "VALUE" = ${r'#'}{request.value,jdbcType=VARCHAR}, + "NOTE" = ${r'#'}{request.note,jdbcType=VARCHAR}, "ROW_VERSION" = "ROW_VERSION" + 1, "LAST_UPDATE_BY" = ${r'#'}{token.userId}, "LAST_UPDATE_TIME" = sysdate @@ -127,6 +131,9 @@ AND "KEY" = ${r'#'}{request.key} + + AND "NOTE" LIKE '%'||${r'#'}{request.noteLike}||'%' + AND "CREATE_TIME" >= ${r'#'}{request.startDate} diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ProfilesMapper.xml b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ProfilesMapper.xml index f476c010..5843f0f7 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ProfilesMapper.xml +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/mpr/SQLite_ProfilesMapper.xml @@ -7,7 +7,7 @@ "SYS_PROFILES" - "ID","ACTIVE","KEY","VALUE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" + "ID","ACTIVE","KEY","VALUE","NOTE","ROW_VERSION","IS_DELETED","CREATE_BY","CREATE_TIME","LAST_UPDATE_BY","LAST_UPDATE_TIME" @@ -15,6 +15,7 @@ + @@ -35,6 +36,7 @@ ${r'#'}{request.active,jdbcType=VARCHAR}, ${r'#'}{request.key,jdbcType=VARCHAR}, ${r'#'}{request.value,jdbcType=VARCHAR}, + ${r'#'}{request.note,jdbcType=VARCHAR}, 0, 0, ${r'#'}{token.userId,jdbcType=NUMERIC}, @@ -56,6 +58,7 @@ ${r'#'}{item.active,jdbcType=VARCHAR}, ${r'#'}{item.key,jdbcType=VARCHAR}, ${r'#'}{item.value,jdbcType=VARCHAR}, + ${r'#'}{item.note,jdbcType=VARCHAR}, 0, 0, ${r'#'}{token.userId,jdbcType=NUMERIC}, @@ -88,9 +91,10 @@ UPDATE SET - ACTIVE = ${r'#'}{request.active,jdbcType=VARCHAR}, - KEY = ${r'#'}{request.key,jdbcType=VARCHAR}, - VALUE = ${r'#'}{request.value,jdbcType=VARCHAR}, + "ACTIVE" = ${r'#'}{request.active,jdbcType=VARCHAR}, + "KEY" = ${r'#'}{request.key,jdbcType=VARCHAR}, + "VALUE" = ${r'#'}{request.value,jdbcType=VARCHAR}, + "NOTE" = ${r'#'}{request.note,jdbcType=VARCHAR}, "ROW_VERSION" = "ROW_VERSION" + 1, "LAST_UPDATE_BY" = ${r'#'}{token.userId}, "LAST_UPDATE_TIME" = datetime('now','localtime') @@ -125,6 +129,9 @@ AND "KEY" = ${r'#'}{request.key} + + AND "NOTE" LIKE '%'||${r'#'}{request.noteLike}||'%' + AND strftime('%s',"CREATE_TIME", 'utc')*1000 >= ${r'#'}{request.startDate} diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesCreateRequest.java index 569ecabb..e8b577bb 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesCreateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesCreateRequest.java @@ -37,6 +37,13 @@ public class ProfilesCreateRequest extends BaseRequest { @Length(min = 0, max = 50, message = "[value]配置项值长度不合法(0-50)") private String value; + /** + * 配置描述. + */ + @NotBlank(message = "[note]配置描述值不能为空") + @Length(min = 0, max = 255, message = "[note]配置描述长度不合法(0-50)") + private String note; + public String getActive() { return this.active; } @@ -60,4 +67,12 @@ public class ProfilesCreateRequest extends BaseRequest { public void setValue(String value) { this.value = value; } + + public String getNote() { + return this.note; + } + + public void setNote(String note) { + this.note = note; + } } diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesFindRequest.java index 2bfde667..e73b1a52 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesFindRequest.java @@ -25,6 +25,11 @@ public class ProfilesFindRequest extends BaseFindRequest { */ private String key; + /** + * 配置描述. + */ + private String noteLike; + /** * 开始日期 */ @@ -51,6 +56,14 @@ public class ProfilesFindRequest extends BaseFindRequest { this.key = key; } + public String getNoteLike() { + return this.noteLike; + } + + public void setNoteLike(String noteLike) { + this.noteLike = noteLike; + } + public Date getStartDate() { return startDate; } diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesUpdateRequest.java index 18018405..5ca12c47 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ProfilesUpdateRequest.java @@ -43,6 +43,13 @@ public class ProfilesUpdateRequest extends BaseUpdateRequest { @Length(min = 0, max = 50, message = "[value]配置项值长度不合法(0-50)") private String value; + /** + * 配置描述. + */ + @NotBlank(message = "[note]配置描述不能为空") + @Length(min = 0, max = 255, message = "[note]配置描述长度不合法(0-255)") + private String note; + public Long getId() { return this.id; } @@ -74,4 +81,12 @@ public class ProfilesUpdateRequest extends BaseUpdateRequest { public void setValue(String value) { this.value = value; } + + public String getNote() { + return this.note; + } + + public void setNote(String note) { + this.note = note; + } } diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml b/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml index 0d03b50e..df000e9c 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wadmin.xml @@ -57,6 +57,7 @@ + diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql index 5a88a57f..9fea7e3f 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_ALL_TABLE.sql @@ -349,6 +349,7 @@ CREATE TABLE `SYS_PROFILES` ( `ACTIVE` VARCHAR(20) NOT NULL COMMENT '配置环境', `KEY` VARCHAR(50) NOT NULL COMMENT '配置项名', `VALUE` VARCHAR(50) NOT NULL COMMENT '配置项值', + `NOTE` VARCHAR(255) 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 '创建用户', diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_PROFILES.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_PROFILES.sql index 88160b5c..50b2fd26 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_PROFILES.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/MySQL_PROFILES.sql @@ -9,6 +9,7 @@ CREATE TABLE `SYS_PROFILES` ( `ACTIVE` VARCHAR(20) NOT NULL COMMENT '配置环境', `KEY` VARCHAR(50) NOT NULL COMMENT '配置项名', `VALUE` VARCHAR(50) NOT NULL COMMENT '配置项值', + `NOTE` VARCHAR(255) 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 '创建用户', diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql index f544faf4..03c1c0ed 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_ALL_TABLE.sql @@ -541,6 +541,7 @@ CREATE TABLE "SYS_PROFILES" ( "ACTIVE" VARCHAR(20) NULL, "KEY" VARCHAR2(50) NULL, "VALUE" VARCHAR2(50) NULL, +"NOTE" VARCHAR2(255) NULL, "ROW_VERSION" NUMBER(19) NOT NULL, "IS_DELETED" CHAR(1) NOT NULL, "CREATE_BY" NUMBER(19) NOT NULL, @@ -553,6 +554,7 @@ 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"."NOTE" 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 '创建用户'; diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_PROFILES.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_PROFILES.sql index c9990be6..0238b8af 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_PROFILES.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/Oracle_PROFILES.sql @@ -9,6 +9,7 @@ CREATE TABLE "SYS_PROFILES" ( "ACTIVE" VARCHAR(20) NULL, "KEY" VARCHAR2(50) NULL, "VALUE" VARCHAR2(50) NULL, + "NOTE" VARCHAR2(255) NULL, "ROW_VERSION" NUMBER(19) NOT NULL, "IS_DELETED" CHAR(1) NOT NULL, "CREATE_BY" NUMBER(19) NOT NULL, @@ -22,6 +23,7 @@ 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"."NOTE" 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 '创建用户'; diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql index 866c543f..3c47754f 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_ALL_TABLE.sql @@ -74,6 +74,7 @@ CREATE TABLE IF NOT EXISTS SYS_PROFILES ( "ACTIVE" VARCHAR(20) NOT NULL, "KEY" VARCHAR(50) NOT NULL, "VALUE" VARCHAR(50) NOT NULL, + "NOTE" VARCHAR(255) NOT NULL, "ROW_VERSION" BIGINT NOT NULL, "IS_DELETED" BOOLEAN NOT NULL, "CREATE_BY" BIGINT NOT NULL, diff --git a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_PROFILES.sql b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_PROFILES.sql index e7421eaf..32c8fcd7 100644 --- a/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_PROFILES.sql +++ b/src/main/resources/modules/SpringBoot/resources/dbtool/wsys_table/SQLite_PROFILES.sql @@ -9,6 +9,7 @@ CREATE TABLE IF NOT EXISTS SYS_PROFILES ( "ACTIVE" VARCHAR(20) NOT NULL, "KEY" VARCHAR(50) NOT NULL, "VALUE" VARCHAR(50) NOT NULL, + "NOTE" VARCHAR(255) NOT NULL, "ROW_VERSION" BIGINT NOT NULL, "IS_DELETED" BOOLEAN NOT NULL, "CREATE_BY" BIGINT NOT NULL, diff --git a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl index a01b7fcd..9d884a1a 100644 --- a/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl +++ b/src/main/resources/modules/SpringBoot/resources/templates/screen/module/wsys/profiles.ftl @@ -10,6 +10,9 @@ + + + @@ -98,6 +101,12 @@ prop="value" label="配置项值"> + + + + + @@ -176,6 +188,7 @@ vm: {//条件及分页参数 active: null, key: null, + noteLike: null, startDate: null, endDate: null, pageNumber: 1, @@ -191,6 +204,7 @@ active: null, key: null, value: null, + note: null, rowVersion: null }, formRules: { @@ -205,6 +219,9 @@ {required: true, message: '配置项值不能为空', trigger: 'blur'}, {min: 1, max: 50, message: '配置项值长度在 1 到 50 个字符', trigger: 'blur'} ], + note: [ + {min: 0, max: 255, message: '配置项值长度在 1 到 255 个字符', trigger: 'blur'} + ], } }, methods: { @@ -215,6 +232,7 @@ this.form.active = ""; this.form.key = ""; this.form.value = ""; + this.form.note = ""; }, onEdit: function (item) { this.form.formTitle = "系统配置编辑"; @@ -223,6 +241,7 @@ this.form.active = item.active; this.form.key = item.key; this.form.value = item.value; + this.form.note = item.note; this.form.rowVersion = item.rowVersion; }, onDelete: function (item) { @@ -231,7 +250,7 @@ cancelButtonText: '取消', type: 'warning' }).then(function () { - new Ajax("E:\wangbing\source\dbtool\target\project\wadmin\src\main\resources\templates\screen\wsys", "profiles").delete({id: item.id}, function (response) { + new Ajax("wsys", "profiles").delete({id: item.id}, function (response) { if (response.errors.length > 0) { nav.e(response.errors[0].message); } else { diff --git a/src/main/resources/modules/SpringBoot/test/wsys/ProfilesTest.java b/src/main/resources/modules/SpringBoot/test/wsys/ProfilesTest.java index 4ff53e18..fee6335c 100644 --- a/src/main/resources/modules/SpringBoot/test/wsys/ProfilesTest.java +++ b/src/main/resources/modules/SpringBoot/test/wsys/ProfilesTest.java @@ -43,6 +43,7 @@ public class ProfilesTest { request.setActive("value"); request.setKey("配置项名"); request.setValue("配置项值"); + request.setNote("配置描述"); ProfilesCreateResponse response = profilesManager.create(request,token); @@ -57,6 +58,7 @@ public class ProfilesTest { createRequest.setActive("value"); createRequest.setKey("配置项名"); createRequest.setValue("配置项值"); + createRequest.setNote("配置描述"); ProfilesCreateResponse createResponse = profilesManager.create(createRequest,token); @@ -77,6 +79,7 @@ public class ProfilesTest { createRequest.setActive("value"); createRequest.setKey("配置项名"); createRequest.setValue("配置项值"); + createRequest.setNote("配置描述"); ProfilesCreateResponse createResponse = profilesManager.create(createRequest, token); @@ -88,6 +91,7 @@ public class ProfilesTest { request.setActive("value"); request.setKey("配置项名"); request.setValue("配置项值"); + request.setNote("配置描述"); ProfilesUpdateResponse response = profilesManager.update(request,token);