From d2401213f5a7140c6822d66d304b33cecb90d8ea Mon Sep 17 00:00:00 2001 From: wangbing Date: Tue, 24 Nov 2020 17:25:51 +0800 Subject: [PATCH] =?UTF-8?q?Select=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/module/req/createRequestClass.ftl | 5 +++++ .../java/module/req/findRequestClass.ftl | 7 ++++++- .../java/module/req/updateRequestClass.ftl | 5 +++++ .../java/module/wsys/req/FileCreateRequest.java | 4 +++- .../java/module/wsys/req/FileFindRequest.java | 4 +++- .../java/module/wsys/req/LogerrCreateRequest.java | 6 ++++++ .../java/module/wsys/req/LogerrFindRequest.java | 6 ++++++ .../java/module/wsys/req/LogerrUpdateRequest.java | 3 +++ .../java/module/wsys/req/LogtaskCreateRequest.java | 2 ++ .../java/module/wsys/req/LogtaskFindRequest.java | 14 ++++++++------ .../module/wsys/req/ProfilesCreateRequest.java | 2 ++ .../java/module/wsys/req/ProfilesFindRequest.java | 2 ++ .../module/wsys/req/ProfilesUpdateRequest.java | 2 ++ .../java/module/wsys/req/ResCreateRequest.java | 4 +++- .../java/module/wsys/req/ResFindRequest.java | 4 +++- .../java/module/wsys/req/ResUpdateRequest.java | 4 +++- .../java/module/wsys/req/ScheduleFindRequest.java | 5 ++++- .../java/module/wsys/req/TaskSqlCreateRequest.java | 5 ++++- .../java/module/wsys/req/TaskSqlFindRequest.java | 5 ++++- .../java/module/wsys/req/TaskSqlUpdateRequest.java | 5 ++++- .../java/module/wsys/req/TokensCreateRequest.java | 2 ++ .../java/module/wsys/req/TokensFindRequest.java | 2 ++ .../java/module/wsys/req/TokensUpdateRequest.java | 2 ++ .../java/module/wsys/req/UserCreateRequest.java | 5 ++++- .../java/module/wsys/req/UserFindRequest.java | 5 ++++- .../java/module/wsys/req/UserUpdateRequest.java | 5 ++++- 26 files changed, 96 insertions(+), 19 deletions(-) diff --git a/src/main/resources/modules/SpringBoot/java/module/req/createRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/module/req/createRequestClass.ftl index 2c833b02..a8d15f5b 100644 --- a/src/main/resources/modules/SpringBoot/java/module/req/createRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/req/createRequestClass.ftl @@ -27,6 +27,11 @@ public class ${table.getCName()}CreateRequest extends BaseRequest { /** * ${field.fieldComment?default("")}. + <#if field.fieldType?contains("Select")> + <#list field.selectItems as item> + * ${item.value}:${item.label} + + */ <#if field.isMust && !field.fieldType?contains("String")> @NotNull(message = "[${field.getFName()}]${field.fieldComment?default("")}不能为NULL") diff --git a/src/main/resources/modules/SpringBoot/java/module/req/findRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/module/req/findRequestClass.ftl index cbde78c3..71e009ff 100644 --- a/src/main/resources/modules/SpringBoot/java/module/req/findRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/req/findRequestClass.ftl @@ -21,7 +21,12 @@ public class ${table.getCName()}FindRequest extends BaseFindRequest { <#if field.isQuery> /** - * ${field.fieldComment?default("")}精确查询. + * ${field.fieldComment?default("")}. + <#if field.fieldType?contains("Select")> + <#list field.selectItems as item> + * ${item.value}:${item.label} + + */ <#if field.fieldType?contains("Dict")> @Dict(name = "${field.getFieldName()}") diff --git a/src/main/resources/modules/SpringBoot/java/module/req/updateRequestClass.ftl b/src/main/resources/modules/SpringBoot/java/module/req/updateRequestClass.ftl index 5d2ce0c2..fe7b22f7 100644 --- a/src/main/resources/modules/SpringBoot/java/module/req/updateRequestClass.ftl +++ b/src/main/resources/modules/SpringBoot/java/module/req/updateRequestClass.ftl @@ -28,6 +28,11 @@ public class ${table.getCName()}UpdateRequest extends BaseUpdateRequest { /** * ${field.fieldComment?default("")}. + <#if field.fieldType?contains("Select")> + <#list field.selectItems as item> + * ${item.value}:${item.label} + + */ <#if field.isMust && !field.fieldType?contains("String")> @NotNull(message = "[${field.getFName()}]${field.fieldComment?default("")}不能为NULL") diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/FileCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/FileCreateRequest.java index 4eb0bbe6..5e4aea7a 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/FileCreateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/FileCreateRequest.java @@ -23,7 +23,9 @@ public class FileCreateRequest extends BaseRequest { private String name; /** - * 文件类型 + * 文件类型. + * IMG:图片 + * DOC:文档 */ @Select({"IMG", "DOC"}) private String fileType; diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/FileFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/FileFindRequest.java index a7be8db8..7f54cc03 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/FileFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/FileFindRequest.java @@ -20,7 +20,9 @@ public class FileFindRequest extends BaseFindRequest { private String name; /** - * 文件类型 + * 文件类型. + * IMG:图片 + * DOC:文档 */ @Select({"IMG", "DOC"}) private String fileType; diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrCreateRequest.java index 6ee4d795..88164bd6 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrCreateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrCreateRequest.java @@ -18,6 +18,9 @@ public class LogerrCreateRequest extends BaseRequest { /** * 日志类型. + * 系统错误:系统错误 + * 任务错误:任务错误 + * 业务错误:业务错误 */ @NotNull(message = "[logType]日志类型不能为NULL") @Select({"系统错误", "任务错误", "业务错误"}) @@ -38,6 +41,9 @@ public class LogerrCreateRequest extends BaseRequest { /** * 日志状态. + * 0:待处理 + * 1:处理中 + * 2:已处理 */ @NotNull(message = "[logState]日志状态不能为NULL") @Select({"0", "1", "2"}) diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrFindRequest.java index 80d47954..bf226b78 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrFindRequest.java @@ -16,6 +16,9 @@ public class LogerrFindRequest extends BaseFindRequest { /** * 日志类型. + * 系统错误:系统错误 + * 任务错误:任务错误 + * 业务错误:业务错误 */ @Select({"系统错误", "任务错误", "业务错误"}) private String logType; @@ -27,6 +30,9 @@ public class LogerrFindRequest extends BaseFindRequest { /** * 日志状态. + * 0:待处理 + * 1:处理中 + * 2:已处理 */ @Select({"0", "1", "2"}) private String logState; diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrUpdateRequest.java index c8f597a3..a2dea0f5 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogerrUpdateRequest.java @@ -24,6 +24,9 @@ public class LogerrUpdateRequest extends BaseUpdateRequest { /** * 日志状态. + * 0:待处理 + * 1:处理中 + * 2:已处理 */ @NotNull(message = "[logState]日志状态不能为NULL") @Select({"0", "1", "2"}) diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskCreateRequest.java index 9b77c8c4..526f0a54 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskCreateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskCreateRequest.java @@ -50,6 +50,8 @@ public class LogtaskCreateRequest extends BaseRequest { /** * 执行状态. + * 1:成功 + * 0:失败 */ @NotNull(message = "[execState]执行状态不能为NULL") @Select({"1", "0"}) diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskFindRequest.java index 9062f4a5..80f7567a 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/LogtaskFindRequest.java @@ -14,32 +14,34 @@ import ${domain}.frame.validation.Select; public class LogtaskFindRequest extends BaseFindRequest { /** - * 任务ID精确查询. + * 任务ID. */ private String taskId; /** - * 任务名称精确查询. + * 任务名称. */ private String taskName; /** - * 开始时间精确查询. + * 开始时间. */ private Date startTime; /** - * 结束时间精确查询. + * 结束时间. */ private Date endTime; /** - * 执行耗时精确查询. + * 执行耗时. */ private Integer execTime; /** - * 执行状态精确查询. + * 执行状态. + * 1:成功 + * 0:失败 */ @Select({"1", "0"}) private String execState; 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 e8b577bb..5c4f2be1 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 @@ -18,6 +18,8 @@ public class ProfilesCreateRequest extends BaseRequest { /** * 配置环境. + * dev:开发环境 + * prod:生产环境 */ @NotNull(message = "[active]配置环境不能为NULL") @Select({"dev", "prod"}) 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 e73b1a52..810ea6f4 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 @@ -16,6 +16,8 @@ public class ProfilesFindRequest extends BaseFindRequest { /** * 配置环境. + * dev:开发环境 + * prod:生产环境 */ @Select({"dev", "prod"}) private String active; 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 5ca12c47..827a7bec 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 @@ -24,6 +24,8 @@ public class ProfilesUpdateRequest extends BaseUpdateRequest { /** * 配置环境. + * dev:开发环境 + * prod:生产环境 */ @NotNull(message = "[active]配置环境不能为NULL") @Select({"dev", "prod"}) diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResCreateRequest.java index 36796f41..fa15c893 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResCreateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResCreateRequest.java @@ -30,7 +30,9 @@ public class ResCreateRequest extends BaseRequest { private String resName; /** - * 资源类型 + * 资源类型. + * WEB:网页 + * API:终端 */ @NotNull(message = "[resType]资源类型不能为NULL") @Select({"WEB", "API"}) diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResFindRequest.java index af9e0e00..1a738b84 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResFindRequest.java @@ -25,7 +25,9 @@ public class ResFindRequest extends BaseFindRequest { private String resName; /** - * 资源类型 + * 资源类型. + * WEB:网页 + * API:终端 */ @Select({"WEB", "API"}) private String resType; diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResUpdateRequest.java index 5ccef58c..b1877bf1 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ResUpdateRequest.java @@ -36,7 +36,9 @@ public class ResUpdateRequest extends BaseUpdateRequest { private String resName; /** - * 资源类型 + * 资源类型. + * WEB:网页 + * API:终端 */ @NotNull(message = "[resType]资源类型不能为NULL") @Select({"WEB", "API"}) diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ScheduleFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ScheduleFindRequest.java index 6e4ae4b6..9c109495 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/ScheduleFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/ScheduleFindRequest.java @@ -28,7 +28,10 @@ public class ScheduleFindRequest extends BaseFindRequest { private String taskNote; /** - * 任务类型 + * 任务类型. + * Cron:Cron表达式 + * DelayRepeat:间隔重复(秒) + * FixRepeat:绝对重复(秒) */ @Select({"Cron", "DelayRepeat", "FixRepeat"}) private String taskType; diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlCreateRequest.java index afe3ba91..74f2e9c2 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlCreateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlCreateRequest.java @@ -30,7 +30,10 @@ public class TaskSqlCreateRequest extends BaseRequest { private String taskNote; /** - * 任务类型 + * 任务类型. + * Cron:Cron表达式 + * DelayRepeat:间隔重复(秒) + * FixRepeat:绝对重复(秒) */ @NotNull(message = "[taskType]任务类型不能为NULL") @Select({"Cron", "DelayRepeat", "FixRepeat"}) diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlFindRequest.java index df4fa85d..81034a1e 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlFindRequest.java @@ -25,7 +25,10 @@ public class TaskSqlFindRequest extends BaseFindRequest { private String taskNote; /** - * 任务类型 + * 任务类型. + * Cron:Cron表达式 + * DelayRepeat:间隔重复(秒) + * FixRepeat:绝对重复(秒) */ @Select({"Cron", "DelayRepeat", "FixRepeat"}) private String taskType; diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlUpdateRequest.java index 985facea..7d940aed 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TaskSqlUpdateRequest.java @@ -36,7 +36,10 @@ public class TaskSqlUpdateRequest extends BaseUpdateRequest { private String taskNote; /** - * 任务类型 + * 任务类型. + * Cron:Cron表达式 + * DelayRepeat:间隔重复(秒) + * FixRepeat:绝对重复(秒) */ @NotNull(message = "[taskType]任务类型不能为NULL") @Select({"Cron", "DelayRepeat", "FixRepeat"}) diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensCreateRequest.java index f7806e31..849f7f82 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensCreateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensCreateRequest.java @@ -79,6 +79,8 @@ public class TokensCreateRequest extends BaseRequest { /** * 终端类型. + * WEB:网页 + * API:终端 */ @Select({"WEB", "API"}) private String terminal; diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensFindRequest.java index 63262b2c..4253e089 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensFindRequest.java @@ -66,6 +66,8 @@ public class TokensFindRequest extends BaseFindRequest { /** * 终端类型. + * WEB:网页 + * API:终端 */ @Select({"WEB", "API"}) private String terminal; diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensUpdateRequest.java index 51560e1a..64da9b2f 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/TokensUpdateRequest.java @@ -85,6 +85,8 @@ public class TokensUpdateRequest extends BaseUpdateRequest { /** * 终端类型. + * WEB:网页 + * API:终端 */ @Select({"WEB", "API"}) private String terminal; diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserCreateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserCreateRequest.java index 5aee3100..8ed4b6fc 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserCreateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserCreateRequest.java @@ -46,7 +46,10 @@ public class UserCreateRequest extends BaseRequest { private String userPwd; /** - * 用户状态 + * 用户状态. + * 0:无效 + * 1:有效 + * 2:初始密码 */ @NotNull(message = "[userStatus]用户状态不能为NULL") @Select({"0", "1", "2"}) diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserFindRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserFindRequest.java index 28b3a147..2a9beb5c 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserFindRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserFindRequest.java @@ -30,7 +30,10 @@ public class UserFindRequest extends BaseFindRequest { private String userAlias; /** - * 用户状态 + * 用户状态. + * 0:无效 + * 1:有效 + * 2:初始密码 */ @Select({"0", "1", "2"}) private String userStatus; diff --git a/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserUpdateRequest.java b/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserUpdateRequest.java index fccadce0..34343d3b 100644 --- a/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserUpdateRequest.java +++ b/src/main/resources/modules/SpringBoot/java/module/wsys/req/UserUpdateRequest.java @@ -35,7 +35,10 @@ public class UserUpdateRequest extends BaseUpdateRequest { private String userAlias; /** - * 用户状态 + * 用户状态. + * 0:无效 + * 1:有效 + * 2:初始密码 */ @NotNull(message = "[userStatus]用户状态不能为NULL") @Select({"0", "1", "2"})