diff --git a/tigon-codegen/src/main/java/me/chyxion/tigon/codegen/service/support/CodeGenServiceSupport.java b/tigon-codegen/src/main/java/me/chyxion/tigon/codegen/service/support/CodeGenServiceSupport.java index 3675b9f..3be4273 100644 --- a/tigon-codegen/src/main/java/me/chyxion/tigon/codegen/service/support/CodeGenServiceSupport.java +++ b/tigon-codegen/src/main/java/me/chyxion/tigon/codegen/service/support/CodeGenServiceSupport.java @@ -60,6 +60,7 @@ public class CodeGenServiceSupport implements CodeGenService { private List codeGen; @Value("${codegen.mapper.cache-enabled:false}") private boolean cacheEnabled; + @Value("${codegen.model.super-class.name:}") private String modelSuperClassName; @Value("${codegen.model.super-class.import-name:}") @@ -105,8 +106,8 @@ public class CodeGenServiceSupport implements CodeGenService { // collect col names String idType = null; - List colNames = new ArrayList(columns.size()); - for (Map col : (List>) columns) { + final List colNames = new ArrayList(columns.size()); + for (final Map col : (List>) columns) { String colName = ((String) col.get("col")).toLowerCase(); colNames.add(colName); if (M0.ID.equals(colName)) { @@ -128,7 +129,7 @@ public class CodeGenServiceSupport implements CodeGenService { // custom super class if (StringUtils.isNotBlank(modelSuperClassName)) { - Assert.state(StringUtils.isNotBlank(modelSuperClassImportName ), + Assert.state(StringUtils.isNotBlank(modelSuperClassImportName), "config 'codegen.model.super-class.import-name' required"); baseModelName = modelSuperClassName; baseModelFullName = modelSuperClassImportRequired ? @@ -245,17 +246,10 @@ public class CodeGenServiceSupport implements CodeGenService { fmDataModel.put("baseServiceSupportName", BaseCrudServiceSupport.class.getSimpleName()); fmDataModel.put("baseServiceSupportFullName", BaseCrudServiceSupport.class.getName()); - // model - // // mapper fmDataModel.put("baseMapperName", BaseMapper.class.getSimpleName()); fmDataModel.put("baseMapperFullName", BaseMapper.class.getName()); -// fmDataModel.put("mockMapperName", MockMapper.class.getSimpleName()); -// fmDataModel.put("mockMapperFullName", MockMapper.class.getName()); - // fmDataModel.put("mockName", Mock.class.getSimpleName()); - // fmDataModel.put("mockFullName", Mock.class.getName()); - fmDataModel.put("ctrlrTestToolName", ControllerTestTool.class.getSimpleName()); fmDataModel.put("ctrlrTestToolFullName", ControllerTestTool.class.getName()); // Object Doc diff --git a/tigon-model/src/main/java/me/chyxion/tigon/form/ListForm.java b/tigon-model/src/main/java/me/chyxion/tigon/form/ListForm.java new file mode 100644 index 0000000..c988e37 --- /dev/null +++ b/tigon-model/src/main/java/me/chyxion/tigon/form/ListForm.java @@ -0,0 +1,33 @@ +package me.chyxion.tigon.form; + +import lombok.Getter; +import lombok.Setter; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import me.chyxion.tigon.format.annotation.Trim; +import me.chyxion.tigon.format.annotation.EmptyToNull; + +/** + * @author Shaun Chyxion
+ * chyxion@163.com
+ * Jun 25, 2018 22:56:52 + */ +@Getter +@Setter +public class ListForm extends BaseForm { + @Min(0) + private int start; + @Min(1) + @Max(2048) + private int limit; + private String search; + @Trim + @EmptyToNull + private String criteria; + @Trim + @EmptyToNull + private String filters; + @Trim + @EmptyToNull + private String orders; +}