+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + *
+ * http://www.apache.org/licenses/LICENSE-2.0 + *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.api.web.gentest.user;
+
+import org.opsli.api.base.result.ResultVo;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.opsli.api.wrapper.gentest.user.TestUserModel;
+
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.api.web.gentest.user
+ * @Author: 周鹏程
+ * @CreateTime: 2020-11-22 12:12:05
+ * @Description: 某系统用户
+ *
+ * 对外 API 直接 暴露 @GetMapping 或者 @PostMapping
+ * 对内也推荐 单机版 不需要设置 Mapping 但是调用方法得从Controller写起
+ *
+ * 这样写法虽然比较绕，但是当单体项目想要改造微服务架构时 时非常容易的
+ *
+ *
+ */
+public interface TestUserRestApi {
+
+ /** 标题 */
+ String TITLE = "用户";
+
+ /**
+ * 某系统用户 查一条
+ * @param model 模型
+ * @return ResultVo
+ */
+ @GetMapping("/get")
+ ResultVo
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.api.wrapper.gentest.user;
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.opsli.api.base.warpper.ApiWrapper;
+import org.opsli.common.annotation.validation.ValidationArgs;
+import org.opsli.common.annotation.validation.ValidationArgsLenMax;
+import org.opsli.common.enums.ValiArgsType;
+import org.opsli.plugins.excel.annotation.ExcelInfo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.api.wrapper.gentest.user
+ * @Author: 周鹏程
+ * @CreateTime: 2020-11-22 12:12:05
+ * @Description: 某系统用户
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TestUserModel extends ApiWrapper {
+
+ /** 名称 */
+ @ApiModelProperty(value = "名称")
+ @ExcelProperty(value = "名称", order = 1)
+ @ExcelInfo
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_GENERAL_WITH_CHINESE})
+ @ValidationArgsLenMax(50)
+ private String name;
+
+ /** 金钱 */
+ @ApiModelProperty(value = "金钱")
+ @ExcelProperty(value = "金钱", order = 2)
+ @ExcelInfo
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_MONEY})
+ @ValidationArgsLenMax(8)
+ private Double money;
+
+ /** 年龄 */
+ @ApiModelProperty(value = "年龄")
+ @ExcelProperty(value = "年龄", order = 3)
+ @ExcelInfo
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_NOT_NULL, ValiArgsType.IS_NUMBER})
+ @ValidationArgsLenMax(5)
+ private Integer age;
+
+ /** 生日 */
+ @ApiModelProperty(value = "生日")
+ @ExcelProperty(value = "生日", order = 4)
+ @ExcelInfo
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_NOT_NULL, })
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date birth;
+
+ /** 是否启用 */
+ @ApiModelProperty(value = "是否启用")
+ @ExcelProperty(value = "是否启用", order = 5)
+ @ExcelInfo( dictType = "no_yes" )
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_NOT_NULL, })
+ @ValidationArgsLenMax(1)
+ private Character izUsable;
+
+
+
+}
diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/HumpUtil.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/HumpUtil.java
index fc70e444..64fc1afd 100644
--- a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/HumpUtil.java
+++ b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/HumpUtil.java
@@ -76,6 +76,17 @@ public final class HumpUtil {
return sb.toString().toLowerCase();
}
+ /**
+ * 首字母大写
+ * @param str
+ * @return
+ */
+ public static String captureName(String str) {
+ char[] cs = str.toCharArray();
+ cs[0] -= 32;
+ return String.valueOf(cs);
+ }
+
public static void main(String[] args) {
String aa = HumpUtil.humpToUnderline("tenantId");
String bb = HumpUtil.underlineToHump(aa);
diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/Props.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/Props.java
index 946e071e..4111da47 100644
--- a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/Props.java
+++ b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/Props.java
@@ -16,10 +16,13 @@
package org.opsli.common.utils;
import cn.hutool.core.convert.Convert;
+import cn.hutool.core.io.IoUtil;
import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
import org.yaml.snakeyaml.Yaml;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -94,7 +97,8 @@ public class Props {
return;
}
- try (InputStream inputStream = Props.class.getResourceAsStream("/" + this.fileName)) {
+ ClassPathResource resource = new ClassPathResource("/" + this.fileName);
+ try (InputStream inputStream = resource.getInputStream()) {
Yaml yaml = new Yaml();
temp = yaml.load(inputStream);
diff --git a/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/ZipUtils.java b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/ZipUtils.java
new file mode 100644
index 00000000..1aa7e847
--- /dev/null
+++ b/opsli-base-support/opsli-common/src/main/java/org/opsli/common/utils/ZipUtils.java
@@ -0,0 +1,91 @@
+package org.opsli.common.utils;
+
+import java.io.*;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+
+/**
+ * @author Parker
+ * @date 2020-01-07
+ *
+ * 文件流转压缩包工具类
+ */
+public class ZipUtils {
+ /**
+ * 缓存区大小
+ */
+ private static final int BUFFER_SIZE = 2 * 1024;
+
+ public static final String FILE_PATH = "path";
+ public static final String FILE_NAME = "name";
+ public static final String FILE_DATA = "data";
+
+
+
+ /**
+ * 压缩核心方法
+ */
+ private static void compress(ZipOutputStream zos, String path, String name, String data) throws Exception {
+ byte[] buf = new byte[BUFFER_SIZE];
+ zos.putNextEntry(new ZipEntry(path + name));
+ int len;
+ ByteArrayInputStream in = new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8));
+ while ((len = in.read(buf)) != -1) {
+ zos.write(buf, 0, len);
+ }
+ zos.closeEntry();
+ in.close();
+ }
+
+
+ /**
+ * 文本直接转zip压缩成文件
+ *
+ * @param list -> map -> path 路径; name 文件名; data 具体文本内容;
+ * @param out 传入输出流
+ * @throws RuntimeException 抛出异常
+ */
+ public static void toZip(List
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.core.creater.strategy.create;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.io.IoUtil;
+import com.jfinal.kit.Kv;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.opsli.api.ApiFlag;
+import org.opsli.common.enums.DictType;
+import org.opsli.common.enums.ValiArgsType;
+import org.opsli.common.utils.HumpUtil;
+import org.opsli.common.utils.Props;
+import org.opsli.common.utils.ZipUtils;
+import org.opsli.core.creater.strategy.create.backend.JavaCodeBuilder;
+import org.opsli.core.creater.strategy.create.foreend.VueCodeBuilder;
+import org.opsli.core.creater.strategy.create.readme.ReadMeBuilder;
+import org.opsli.core.creater.utils.EnjoyUtil;
+import org.opsli.modulars.creater.column.wrapper.CreaterTableColumnModel;
+import org.opsli.modulars.creater.createrlogs.wrapper.CreaterBuilderModel;
+import org.opsli.modulars.creater.table.wrapper.CreaterTableAndColumnModel;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.core.creater.strategy.create.backend
+ * @Author: Parker
+ * @CreateTime: 2020-11-20 17:30
+ * @Description: Java代码构建器
+ */
+public enum CodeBuilder {
+
+ INSTANCE;
+
+ /** 排除字段 */
+ private static final List
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.core.creater.strategy.create.backend;
+
+import cn.hutool.core.date.DateUtil;
+import com.jfinal.kit.Kv;
+import org.apache.commons.lang3.StringUtils;
+import org.opsli.common.enums.DictType;
+import org.opsli.common.enums.ValiArgsType;
+import org.opsli.common.utils.HumpUtil;
+import org.opsli.common.utils.WrapperUtil;
+import org.opsli.common.utils.ZipUtils;
+import org.opsli.core.creater.strategy.create.CodeBuilder;
+import org.opsli.core.creater.utils.EnjoyUtil;
+import org.opsli.modulars.creater.column.wrapper.CreaterTableColumnModel;
+import org.opsli.modulars.creater.createrlogs.wrapper.CreaterBuilderModel;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.core.creater.strategy.create.backend
+ * @Author: Parker
+ * @CreateTime: 2020-11-20 17:30
+ * @Description: Java代码构建器
+ */
+public enum JavaCodeBuilder {
+
+ INSTANCE;
+
+ /**
+ * 生成Entity
+ * @param builderModelTmp
+ * @return
+ */
+ public Map
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.core.creater.strategy.create.foreend;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DateUtil;
+import com.jfinal.kit.Kv;
+import org.apache.commons.lang3.StringUtils;
+import org.opsli.common.enums.DictType;
+import org.opsli.common.enums.ValiArgsType;
+import org.opsli.common.utils.HumpUtil;
+import org.opsli.common.utils.Props;
+import org.opsli.common.utils.WrapperUtil;
+import org.opsli.common.utils.ZipUtils;
+import org.opsli.core.creater.strategy.create.CodeBuilder;
+import org.opsli.core.creater.utils.EnjoyUtil;
+import org.opsli.modulars.creater.column.wrapper.CreaterTableColumnModel;
+import org.opsli.modulars.creater.createrlogs.wrapper.CreaterBuilderModel;
+
+import java.util.*;
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.core.creater.strategy.create.backend
+ * @Author: Parker
+ * @CreateTime: 2020-11-20 17:30
+ * @Description: Vue代码构建器
+ */
+public enum VueCodeBuilder {
+
+ INSTANCE;
+
+ /** 虚拟根路径 */
+ private static final String BASE_API_PATH;
+ static {
+ Props props = new Props("application.yaml");
+ BASE_API_PATH = props.getStr("server.servlet.api.path.global-prefix","/api/v1");
+ }
+
+ /**
+ * 生成 Index
+ * @param builderModelTmp
+ * @return
+ */
+ public Map
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.core.creater.strategy.create.readme;
+
+import cn.hutool.core.date.DateUtil;
+import com.jfinal.kit.Kv;
+import org.opsli.common.utils.HumpUtil;
+import org.opsli.common.utils.Props;
+import org.opsli.common.utils.WrapperUtil;
+import org.opsli.common.utils.ZipUtils;
+import org.opsli.core.creater.strategy.create.CodeBuilder;
+import org.opsli.core.creater.utils.EnjoyUtil;
+import org.opsli.modulars.creater.column.wrapper.CreaterTableColumnModel;
+import org.opsli.modulars.creater.createrlogs.wrapper.CreaterBuilderModel;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.core.creater.strategy.create.backend
+ * @Author: Parker
+ * @CreateTime: 2020-11-20 17:30
+ * @Description: ReadMe 构建器
+ */
+public enum ReadMeBuilder {
+
+ INSTANCE;
+
+ /**
+ * 生成 ReadMe
+ * @param builderModelTmp
+ * @return
+ */
+ public Map
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package org.opsli.core.creater.strategy.sync;
import org.apache.commons.lang3.StringUtils;
+import org.opsli.common.enums.DictType;
import org.opsli.common.utils.Props;
import org.opsli.core.creater.exception.CreaterException;
import org.opsli.core.creater.msg.CreaterMsg;
@@ -34,10 +50,6 @@ public class MySQLSyncBuilder implements SyncStrategy {
/** 字符格式 */
private static final String CHARSET = "utf8mb4";
- /** 是 */
- private static final char YES = '1';
- /** 否 */
- private static final char NO = '0';
/** 排除表 */
private static final List
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package org.opsli.core.creater.strategy.sync;
import org.opsli.modulars.creater.table.wrapper.CreaterTableAndColumnModel;
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/core/creater/strategy/sync/mysql/entity/FieldTypeAttribute.java b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/core/creater/strategy/sync/mysql/entity/FieldTypeAttribute.java
index bc53bc61..d1665c19 100644
--- a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/core/creater/strategy/sync/mysql/entity/FieldTypeAttribute.java
+++ b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/core/creater/strategy/sync/mysql/entity/FieldTypeAttribute.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package org.opsli.core.creater.strategy.sync.mysql.entity;
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/core/creater/strategy/sync/mysql/enums/MySQLSyncColumnType.java b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/core/creater/strategy/sync/mysql/enums/MySQLSyncColumnType.java
index 52fd5622..c6edd7f7 100644
--- a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/core/creater/strategy/sync/mysql/enums/MySQLSyncColumnType.java
+++ b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/core/creater/strategy/sync/mysql/enums/MySQLSyncColumnType.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
package org.opsli.core.creater.strategy.sync.mysql.enums;
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/core/creater/utils/EnjoyUtil.java b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/core/creater/utils/EnjoyUtil.java
new file mode 100644
index 00000000..d9824195
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/core/creater/utils/EnjoyUtil.java
@@ -0,0 +1,52 @@
+package org.opsli.core.creater.utils;
+
+import cn.hutool.core.io.IoUtil;
+import com.jfinal.kit.Kv;
+import com.jfinal.template.Engine;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.io.ClassPathResource;
+
+import java.io.File;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+/***
+ * jfinal魔板引擎
+ * @author dufuzhong
+ */
+@Slf4j
+public final class EnjoyUtil {
+
+ private static final String BASE_PATH = "/tpl";
+
+ /**
+ * 根据具体魔板生成文件
+ * @param templateFileName 模板文件名称
+ * @param kv 渲染参数
+ * @return
+ */
+ public static String render(String templateFileName, Kv kv) {
+
+ //ClassPathResource resource = new ClassPathResource(templateFileName);
+ // (InputStream inputStream = resource.getInputStream())
+ String str = "";
+ ClassPathResource resource = new ClassPathResource(BASE_PATH + templateFileName);
+ try (InputStream inputStream = resource.getInputStream()){
+ String readTpl = IoUtil.read(inputStream, StandardCharsets.UTF_8);
+
+ str = Engine.use()
+ // 开启预热模式
+ .setDevMode(true)
+ .getTemplateByString(readTpl)
+ .renderToString(kv);
+
+ } catch (Exception e) {
+ log.error("load config file {} error", templateFileName, e);
+ }
+ return str;
+ }
+
+
+
+ private EnjoyUtil(){}
+}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/column/entity/CreaterTableColumn.java b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/column/entity/CreaterTableColumn.java
index 3e9e4ebe..61a9c971 100644
--- a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/column/entity/CreaterTableColumn.java
+++ b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/column/entity/CreaterTableColumn.java
@@ -49,22 +49,22 @@ public class CreaterTableColumn extends BaseEntity {
private String fieldComments;
/** 是否主键 */
- private Character izPk;
+ private String izPk;
/** 是否可为空 */
- private Character izNull;
+ private String izNotNull;
/** 是否列表字段 */
- private Character izShowList;
+ private String izShowList;
/** 是否表单显示 */
- private Character izShowForm;
+ private String izShowForm;
/** Java字段类型 */
private String javaType;
/** 字段生成方案（文本框、文本域、字典选择） */
- private Character showType;
+ private String showType;
/** 字典类型编号 */
private String dictTypeCode;
@@ -75,6 +75,9 @@ public class CreaterTableColumn extends BaseEntity {
/** 验证类别 */
private String validateType;
+ /** 检索类别 */
+ private String queryType;
+
// ========================================
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/column/wrapper/CreaterTableColumnModel.java b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/column/wrapper/CreaterTableColumnModel.java
index 6e57d12e..1e521ce7 100644
--- a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/column/wrapper/CreaterTableColumnModel.java
+++ b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/column/wrapper/CreaterTableColumnModel.java
@@ -15,7 +15,6 @@
*/
package org.opsli.modulars.creater.column.wrapper;
-import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -90,7 +89,7 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgsLenMax(1)
- private Character izPk;
+ private String izPk;
/** 是否可为空 */
@ApiModelProperty(value = "是否可为空")
@@ -98,7 +97,7 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgsLenMax(1)
- private Character izNull;
+ private String izNotNull;
/** 是否列表显示 */
@ApiModelProperty(value = "是否列表显示")
@@ -106,7 +105,7 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgsLenMax(1)
- private Character izShowList;
+ private String izShowList;
/** 是否表单显示 */
@ApiModelProperty(value = "是否表单显示")
@@ -114,7 +113,7 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ExcelInfo(dictType = "no_yes")
// 验证器
@ValidationArgsLenMax(1)
- private Character izShowForm;
+ private String izShowForm;
/** Java字段类型 */
@ApiModelProperty(value = "Java字段类型")
@@ -131,7 +130,7 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ExcelInfo(dictType = "show_type")
// 验证器
@ValidationArgsLenMax(1)
- private Character showType;
+ private String showType;
/** 字典类型编号 */
@ApiModelProperty(value = "字典类型编号")
@@ -160,4 +159,13 @@ public class CreaterTableColumnModel extends ApiWrapper {
@ValidationArgsLenMax(500)
private String validateType;
+ /** 检索类别 */
+ @ApiModelProperty(value = "检索类别")
+ @ExcelProperty(value = "检索类别", order = 16)
+ @ExcelInfo
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_GENERAL})
+ @ValidationArgsLenMax(100)
+ private String queryType;
+
}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/createrlogs/api/CreaterLogsApi.java b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/createrlogs/api/CreaterLogsApi.java
new file mode 100644
index 00000000..fa82749e
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/createrlogs/api/CreaterLogsApi.java
@@ -0,0 +1,65 @@
+/**
+ * Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.modulars.creater.createrlogs.api;
+
+import org.opsli.api.base.result.ResultVo;
+import org.opsli.modulars.creater.createrlogs.wrapper.CreaterLogsModel;
+import org.opsli.modulars.creater.table.wrapper.CreaterTableAndColumnModel;
+import org.opsli.modulars.creater.table.wrapper.CreaterTableModel;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.modulars.test.web
+ * @Author: Parker
+ * @CreateTime: 2020-09-13 17:40
+ * @Description: 代码生成器 - 生成记录 API
+ *
+ * 对外 API 直接 暴露 @GetMapping 或者 @PostMapping
+ * 对内也推荐 单机版 不需要设置 Mapping 但是调用方法得从Controller写起
+ *
+ * 这样写法虽然比较绕，但是当单体项目想要改造微服务架构时 时非常容易的
+ *
+ *
+ */
+public interface CreaterLogsApi {
+
+ /** 标题 */
+ String TITLE = "代码生成器 - 生成记录";
+
+ /**
+ * 生成记录 查一条
+ * @param tableId 模型
+ * @return ResultVo
+ */
+ @GetMapping("/getByTableId")
+ ResultVo
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.modulars.creater.createrlogs.entity;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.opsli.core.base.entity.BaseEntity;
+
+/**
+ * @BelongsProject: opsli-boot
+ * @Author: Parker
+ * @CreateTime: 2020-11-15 17:33
+ * @Description: 代码生成器 - 生成日志 （便于二次生成时查看）
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CreaterLogs extends BaseEntity {
+
+ /** 归属表ID */
+ private String tableId;
+
+
+ /** 包名 */
+ private String packageName;
+
+ /** 模块名 */
+ private String moduleName;
+
+ /** 子模块名 */
+ private String subModuleName;
+
+ /** 代码标题 */
+ private String codeTitle;
+
+ /** 代码标题简介 */
+ private String codeTitleBrief;
+
+ /** 作者名 */
+ private String authorName;
+
+
+ // ========================================
+
+}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/createrlogs/mapper/CreaterLogsMapper.java b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/createrlogs/mapper/CreaterLogsMapper.java
new file mode 100644
index 00000000..e49a65d1
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/createrlogs/mapper/CreaterLogsMapper.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.modulars.creater.createrlogs.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.opsli.modulars.creater.createrlogs.entity.CreaterLogs;
+
+
+/**
+ * @BelongsProject: opsli-boot
+ * @Author: Parker
+ * @CreateTime: 2020-09-17 13:01
+ * @Description: 代码生成器 - 生成日志 Mapper
+ */
+@Mapper
+public interface CreaterLogsMapper extends BaseMapper
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.modulars.creater.createrlogs.service;
+
+import org.opsli.core.base.service.interfaces.CrudServiceInterface;
+import org.opsli.modulars.creater.createrlogs.entity.CreaterLogs;
+import org.opsli.modulars.creater.createrlogs.wrapper.CreaterLogsModel;
+
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * @BelongsProject: opsli-boot
+ * @Author: Parker
+ * @CreateTime: 2020-09-17 13:07
+ * @Description: 代码生成器 - 表 接口
+ */
+public interface ICreateLogsService extends CrudServiceInterface
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.modulars.creater.createrlogs.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.opsli.common.utils.WrapperUtil;
+import org.opsli.core.base.service.impl.CrudServiceImpl;
+import org.opsli.core.creater.exception.CreaterException;
+import org.opsli.core.creater.msg.CreaterMsg;
+import org.opsli.core.creater.strategy.create.CodeBuilder;
+import org.opsli.core.persistence.querybuilder.GenQueryBuilder;
+import org.opsli.core.persistence.querybuilder.QueryBuilder;
+import org.opsli.modulars.creater.column.service.ITableColumnService;
+import org.opsli.modulars.creater.column.wrapper.CreaterTableColumnModel;
+import org.opsli.modulars.creater.createrlogs.entity.CreaterLogs;
+import org.opsli.modulars.creater.createrlogs.mapper.CreaterLogsMapper;
+import org.opsli.modulars.creater.createrlogs.service.ICreateLogsService;
+import org.opsli.modulars.creater.createrlogs.wrapper.CreaterBuilderModel;
+import org.opsli.modulars.creater.createrlogs.wrapper.CreaterLogsModel;
+import org.opsli.modulars.creater.table.service.ITableService;
+import org.opsli.modulars.creater.table.wrapper.CreaterTableAndColumnModel;
+import org.opsli.modulars.creater.table.wrapper.CreaterTableModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * @BelongsProject: opsli-boot
+ * @Author: Parker
+ * @CreateTime: 2020-09-16 17:34
+ * @Description: 代码生成器 - 表 接口实现类
+ */
+@Service
+public class CreateLogsServiceImpl extends CrudServiceImpl
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.modulars.creater.createrlogs.web;
+
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.opsli.api.base.result.ResultVo;
+import org.opsli.common.annotation.ApiRestController;
+import org.opsli.common.annotation.EnableLog;
+import org.opsli.common.exception.ServiceException;
+import org.opsli.common.utils.WrapperUtil;
+import org.opsli.core.base.concroller.BaseRestController;
+import org.opsli.core.creater.exception.CreaterException;
+import org.opsli.core.creater.msg.CreaterMsg;
+import org.opsli.core.creater.strategy.sync.util.SQLSyncUtil;
+import org.opsli.core.msg.CoreMsg;
+import org.opsli.core.persistence.Page;
+import org.opsli.core.persistence.querybuilder.QueryBuilder;
+import org.opsli.core.persistence.querybuilder.WebQueryBuilder;
+import org.opsli.modulars.creater.column.service.ITableColumnService;
+import org.opsli.modulars.creater.column.wrapper.CreaterTableColumnModel;
+import org.opsli.modulars.creater.createrlogs.api.CreaterLogsApi;
+import org.opsli.modulars.creater.createrlogs.entity.CreaterLogs;
+import org.opsli.modulars.creater.createrlogs.service.ICreateLogsService;
+import org.opsli.modulars.creater.createrlogs.wrapper.CreaterLogsModel;
+import org.opsli.modulars.creater.importable.ImportTableUtil;
+import org.opsli.modulars.creater.table.api.TableApi;
+import org.opsli.modulars.creater.table.entity.CreaterTable;
+import org.opsli.modulars.creater.table.service.ITableService;
+import org.opsli.modulars.creater.table.wrapper.CreaterTableAndColumnModel;
+import org.opsli.modulars.creater.table.wrapper.CreaterTableModel;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+
+/**
+ * @BelongsProject: opsli-boot
+ * @Author: Parker
+ * @CreateTime: 2020-09-13 17:40
+ * @Description: 代码生成器 - 表
+ */
+@Slf4j
+@ApiRestController("/creater/logs")
+public class CreaterLogsRestController extends BaseRestController
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.modulars.creater.createrlogs.wrapper;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.opsli.api.base.warpper.ApiWrapper;
+import org.opsli.common.annotation.validation.ValidationArgs;
+import org.opsli.common.annotation.validation.ValidationArgsLenMax;
+import org.opsli.common.enums.ValiArgsType;
+import org.opsli.modulars.creater.table.wrapper.CreaterTableAndColumnModel;
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.modulars.creater.createrlogs.wrapper
+ * @Author: Parker
+ * @CreateTime: 2020-09-16 17:33
+ * @Description: 代码生成器 - 生成日志+代码模型
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CreaterBuilderModel extends ApiWrapper {
+
+
+ /** 归属表ID */
+ private String tableId;
+
+ /** 包名 */
+ private String packageName;
+
+ /** 模块名 */
+ private String moduleName;
+
+ /** 子模块名 */
+ private String subModuleName;
+
+ /** 代码标题 */
+ private String codeTitle;
+
+ /** 代码标题简介 */
+ private String codeTitleBrief;
+
+ /** 作者名 */
+ private String authorName;
+
+ /** 代码模型 */
+ private CreaterTableAndColumnModel model;
+
+}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/createrlogs/wrapper/CreaterLogsModel.java b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/createrlogs/wrapper/CreaterLogsModel.java
new file mode 100644
index 00000000..1842a4ba
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/createrlogs/wrapper/CreaterLogsModel.java
@@ -0,0 +1,96 @@
+/**
+ * Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.modulars.creater.createrlogs.wrapper;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.opsli.api.base.warpper.ApiWrapper;
+import org.opsli.common.annotation.validation.ValidationArgs;
+import org.opsli.common.annotation.validation.ValidationArgsLenMax;
+import org.opsli.common.enums.ValiArgsType;
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.modulars.creater.createrlogs.wrapper
+ * @Author: Parker
+ * @CreateTime: 2020-09-16 17:33
+ * @Description: 代码生成器 - 生成日志 （便于二次生成时查看）
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CreaterLogsModel extends ApiWrapper {
+
+
+ /** 归属表ID */
+ @ApiModelProperty(value = "归属表ID")
+ @ExcelIgnore
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_NOT_NULL})
+ @ValidationArgsLenMax(19)
+ private String tableId;
+
+
+ /** 包名 */
+ @ApiModelProperty(value = "包名")
+ @ExcelIgnore
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_NOT_NULL})
+ @ValidationArgsLenMax(255)
+ private String packageName;
+
+ /** 模块名 */
+ @ApiModelProperty(value = "模块名")
+ @ExcelIgnore
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_NOT_NULL})
+ @ValidationArgsLenMax(40)
+ private String moduleName;
+
+ /** 子模块名 */
+ @ApiModelProperty(value = "子模块名")
+ @ExcelIgnore
+ // 验证器
+ @ValidationArgsLenMax(40)
+ private String subModuleName;
+
+
+ /** 代码标题 */
+ @ApiModelProperty(value = "代码标题")
+ @ExcelIgnore
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_NOT_NULL})
+ @ValidationArgsLenMax(100)
+ private String codeTitle;
+
+ /** 代码标题简介 */
+ @ApiModelProperty(value = "代码标题简介")
+ @ExcelIgnore
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_NOT_NULL})
+ @ValidationArgsLenMax(100)
+ private String codeTitleBrief;
+
+ /** 作者名 */
+ @ApiModelProperty(value = "作者名")
+ @ExcelIgnore
+ // 验证器
+ @ValidationArgs({ValiArgsType.IS_NOT_NULL})
+ @ValidationArgsLenMax(64)
+ private String authorName;
+
+}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/importable/entity/DatabaseColumn.java b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/importable/entity/DatabaseColumn.java
index 3b5bfff6..0d6f5a37 100644
--- a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/importable/entity/DatabaseColumn.java
+++ b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/importable/entity/DatabaseColumn.java
@@ -54,10 +54,10 @@ public class DatabaseColumn {
private String columnComment;
/** 是否主键 */
- private Character izPk;
+ private String izPk;
/** 是否可为空 */
- private Character izNull;
+ private String izNotNull;
// ========================================
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/importable/mapper/xml/MySQLDatabaseTableMapper.xml b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/importable/mapper/xml/MySQLDatabaseTableMapper.xml
index 46690ffc..31c13bcf 100644
--- a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/importable/mapper/xml/MySQLDatabaseTableMapper.xml
+++ b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/importable/mapper/xml/MySQLDatabaseTableMapper.xml
@@ -27,7 +27,7 @@
NUMERIC_PRECISION AS columnPrecision,
NUMERIC_SCALE AS columnScale,
COLUMN_COMMENT AS columnComment,
- IF( IS_NULLABLE = 'NO', '1', '0' ) AS izNull,
+ IF( IS_NULLABLE = 'NO', '1', '0' ) AS izNotNull,
IF( COLUMN_KEY = 'PRI', '1', '0' ) AS izPk
FROM
INFORMATION_SCHEMA.COLUMNS
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/table/api/TableApi.java b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/table/api/TableApi.java
index 227c6f7f..c54ac459 100644
--- a/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/table/api/TableApi.java
+++ b/opsli-modulars/opsli-modulars-creater/src/main/java/org/opsli/modulars/creater/table/api/TableApi.java
@@ -49,7 +49,7 @@ public interface TableApi {
String TITLE = "代码生成器 - 表";
/**
- * 租户 查一条
+ * 表 查一条
* @param model 模型
* @return ResultVo
*/
@@ -57,7 +57,7 @@ public interface TableApi {
ResultVo
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+#if(data.subModuleName != null && data.subModuleName != "")
+package #(apiPath).web.#(data.moduleName+"."+data.subModuleName);
+#else
+package #(apiPath).web.#(data.moduleName);
+#end
+
+import #(apiPath).base.result.ResultVo;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+#if(data.subModuleName != null && data.subModuleName != "")
+import #(apiPath).wrapper.#(data.moduleName+"."+data.subModuleName).#(data.model.tableName)Model;
+#else
+import #(apiPath).wrapper.#(data.moduleName).#(data.model.tableName)Model;
+#end
+
+
+/**
+ * @BelongsProject: opsli-boot
+#if(data.subModuleName != null && data.subModuleName != "")
+ * @BelongsPackage: #(apiPath).web.#(data.moduleName+"."+data.subModuleName)
+#else
+ * @BelongsPackage: #(apiPath).web.#(data.moduleName)
+#end
+ * @Author: #(data.authorName)
+ * @CreateTime: #(currTime)
+ * @Description: #(data.codeTitle)
+ *
+ * 对外 API 直接 暴露 @GetMapping 或者 @PostMapping
+ * 对内也推荐 单机版 不需要设置 Mapping 但是调用方法得从Controller写起
+ *
+ * 这样写法虽然比较绕，但是当单体项目想要改造微服务架构时 时非常容易的
+ *
+ *
+ */
+public interface #(data.model.tableName)RestApi {
+
+ /** 标题 */
+ String TITLE = "#(data.codeTitleBrief)";
+
+ /**
+ * #(data.codeTitle) 查一条
+ * @param model 模型
+ * @return ResultVo
+ */
+ @GetMapping("/get")
+ ResultVo<#(data.model.tableName)Model> get(#(data.model.tableName)Model model);
+
+ /**
+ * #(data.codeTitle) 查询分页
+ * @param pageNo 当前页
+ * @param pageSize 每页条数
+ * @param request request
+ * @return ResultVo
+ */
+ @GetMapping("/findPage")
+ ResultVo findPage(
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest request
+ );
+
+ /**
+ * #(data.codeTitle) 新增
+ * @param model 模型
+ * @return ResultVo
+ */
+ @PostMapping("/insert")
+ ResultVo insert(@RequestBody #(data.model.tableName)Model model);
+
+ /**
+ * #(data.codeTitle) 修改
+ * @param model 模型
+ * @return ResultVo
+ */
+ @PostMapping("/update")
+ ResultVo update(@RequestBody #(data.model.tableName)Model model);
+
+ /**
+ * #(data.codeTitle) 删除
+ * @param id ID
+ * @return ResultVo
+ */
+ @PostMapping("/del")
+ ResultVo del(String id);
+
+ /**
+ * #(data.codeTitle) 批量删除
+ * @param ids ID 数组
+ * @return ResultVo
+ */
+ @PostMapping("/delAll")
+ ResultVo delAll(String[] ids);
+
+ /**
+ * #(data.codeTitle) Excel 导出
+ * @param request request
+ * @param response response
+ * @return ResultVo
+ */
+ @GetMapping("/exportExcel")
+ ResultVo exportExcel(HttpServletRequest request, HttpServletResponse response);
+
+ /**
+ * #(data.codeTitle) Excel 导入
+ * @param request 文件流 request
+ * @return ResultVo
+ */
+ @GetMapping("/exportImport")
+ ResultVo excelImport(MultipartHttpServletRequest request);
+
+ /**
+ * #(data.codeTitle) Excel 下载导入模版
+ * @param response response
+ * @return ResultVo
+ */
+ @GetMapping("/exportImport/template")
+ ResultVo importTemplate(HttpServletResponse response);
+
+}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/entity/TemplateEntity.html b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/entity/TemplateEntity.html
new file mode 100644
index 00000000..d2f0cee2
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/entity/TemplateEntity.html
@@ -0,0 +1,72 @@
+/**
+ * Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+#if(data.subModuleName != null && data.subModuleName != "")
+package #(data.packageName+"."+data.moduleName+"."+data.subModuleName).entity;
+#else
+package #(data.packageName+"."+data.moduleName).entity;
+#end
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.opsli.core.base.entity.BaseEntity;
+
+/**
+ * @BelongsProject: opsli-boot
+#if(data.subModuleName != null && data.subModuleName != "")
+ * @BelongsPackage: #(data.packageName+"."+data.moduleName+"."+data.subModuleName).entity
+#else
+ * @BelongsPackage: #(data.packageName+"."+data.moduleName).entity
+#end
+ * @Author: #(data.authorName)
+ * @CreateTime: #(currTime)
+ * @Description: #(data.codeTitle)
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class #(data.model.tableName) extends BaseEntity {
+
+
+ #for(column : data.model.columnList)
+ ### 不等于 删除字段 和 不等于 租户字段放入上边
+ #if(column.fieldName != "deleted" && column.fieldName != "tenantId")
+ /** #(column.fieldComments) */
+ #if(!column.izNotNull)
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
+ #end
+ private #(column.javaType) #(column.fieldName);
+
+ #end
+ #end
+
+ // ========================================
+
+ ### 专门处理 删除字段 和 租户字段
+ #for(column : data.model.columnList)
+ #if(column.fieldName == "deleted")
+ /** 逻辑删除字段 */
+ private Integer deleted;
+ #else if(column.fieldName == "tenantId")
+ /** 多租户字段 */
+ private String tenantId;
+ #end
+
+ #end
+
+}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/mapper/TemplateMapper.html b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/mapper/TemplateMapper.html
new file mode 100644
index 00000000..8facce5f
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/mapper/TemplateMapper.html
@@ -0,0 +1,45 @@
+/**
+* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
+*
+* Licensed under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License. You may obtain a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations under
+* the License.
+*/
+#if(data.subModuleName != null && data.subModuleName != "")
+package #(data.packageName+"."+data.moduleName+"."+data.subModuleName).mapper;
+#else
+package #(data.packageName+"."+data.moduleName).mapper;
+#end
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+#if(data.subModuleName != null && data.subModuleName != "")
+import #(data.packageName+"."+data.moduleName+"."+data.subModuleName).entity.#(data.model.tableName);
+#else
+import #(data.packageName+"."+data.moduleName).entity.#(data.model.tableName);
+#end
+
+/**
+* @BelongsProject: opsli-boot
+#if(data.subModuleName != null && data.subModuleName != "")
+* @BelongsPackage: #(data.packageName+"."+data.moduleName+"."+data.subModuleName).mapper
+#else
+* @BelongsPackage: #(data.packageName+"."+data.moduleName).mapper
+#end
+* @Author: #(data.authorName)
+* @CreateTime: #(currTime)
+* @Description: #(data.codeTitle) Mapper
+*/
+@Mapper
+public interface #(data.model.tableName)Mapper extends BaseMapper<#(data.model.tableName)> {
+
+}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/mapper/xml/TemplateMapperXML.html b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/mapper/xml/TemplateMapperXML.html
new file mode 100644
index 00000000..9aa68e99
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/mapper/xml/TemplateMapperXML.html
@@ -0,0 +1,10 @@
+
+
+#if(data.subModuleName != null && data.subModuleName != "")
+
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+#if(data.subModuleName != null && data.subModuleName != "")
+package #(apiPath).wrapper.#(data.moduleName+"."+data.subModuleName);
+#else
+package #(apiPath).wrapper.#(data.moduleName);
+#end
+
+import java.util.Date;
+import com.alibaba.excel.annotation.ExcelProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import #(apiPath).base.warpper.ApiWrapper;
+import org.opsli.common.annotation.validation.ValidationArgs;
+import org.opsli.common.annotation.validation.ValidationArgsLenMax;
+import org.opsli.common.enums.ValiArgsType;
+import org.opsli.plugins.excel.annotation.ExcelInfo;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * @BelongsProject: opsli-boot
+#if(data.subModuleName != null && data.subModuleName != "")
+ * @BelongsPackage: #(apiPath).wrapper.#(data.moduleName+"."+data.subModuleName)
+#else
+ * @BelongsPackage: #(apiPath).wrapper.#(data.moduleName)
+#end
+ * @Author: #(data.authorName)
+ * @CreateTime: #(currTime)
+ * @Description: #(data.codeTitle)
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class #(data.model.tableName)Model extends ApiWrapper {
+
+ #for(column : data.model.columnList)
+ ### 不等于 删除字段 和 不等于 租户字段放入上边
+ #if(column.fieldName != "deleted" && column.fieldName != "tenantId")
+ /** #(column.fieldComments) */
+ @ApiModelProperty(value = "#(column.fieldComments)")
+ @ExcelProperty(value = "#(column.fieldComments)", order = #(column.sort))
+ #if(column.dictTypeCode != null && column.dictTypeCode != "")
+ @ExcelInfo( dictType = "#(column.dictTypeCode)" )
+ #else
+ @ExcelInfo
+ #end
+ // 验证器
+ #if(column.validateType != null && column.validateType != "")
+ @ValidationArgs({#(column.validateType)})
+ #end
+ #if(column.fieldLength != null && column.fieldLength > 0)
+ #if(column.fieldPrecision != null && column.fieldPrecision > 0)
+ @ValidationArgsLenMax(#(column.fieldLength+column.fieldPrecision))
+ #else
+ @ValidationArgsLenMax(#(column.fieldLength))
+ #end
+ #end
+ #if(column.javaType == "Date")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ #end
+ private #(column.javaType) #(column.fieldName);
+
+ #end
+ #end
+
+
+}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/service/TemplateService.html b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/service/TemplateService.html
new file mode 100644
index 00000000..5bca6cc4
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/service/TemplateService.html
@@ -0,0 +1,46 @@
+/**
+* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
+*
+* Licensed under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License. You may obtain a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations under
+* the License.
+*/
+#if(data.subModuleName != null && data.subModuleName != "")
+package #(data.packageName+"."+data.moduleName+"."+data.subModuleName).service;
+#else
+package #(data.packageName+"."+data.moduleName).service;
+#end
+
+import org.opsli.core.base.service.interfaces.CrudServiceInterface;
+
+
+#if(data.subModuleName != null && data.subModuleName != "")
+import #(data.packageName+"."+data.moduleName+"."+data.subModuleName).entity.#(data.model.tableName);
+import #(apiPath).wrapper.#(data.moduleName+"."+data.subModuleName).#(data.model.tableName)Model;
+#else
+import #(data.packageName+"."+data.moduleName).entity.#(data.model.tableName);
+import #(apiPath).wrapper.#(data.moduleName).#(data.model.tableName)Model;
+#end
+
+/**
+* @BelongsProject: opsli-boot
+#if(data.subModuleName != null && data.subModuleName != "")
+* @BelongsPackage: #(data.packageName+"."+data.moduleName+"."+data.subModuleName).service
+#else
+* @BelongsPackage: #(data.packageName+"."+data.moduleName).service
+#end
+* @Author: #(data.authorName)
+* @CreateTime: #(currTime)
+* @Description: #(data.codeTitle) Service
+*/
+public interface I#(data.model.tableName)Service extends CrudServiceInterface<#(data.model.tableName), #(data.model.tableName)Model> {
+
+}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/service/impl/TemplateServiceImpl.html b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/service/impl/TemplateServiceImpl.html
new file mode 100644
index 00000000..528e53bb
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/service/impl/TemplateServiceImpl.html
@@ -0,0 +1,59 @@
+/**
+* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
+*
+* Licensed under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License. You may obtain a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations under
+* the License.
+*/
+#if(data.subModuleName != null && data.subModuleName != "")
+package #(data.packageName+"."+data.moduleName+"."+data.subModuleName).service.impl;
+#else
+package #(data.packageName+"."+data.moduleName).service.impl;
+#end
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.opsli.core.base.service.impl.CrudServiceImpl;
+
+#if(data.subModuleName != null && data.subModuleName != "")
+import #(data.packageName+"."+data.moduleName+"."+data.subModuleName).entity.#(data.model.tableName);
+import #(apiPath).wrapper.#(data.moduleName+"."+data.subModuleName).#(data.model.tableName)Model;
+import #(data.packageName+"."+data.moduleName+"."+data.subModuleName).service.I#(data.model.tableName)Service;
+import #(data.packageName+"."+data.moduleName+"."+data.subModuleName).mapper.#(data.model.tableName)Mapper;
+#else
+import #(data.packageName+"."+data.moduleName).entity.#(data.model.tableName);
+import #(apiPath).wrapper.#(data.moduleName).#(data.model.tableName)Model;
+import #(data.packageName+"."+data.moduleName).service.I#(data.model.tableName)Service;
+import #(data.packageName+"."+data.moduleName).mapper.#(data.model.tableName)Mapper;
+#end
+
+
+/**
+* @BelongsProject: opsli-boot
+#if(data.subModuleName != null && data.subModuleName != "")
+* @BelongsPackage: #(data.packageName+"."+data.moduleName+"."+data.subModuleName).service.impl
+#else
+* @BelongsPackage: #(data.packageName+"."+data.moduleName).service.impl
+#end
+* @Author: #(data.authorName)
+* @CreateTime: #(currTime)
+* @Description: #(data.codeTitle) Service Impl
+*/
+@Service
+public class #(data.model.tableName)ServiceImpl extends CrudServiceImpl<#(data.model.tableName)Mapper, #(data.model.tableName), #(data.model.tableName)Model>
+ implements I#(data.model.tableName)Service {
+
+ @Autowired(required = false)
+ private #(data.model.tableName)Mapper mapper;
+
+}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/web/TemplateRestController.html b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/web/TemplateRestController.html
new file mode 100644
index 00000000..783c7174
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/backend/web/TemplateRestController.html
@@ -0,0 +1,242 @@
+/**
+* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
+*
+* Licensed under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License. You may obtain a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations under
+* the License.
+*/
+#if(data.subModuleName != null && data.subModuleName != "")
+package #(data.packageName+"."+data.moduleName+"."+data.subModuleName).web;
+#else
+package #(data.packageName+"."+data.moduleName).web;
+#end
+
+import org.opsli.core.base.service.interfaces.CrudServiceInterface;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import #(apiPath).base.result.ResultVo;
+import org.opsli.common.annotation.ApiRestController;
+import org.opsli.common.annotation.EnableLog;
+import org.opsli.core.base.concroller.BaseRestController;
+import org.opsli.core.persistence.Page;
+import org.opsli.core.persistence.querybuilder.QueryBuilder;
+import org.opsli.core.persistence.querybuilder.WebQueryBuilder;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+#if(data.subModuleName != null && data.subModuleName != "")
+import #(data.packageName+"."+data.moduleName+"."+data.subModuleName).entity.#(data.model.tableName);
+import #(apiPath).wrapper.#(data.moduleName+"."+data.subModuleName).#(data.model.tableName)Model;
+import #(data.packageName+"."+data.moduleName+"."+data.subModuleName).service.I#(data.model.tableName)Service;
+import #(apiPath).web.#(data.moduleName+"."+data.subModuleName).#(data.model.tableName)RestApi;
+#else
+import #(data.packageName+"."+data.moduleName).entity.#(data.model.tableName);
+import #(apiPath).wrapper.#(data.moduleName).#(data.model.tableName)Model;
+import #(data.packageName+"."+data.moduleName).service.I#(data.model.tableName)Service;
+import #(apiPath).web.#(data.moduleName).#(data.model.tableName)RestApi;
+#end
+
+/**
+* @BelongsProject: opsli-boot
+#if(data.subModuleName != null && data.subModuleName != "")
+* @BelongsPackage: #(data.packageName+"."+data.moduleName+"."+data.subModuleName).web
+#else
+* @BelongsPackage: #(data.packageName+"."+data.moduleName).web
+#end
+* @Author: #(data.authorName)
+* @CreateTime: #(currTime)
+* @Description: #(data.codeTitle) Controller
+*/
+@Slf4j
+#if(data.subModuleName != null && data.subModuleName != "")
+@ApiRestController("/#(data.moduleName)/#(data.subModuleName)")
+#else
+@ApiRestController("/#(data.moduleName)")
+#end
+public class #(data.model.tableName)RestController extends BaseRestController<#(data.model.tableName), #(data.model.tableName)Model, I#(data.model.tableName)Service>
+ implements #(data.model.tableName)RestApi {
+
+
+ /**
+ * #(data.codeTitleBrief) 查一条
+ * @param model 模型
+ * @return ResultVo
+ */
+ @ApiOperation(value = "获得单条#(data.codeTitleBrief)", notes = "获得单条#(data.codeTitleBrief) - ID")
+ #if(data.subModuleName != null && data.subModuleName != "")
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_#(data.subModuleName.toLowerCase())_select")
+ #else
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_select")
+ #end
+ @Override
+ public ResultVo<#(data.model.tableName)Model> get(#(data.model.tableName)Model model) {
+ // 如果系统内部调用 则直接查数据库
+ if(model != null && model.getIzApi() != null && model.getIzApi()){
+ model = IService.get(model);
+ }
+ return ResultVo.success(model);
+ }
+
+ /**
+ * #(data.codeTitleBrief) 查询分页
+ * @param pageNo 当前页
+ * @param pageSize 每页条数
+ * @param request request
+ * @return ResultVo
+ */
+ @ApiOperation(value = "获得分页数据", notes = "获得分页数据 - 查询构造器")
+ #if(data.subModuleName != null && data.subModuleName != "")
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_#(data.subModuleName.toLowerCase())_select")
+ #else
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_select")
+ #end
+ @Override
+ public ResultVo findPage(Integer pageNo, Integer pageSize, HttpServletRequest request) {
+
+ QueryBuilder<#(data.model.tableName)> queryBuilder = new WebQueryBuilder<>(#(data.model.tableName).class, request.getParameterMap());
+ Page<#(data.model.tableName), #(data.model.tableName)Model> page = new Page<>(pageNo, pageSize);
+ page.setQueryWrapper(queryBuilder.build());
+ page = IService.findPage(page);
+
+ return ResultVo.success(page.getBootstrapData());
+ }
+
+ /**
+ * #(data.codeTitleBrief) 新增
+ * @param model 模型
+ * @return ResultVo
+ */
+ @ApiOperation(value = "新增#(data.codeTitleBrief)数据", notes = "新增#(data.codeTitleBrief)数据")
+ #if(data.subModuleName != null && data.subModuleName != "")
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_#(data.subModuleName.toLowerCase())_insert")
+ #else
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_insert")
+ #end
+ @EnableLog
+ @Override
+ public ResultVo insert(#(data.model.tableName)Model model) {
+ // 调用新增方法
+ IService.insert(model);
+ return ResultVo.success("新增#(data.codeTitleBrief)成功");
+ }
+
+ /**
+ * #(data.codeTitleBrief) 修改
+ * @param model 模型
+ * @return ResultVo
+ */
+ @ApiOperation(value = "修改#(data.codeTitleBrief)数据", notes = "修改#(data.codeTitleBrief)数据")
+ #if(data.subModuleName != null && data.subModuleName != "")
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_#(data.subModuleName.toLowerCase())_update")
+ #else
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_update")
+ #end
+ @EnableLog
+ @Override
+ public ResultVo update(#(data.model.tableName)Model model) {
+ // 调用修改方法
+ IService.update(model);
+ return ResultVo.success("修改#(data.codeTitleBrief)成功");
+ }
+
+
+ /**
+ * #(data.codeTitleBrief) 删除
+ * @param id ID
+ * @return ResultVo
+ */
+ @ApiOperation(value = "删除#(data.codeTitleBrief)数据", notes = "删除#(data.codeTitleBrief)数据")
+ #if(data.subModuleName != null && data.subModuleName != "")
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_#(data.subModuleName.toLowerCase())_update")
+ #else
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_update")
+ #end
+ @EnableLog
+ @Override
+ public ResultVo del(String id){
+ IService.delete(id);
+ return ResultVo.success("删除#(data.codeTitleBrief)成功");
+ }
+
+ /**
+ * #(data.codeTitleBrief) 批量删除
+ * @param ids ID 数组
+ * @return ResultVo
+ */
+ @ApiOperation(value = "批量删除#(data.codeTitleBrief)数据", notes = "批量删除#(data.codeTitleBrief)数据")
+ #if(data.subModuleName != null && data.subModuleName != "")
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_#(data.subModuleName.toLowerCase())_update")
+ #else
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_update")
+ #end
+ @EnableLog
+ @Override
+ public ResultVo delAll(String[] ids){
+ IService.deleteAll(ids);
+ return ResultVo.success("批量删除#(data.codeTitleBrief)成功");
+ }
+
+
+ /**
+ * #(data.codeTitleBrief) Excel 导出
+ * @param request request
+ * @param response response
+ * @return ResultVo
+ */
+ @ApiOperation(value = "导出Excel", notes = "导出Excel")
+ #if(data.subModuleName != null && data.subModuleName != "")
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_#(data.subModuleName.toLowerCase())_export")
+ #else
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_export")
+ #end
+ @EnableLog
+ @Override
+ public ResultVo exportExcel(HttpServletRequest request, HttpServletResponse response) {
+ QueryBuilder<#(data.model.tableName)> queryBuilder = new WebQueryBuilder<>(#(data.model.tableName).class, request.getParameterMap());
+ return super.excelExport(RoleApi.TITLE, queryBuilder.build(), response);
+ }
+
+ /**
+ * #(data.codeTitleBrief) Excel 导入
+ * @param request 文件流 request
+ * @return ResultVo
+ */
+ @ApiOperation(value = "导入Excel", notes = "导入Excel")
+ #if(data.subModuleName != null && data.subModuleName != "")
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_#(data.subModuleName.toLowerCase())_import")
+ #else
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_import")
+ #end
+ @EnableLog
+ @Override
+ public ResultVo excelImport(MultipartHttpServletRequest request) {
+ return super.excelImport(request);
+ }
+
+ /**
+ * #(data.codeTitleBrief) Excel 下载导入模版
+ * @param response response
+ * @return ResultVo
+ */
+ @ApiOperation(value = "导出Excel模版", notes = "导出Excel模版")
+ #if(data.subModuleName != null && data.subModuleName != "")
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_#(data.subModuleName.toLowerCase())_import")
+ #else
+ @RequiresPermissions("#(data.moduleName.toLowerCase())_import")
+ #end
+ @Override
+ public ResultVo importTemplate(HttpServletResponse response) {
+ return super.importTemplate(RoleApi.TITLE, response);
+ }
+
+}
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/foreend/api/TemplateApi.html b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/foreend/api/TemplateApi.html
new file mode 100644
index 00000000..a9c217ef
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/foreend/api/TemplateApi.html
@@ -0,0 +1,63 @@
+import request from "@/utils/request";
+
+export function getList(data) {
+ return request({
+ #if(data.subModuleName != null && data.subModuleName != "")
+ url: "#(apiPath)/#(data.moduleName)/#(data.subModuleName)/findPage",
+ #else
+ url: "#(apiPath)/#(data.moduleName)/findPage",
+ #end
+ method: "get",
+ params: data,
+ });
+}
+
+
+export function doInsert(data) {
+ return request({
+ #if(data.subModuleName != null && data.subModuleName != "")
+ url: "#(apiPath)/#(data.moduleName)/#(data.subModuleName)/insert",
+ #else
+ url: "#(apiPath)/#(data.moduleName)/insert",
+ #end
+ method: "post",
+ data,
+ });
+}
+
+export function doUpdate(data) {
+ return request({
+ #if(data.subModuleName != null && data.subModuleName != "")
+ url: "#(apiPath)/#(data.moduleName)/#(data.subModuleName)/update",
+ #else
+ url: "#(apiPath)/#(data.moduleName)/update",
+ #end
+ method: "post",
+ data,
+ });
+}
+
+export function doDelete(data) {
+ return request({
+ #if(data.subModuleName != null && data.subModuleName != "")
+ url: "#(apiPath)/#(data.moduleName)/#(data.subModuleName)/del",
+ #else
+ url: "#(apiPath)/#(data.moduleName)/del",
+ #end
+ method: "post",
+ params: data,
+ });
+}
+
+export function doDeleteAll(data) {
+ return request({
+ #if(data.subModuleName != null && data.subModuleName != "")
+ url: "#(apiPath)/#(data.moduleName)/#(data.subModuleName)/delAll",
+ #else
+ url: "#(apiPath)/#(data.moduleName)/delAll",
+ #end
+ method: "post",
+ params: data,
+ });
+}
+
diff --git a/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/foreend/components/TemplateEdit.html b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/foreend/components/TemplateEdit.html
new file mode 100644
index 00000000..3cecb682
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-creater/src/main/resources/tpl/foreend/components/TemplateEdit.html
@@ -0,0 +1,195 @@
+
+
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.opsli.modulars.gentest.user.entity;
+
+import java.util.Date;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.opsli.core.base.entity.BaseEntity;
+
+/**
+ * @BelongsProject: opsli-boot
+ * @BelongsPackage: org.opsli.modulars.gentest.user.entity
+ * @Author: 周鹏程
+ * @CreateTime: 2020-11-22 12:12:05
+ * @Description: 某系统用户
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class TestUser extends BaseEntity {
+
+
+ /** 名称 */
+ private String name;
+
+ /** 金钱 */
+ private Double money;
+
+ /** 年龄 */
+ private Integer age;
+
+ /** 生日 */
+ private Date birth;
+
+ /** 是否启用 */
+ private Character izUsable;
+
+
+ // ========================================
+
+
+
+
+
+
+ /** 多租户字段 */
+ private String tenantId;
+
+ /** 逻辑删除字段 */
+ private Integer deleted;
+
+
+}
diff --git a/opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/gentest/user/mapper/TestUserMapper.java b/opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/gentest/user/mapper/TestUserMapper.java
new file mode 100755
index 00000000..4e2406bc
--- /dev/null
+++ b/opsli-modulars/opsli-modulars-test/src/main/java/org/opsli/modulars/gentest/user/mapper/TestUserMapper.java
@@ -0,0 +1,33 @@
+/**
+* Copyright 2020 OPSLI 快速开发平台 https://www.opsli.com
+*
+* Licensed under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License. You may obtain a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations under
+* the License.
+*/
+package org.opsli.modulars.gentest.user.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.opsli.modulars.gentest.user.entity.TestUser;
+
+/**
+* @BelongsProject: opsli-boot
+* @BelongsPackage: org.opsli.modulars.gentest.user.mapper
+* @Author: 周鹏程
+* @CreateTime: 2020-11-22 12:12:05
+* @Description: 某系统用户 Mapper
+*/
+@Mapper
+public interface TestUserMapper extends BaseMapper
+* Licensed under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License. You may obtain a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations under
+* the License.
+*/
+package org.opsli.modulars.gentest.user.service;
+
+import org.opsli.core.base.service.interfaces.CrudServiceInterface;
+
+
+import org.opsli.modulars.gentest.user.entity.TestUser;
+import org.opsli.api.wrapper.gentest.user.TestUserModel;
+
+/**
+* @BelongsProject: opsli-boot
+* @BelongsPackage: org.opsli.modulars.gentest.user.service
+* @Author: 周鹏程
+* @CreateTime: 2020-11-22 12:12:05
+* @Description: 某系统用户 Service
+*/
+public interface ITestUserService extends CrudServiceInterface
+* Licensed under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License. You may obtain a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations under
+* the License.
+*/
+package org.opsli.modulars.gentest.user.service.impl;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.opsli.core.base.service.impl.CrudServiceImpl;
+
+import org.opsli.modulars.gentest.user.entity.TestUser;
+import org.opsli.api.wrapper.gentest.user.TestUserModel;
+import org.opsli.modulars.gentest.user.service.ITestUserService;
+import org.opsli.modulars.gentest.user.mapper.TestUserMapper;
+
+
+/**
+* @BelongsProject: opsli-boot
+* @BelongsPackage: org.opsli.modulars.gentest.user.service.impl
+* @Author: 周鹏程
+* @CreateTime: 2020-11-22 12:12:05
+* @Description: 某系统用户 Service Impl
+*/
+@Service
+public class TestUserServiceImpl extends CrudServiceImpl
+* Licensed under the Apache License, Version 2.0 (the "License"); you may not
+* use this file except in compliance with the License. You may obtain a copy of
+* the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+* License for the specific language governing permissions and limitations under
+* the License.
+*/
+package org.opsli.modulars.gentest.user.web;
+
+import org.opsli.api.web.system.role.RoleApi;
+import org.opsli.core.base.service.interfaces.CrudServiceInterface;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.opsli.api.base.result.ResultVo;
+import org.opsli.common.annotation.ApiRestController;
+import org.opsli.common.annotation.EnableLog;
+import org.opsli.core.base.concroller.BaseRestController;
+import org.opsli.core.persistence.Page;
+import org.opsli.core.persistence.querybuilder.QueryBuilder;
+import org.opsli.core.persistence.querybuilder.WebQueryBuilder;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.opsli.modulars.gentest.user.entity.TestUser;
+import org.opsli.api.wrapper.gentest.user.TestUserModel;
+import org.opsli.modulars.gentest.user.service.ITestUserService;
+import org.opsli.api.web.gentest.user.TestUserRestApi;
+
+/**
+* @BelongsProject: opsli-boot
+* @BelongsPackage: org.opsli.modulars.gentest.user.web
+* @Author: 周鹏程
+* @CreateTime: 2020-11-22 12:12:05
+* @Description: 某系统用户 Controller
+*/
+@Slf4j
+@ApiRestController("/gentest/user")
+public class TestUserRestController extends BaseRestController