diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/AssertModule.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/AssertModule.java index 5a680e14..725cb3c5 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/AssertModule.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/AssertModule.java @@ -22,7 +22,9 @@ public class AssertModule implements MagicModule { * @param message 状态说明 */ @Comment("判断值不能为空") - public void notNull(@Comment(name = "value", value = "值") Object value, @Comment(name = "code", value = "判断失败时的code") int code, @Comment(name = "message", value = "判断失败时的说明") String message) { + public void notNull(@Comment(name = "value", value = "值") Object value, + @Comment(name = "code", value = "判断失败时的code") int code, + @Comment(name = "message", value = "判断失败时的说明") String message) { if (value == null) { throw new MagicScriptAssertException(code, message); } @@ -36,7 +38,9 @@ public class AssertModule implements MagicModule { * @param message 状态说明 */ @Comment("判断值不能为Empty") - public void notEmpty(@Comment(name = "value", value = "值") String value, @Comment(name = "code", value = "判断失败时的code") int code, @Comment(name = "message", value = "判断失败时的说明") String message) { + public void notEmpty(@Comment(name = "value", value = "值") String value, + @Comment(name = "code", value = "判断失败时的code") int code, + @Comment(name = "message", value = "判断失败时的说明") String message) { if (StringUtils.isEmpty(value)) { throw new MagicScriptAssertException(code, message); } @@ -50,7 +54,9 @@ public class AssertModule implements MagicModule { * @param message 状态说明 */ @Comment("判断值不能为Blank") - public void notBlank(@Comment(name = "value", value = "值") String value, @Comment(name = "code", value = "判断失败时的code") int code, @Comment(name = "message", value = "判断失败时的说明") String message) { + public void notBlank(@Comment(name = "value", value = "值") String value, + @Comment(name = "code", value = "判断失败时的code") int code, + @Comment(name = "message", value = "判断失败时的说明") String message) { if (StringUtils.isBlank(value)) { throw new MagicScriptAssertException(code, message); } @@ -64,7 +70,9 @@ public class AssertModule implements MagicModule { * @param message 状态说明 */ @Comment("正则判断") - public void regx(@Comment(name = "value", value = "值") String value, String pattern, @Comment(name = "code", value = "判断失败时的code") int code, @Comment(name = "message", value = "判断失败时的说明") String message) { + public void regx(@Comment(name = "value", value = "值") String value, String pattern, + @Comment(name = "code", value = "判断失败时的code") int code, + @Comment(name = "message", value = "判断失败时的说明") String message) { if (value == null || !Pattern.compile(pattern).matcher(value).matches()) { throw new MagicScriptAssertException(code, message); } @@ -78,7 +86,9 @@ public class AssertModule implements MagicModule { * @param message 状态说明 */ @Comment("判断值是否为true") - public void isTrue(@Comment(name = "value", value = "值") boolean value, @Comment(name = "code", value = "判断失败时的code") int code, @Comment(name = "message", value = "判断失败时的说明") String message) { + public void isTrue(@Comment(name = "value", value = "值") boolean value, + @Comment(name = "code", value = "判断失败时的code") int code, + @Comment(name = "message", value = "判断失败时的说明") String message) { if (!value) { throw new MagicScriptAssertException(code, message); } diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/RequestModule.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/RequestModule.java index 036893ea..da976877 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/RequestModule.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/RequestModule.java @@ -57,6 +57,7 @@ public class RequestModule { /** * 获取原生HttpServletRequest对象 */ + @Comment("获取原生HttpServletRequest对象") public static HttpServletRequest get() { return org.ssssssss.magicapi.utils.WebUtils.getRequest().orElse(null); } diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java index 068e6a8d..a9dda06d 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/SQLModule.java @@ -238,7 +238,8 @@ public class SQLModule extends HashMap implements MagicModule * @param ttl 过期时间 */ @Comment("使用缓存") - public SQLModule cache(@Comment(name = "cacheName", value = "缓存名") String cacheName, @Comment(name = "ttl", value = "过期时间") long ttl) { + public SQLModule cache(@Comment(name = "cacheName", value = "缓存名") String cacheName, + @Comment(name = "ttl", value = "过期时间") long ttl) { if (cacheName == null) { return this; } @@ -434,7 +435,8 @@ public class SQLModule extends HashMap implements MagicModule * 插入并返回主键 */ @Comment("批量执行insert操作,返回插入主键数组") - public int[] batchInsert(@Comment(name = "sql", value = "`SQL`语句") String sql, @Comment(name = "list", value = "参数") List list) { + public int[] batchInsert(@Comment(name = "sql", value = "`SQL`语句") String sql, + @Comment(name = "list", value = "参数") List list) { assertDatasourceNotNull(); return dataSourceNode.getJdbcTemplate().batchUpdate(sql, list); } diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java index 14b07b3d..a87c5149 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/NamedTable.java @@ -233,7 +233,8 @@ public class NamedTable extends Attributes { } @Comment("执行插入,返回主键") - public Object insert(RuntimeContext runtimeContext, @Comment(name = "data", value = "各项列和值") Map data) { + public Object insert(RuntimeContext runtimeContext, + @Comment(name = "data", value = "各项列和值") Map data) { if (data != null) { data.forEach((key, value) -> this.columns.put(rowMapColumnMapper.apply(key), value)); } diff --git a/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/Where.java b/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/Where.java index 018751ab..a38bf63a 100644 --- a/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/Where.java +++ b/magic-api/src/main/java/org/ssssssss/magicapi/modules/table/Where.java @@ -286,12 +286,13 @@ public class Where { } @Comment("`and`嵌套,如and(it => it.eq('name','李白').ne('status','正常') --> and (name = '李白' and status <> '正常')") - public Where and(Function function) { + public Where and(@Comment(name = "function", value = "回调函数") Function function) { return and(true, function); } @Comment("`and`嵌套,如and(it => it.eq('name','李白').ne('status','正常') --> and (name = '李白' and status <> '正常')") - public Where and(@Comment(name = "condition", value = "判断表达式,当为true时拼接条件") boolean condition, Function function) { + public Where and(@Comment(name = "condition", value = "判断表达式,当为true时拼接条件") boolean condition, + @Comment(name = "function", value = "回调函数") Function function) { if (condition) { Where expr = function.apply(new Object[]{new Where(this.namedTable, false)}); this.params.addAll(expr.params);