diff --git a/README.md b/README.md
index b8702079..73f4ad55 100644
--- a/README.md
+++ b/README.md
@@ -73,4 +73,6 @@
> 3. 不要解压zip包,安装时直接选zip包即可。
> ``` 
 
-#### QQ群:[373603580](https://shang.qq.com/wpa/qunwpa?idkey=4d495321e527ec2ce459c0d0d6320414cd9677d92d5287df831d4e1c4ec09740)
+#### QQ群1:[373603580](https://shang.qq.com/wpa/qunwpa?idkey=4d495321e527ec2ce459c0d0d6320414cd9677d92d5287df831d4e1c4ec09740)
+#### QQ群2:[167490920](https://qm.qq.com/cgi-bin/qm/qr?k=r0emWZbPZIb6BqxpLM4Z4jo2mHoC0zZK&jump_from=webapi)
+#### Telegram:[https://t.me/gotoeasycode](https://t.me/gotoeasycode)
diff --git a/build.gradle b/build.gradle
index da10d345..5e805440 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,28 +6,24 @@ buildscript {
 maven { url 'https://dl.bintray.com/jetbrains/intellij-plugin-service' }
 maven { url 'https://dl.bintray.com/jetbrains/intellij-third-party-dependencies/' }
 }
- // https://github.com/JetBrains/gradle-intellij-plugin/ 关注开发插件版本
- dependencies {
- classpath "org.jetbrains.intellij.plugins:gradle-intellij-plugin:0.6.5"
- }
 }
 
 //2.1 插件配置
 // 这两个插件是必备
 plugins {
 id 'java'
- id 'org.jetbrains.intellij' version '0.6.5'
+ id 'org.jetbrains.intellij' version '0.7.3'
 }
 
-
 group 'com.sjhy'
-version '1.2.4-RELEASE'
+version '1.2.8-RELEASE'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
+compileJava.options.encoding = "UTF-8"
+compileTestJava.options.encoding = "UTF-8"
 
 repositories {
- jcenter()
 mavenCentral()
 }
 
@@ -46,9 +42,10 @@ intellij {
 // 企业版
 type 'IU'
 // 各种IDEA版本去这里找
+ // https://data.services.jetbrains.com/products?code=PS&fields=releases.version%2Creleases.date%2Creleases.build
 // https://www.jetbrains.com/intellij-repository/releases
 // 依赖的插件
- plugins = ['java', 'DatabaseTools']
+ plugins = ['com.intellij.modules.platform','com.intellij.database']
 //Disables updating since-build attribute in plugin.xml
 updateSinceUntilBuild false
 downloadSources = true
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 01b8bf6b..7454180f 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 3928e236..0a949120 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Jul 17 15:13:01 CST 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://downloads.gradle-dn.com/distributions/gradle-6.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/src/main/java/com/sjhy/plugin/actions/EasyCodeEntityAction.java b/src/main/java/com/sjhy/plugin/actions/EasyCodeEntityAction.java
deleted file mode 100644
index e8068c51..00000000
--- a/src/main/java/com/sjhy/plugin/actions/EasyCodeEntityAction.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.sjhy.plugin.actions;
-
-import com.google.common.collect.Lists;
-import com.intellij.openapi.actionSystem.AnAction;
-import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.actionSystem.CommonDataKeys;
-import com.intellij.openapi.project.Project;
-import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiJavaFile;
-import com.intellij.psi.PsiManager;
-import com.intellij.psi.PsiModifier;
-import com.sjhy.plugin.tool.CacheDataUtils;
-import com.sjhy.plugin.ui.SelectSavePath;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * 从Java类生成代码菜单
- *
- * @author Mario Luo
- */
-public class EasyCodeEntityAction extends AnAction {
-
- private final CacheDataUtils cacheDataUtils = CacheDataUtils.getInstance();
-
- @Override
- public void actionPerformed(@NotNull AnActionEvent event) {
- Project project = event.getProject();
- if (project == null) {
- return;
- }
-
- // 过滤选择Java文件
- VirtualFile[] psiFiles = event.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY);
- if (psiFiles == null) {
- return;
- }
- PsiManager psiManager = PsiManager.getInstance(project);
- List<psijavafile> psiJavaFiles = Arrays.stream(psiFiles)
- .map(psiManager::findFile)
- .filter(f -> f instanceof PsiJavaFile)
- .map(f -> (PsiJavaFile) f)
- .collect(Collectors.toList());
- if (psiJavaFiles.size() == 0) {
- return;
- }
-
- // 获取选中的类
- List<psiclass> psiClassList = resolvePsiClassByFile(psiJavaFiles);
- if (psiClassList.size() == 0) {
- return;
- }
-
- // 缓存选中值
- cacheDataUtils.setSelectPsiClass(psiClassList.get(0));
- cacheDataUtils.setPsiClassList(psiClassList);
- new SelectSavePath(project, true).show();
- }
-
- /**
- * 解析类
- */
- private List<psiclass> resolvePsiClassByFile(List<psijavafile> psiJavaFiles) {
- List<psiclass> psiClassList = Lists.newArrayListWithCapacity(psiJavaFiles.size());
- for (PsiJavaFile psiJavaFile : psiJavaFiles) {
- Arrays.stream(psiJavaFile.getClasses())
- .filter(o -> o.getModifierList() != null && o.getModifierList().hasModifierProperty(PsiModifier.PUBLIC))
- .findFirst().ifPresent(psiClassList::add);
- }
- return psiClassList;
- }
-
-
-}
diff --git a/src/main/java/com/sjhy/plugin/actions/MainActionGroup.java b/src/main/java/com/sjhy/plugin/actions/MainActionGroup.java
index 42128fea..5a4fd060 100644
--- a/src/main/java/com/sjhy/plugin/actions/MainActionGroup.java
+++ b/src/main/java/com/sjhy/plugin/actions/MainActionGroup.java
@@ -119,7 +119,7 @@ public void actionPerformed(@NotNull AnActionEvent e) {
 if (dbTable == null) {
 return;
 }
- TableInfoSettingsService.getInstance().resetTableInfo(dbTable);
+ TableInfoSettingsService.getInstance().removeTableInfo(dbTable);
 Messages.showInfoMessage(dbTable.getName() + "表配置信息已重置成功", GlobalDict.TITLE_INFO);
 }
 };
diff --git a/src/main/java/com/sjhy/plugin/dict/GlobalDict.java b/src/main/java/com/sjhy/plugin/dict/GlobalDict.java
index b0d03a0f..7697c942 100644
--- a/src/main/java/com/sjhy/plugin/dict/GlobalDict.java
+++ b/src/main/java/com/sjhy/plugin/dict/GlobalDict.java
@@ -15,7 +15,7 @@ public interface GlobalDict {
 /**
 * 版本号
 */
- String VERSION = "1.2.4";
+ String VERSION = "1.2.8";
 /**
 * 作者名称
 */
diff --git a/src/main/java/com/sjhy/plugin/dto/ColumnInfoDTO.java b/src/main/java/com/sjhy/plugin/dto/ColumnInfoDTO.java
index 1dd54342..cded87bc 100644
--- a/src/main/java/com/sjhy/plugin/dto/ColumnInfoDTO.java
+++ b/src/main/java/com/sjhy/plugin/dto/ColumnInfoDTO.java
@@ -1,17 +1,13 @@
 package com.sjhy.plugin.dto;
 
 import com.intellij.database.model.DasColumn;
-import com.intellij.psi.PsiField;
 import com.sjhy.plugin.entity.TypeMapper;
 import com.sjhy.plugin.enums.MatchType;
 import com.sjhy.plugin.tool.CurrGroupUtils;
-import com.sjhy.plugin.tool.DocCommentUtils;
 import com.sjhy.plugin.tool.NameUtils;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.HashMap;
-import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
@@ -25,20 +21,12 @@
 @NoArgsConstructor
 public class ColumnInfoDTO {
 
- public ColumnInfoDTO(PsiField field) {
- this.name = field.getName();
- this.comment = DocCommentUtils.getComment(field.getDocComment());
- this.type = field.getType().getCanonicalText();
- this.custom = false;
- this.ext = new HashMap<strong>();
- }
-
 public ColumnInfoDTO(DasColumn column) {
 this.name = NameUtils.getInstance().getJavaName(column.getName());
 this.comment = column.getComment();
 this.type = getJavaType(column.getDataType().toString());
 this.custom = false;
- this.ext = new HashMap<strong>();
+ this.ext = "{}";
 }
 
 private String getJavaType(String dbType) {
@@ -74,7 +62,7 @@ private String getJavaType(String dbType) {
 */
 private Boolean custom;
 /**
- * 扩展数据
+ * 扩展数据(JSON字符串)
 */
- private Map<string, Object> ext;
+ private String ext;
 }
diff --git a/src/main/java/com/sjhy/plugin/dto/GenerateOptions.java b/src/main/java/com/sjhy/plugin/dto/GenerateOptions.java
index 1f1d5b4b..0b4be47b 100644
--- a/src/main/java/com/sjhy/plugin/dto/GenerateOptions.java
+++ b/src/main/java/com/sjhy/plugin/dto/GenerateOptions.java
@@ -13,10 +13,6 @@
 @Data
 @Builder
 public class GenerateOptions {
- /**
- * 实体类模式
- */
- private Boolean entityModel;
 /**
 * 统一配置
 */
diff --git a/src/main/java/com/sjhy/plugin/dto/TableInfoDTO.java b/src/main/java/com/sjhy/plugin/dto/TableInfoDTO.java
index 87fb20e1..64f4e0cc 100644
--- a/src/main/java/com/sjhy/plugin/dto/TableInfoDTO.java
+++ b/src/main/java/com/sjhy/plugin/dto/TableInfoDTO.java
@@ -3,8 +3,6 @@
 import com.intellij.database.model.DasColumn;
 import com.intellij.database.psi.DbTable;
 import com.intellij.database.util.DasUtil;
-import com.intellij.psi.PsiClass;
-import com.intellij.psi.PsiField;
 import com.intellij.util.containers.JBIterable;
 import com.sjhy.plugin.entity.ColumnInfo;
 import com.sjhy.plugin.entity.TableInfo;
@@ -34,25 +32,6 @@ public TableInfoDTO(TableInfoDTO dto, DbTable dbTable) {
 merge(dto, this);
 }
 
- public TableInfoDTO(TableInfoDTO dto, PsiClass psiClass) {
- this(psiClass);
- merge(dto, this);
- }
-
- private TableInfoDTO(PsiClass psiClass) {
- this.name = psiClass.getName();
- this.preName = "";
- this.comment = DocCommentUtils.getComment(psiClass.getDocComment());
- this.templateGroupName = "";
- this.savePackageName = "";
- this.savePath = "";
- this.saveModelName = "";
- this.fullColumn = new ArrayList<strong>();
- for (PsiField field : psiClass.getAllFields()) {
- this.fullColumn.add(new ColumnInfoDTO(field));
- }
- }
-
 private TableInfoDTO(DbTable dbTable) {
 this.name = NameUtils.getInstance().getClassName(dbTable.getName());
 this.preName = "";
@@ -70,7 +49,7 @@ private TableInfoDTO(DbTable dbTable) {
 }
 
 private static void merge(TableInfoDTO oldData, TableInfoDTO newData) {
- if (oldData == null &#124;&#124; CollectionUtil.isEmpty(oldData.getFullColumn())) {
+ if (oldData == null) {
 return;
 }
 if (!StringUtils.isEmpty(oldData.getPreName())) {
@@ -88,27 +67,66 @@ private static void merge(TableInfoDTO oldData, TableInfoDTO newData) {
 if (!StringUtils.isEmpty(oldData.getSaveModelName())) {
 newData.saveModelName = oldData.getSaveModelName();
 }
- // 补充自定义列
- for (ColumnInfoDTO oldColumn : oldData.getFullColumn()) {
- if (!oldColumn.getCustom()) {
- continue;
+ List<string> allNewColumnNames = newData.getFullColumn().stream().map(ColumnInfoDTO::getName).collect(Collectors.toList());
+ // 列出旧的顺序,并删除已经不存在的列,不包括自定义列
+ List<columninfodto> oldSequenceColumn = oldData.getFullColumn().stream()
+ .filter(item -> allNewColumnNames.contains(item.getName()) &#124;&#124; Boolean.TRUE.equals(item.getCustom()))
+ .collect(Collectors.toList());
+ // 尽可能的保留原始顺序(把自定义列按原始位置插入)
+ Map<string, String> nameMap = new HashMap<strong>(oldSequenceColumn.size());
+ for (int i = 0; i < oldSequenceColumn.size(); i++) { + ColumnInfoDTO columnInfo = oldSequenceColumn.get(i); + if (columnInfo.getCustom()) { + // 如果原本是自定义列,现在变成了数据库列,则忽略调原本的自定义列 + if (allNewColumnNames.contains(columnInfo.getName())) { + continue; + } + // 获取当前自定义列的前一个名称 + String beforeName = ""; + if (i> 0) {
+ beforeName = oldSequenceColumn.get(i - 1).getName();
+ }
+ nameMap.put(beforeName, columnInfo.getName());
 }
- newData.getFullColumn().add(oldColumn);
 }
- // 保持旧列的顺序
- Map<string, ColumnInfoDTO> map = newData.getFullColumn().stream().collect(Collectors.toMap(ColumnInfoDTO::getName, val -> val));
+ // 将自定义列按顺序插入到新表中
+ nameMap.forEach((k, v) -> {
+ if (StringUtils.isEmpty(k)) {
+ allNewColumnNames.add(0, v);
+ } else {
+ for (int i = 0; i < allNewColumnNames.size(); i++) { + if (allNewColumnNames.get(i).equals(k)) { + allNewColumnNames.add(i + 1, v); + return; + } + } + } + }); + // 按顺序依次重写数据 + Map<string, ColumnInfoDTO> oldColumnMap = oldData.getFullColumn().stream().collect(Collectors.toMap(ColumnInfoDTO::getName, v -> v));
+ Map<string, ColumnInfoDTO> newColumnMap = newData.getFullColumn().stream().collect(Collectors.toMap(ColumnInfoDTO::getName, v -> v));
 List<columninfodto> tmpList = new ArrayList<strong>();
- for (ColumnInfoDTO columnInfo : oldData.getFullColumn()) {
- ColumnInfoDTO newColumn = map.get(columnInfo.getName());
- if (newColumn != null) {
- tmpList.add(newColumn);
+ for (String name : allNewColumnNames) {
+ ColumnInfoDTO newColumnInfo = newColumnMap.get(name);
+ if (newColumnInfo == null) {
+ newColumnInfo = oldColumnMap.get(name);
+ if (newColumnInfo == null) {
+ throw new NullPointerException("找不到列信息");
+ }
+ tmpList.add(newColumnInfo);
+ continue;
 }
- }
- // 补充剩余列
- for (ColumnInfoDTO columnInfoDTO : newData.getFullColumn()) {
- if (!tmpList.contains(columnInfoDTO)) {
- tmpList.add(columnInfoDTO);
+ ColumnInfoDTO oldColumnInfo = oldColumnMap.get(name);
+ if (oldColumnInfo == null) {
+ tmpList.add(newColumnInfo);
+ continue;
+ }
+ // 需要进行合并操作
+ newColumnInfo.setExt(oldColumnInfo.getExt());
+ if (StringUtils.isEmpty(newColumnInfo.getComment())) {
+ newColumnInfo.setComment(oldColumnInfo.getComment());
 }
+ tmpList.add(newColumnInfo);
 }
 // list数据替换
 newData.getFullColumn().clear();
@@ -149,39 +167,7 @@ private static void merge(TableInfoDTO oldData, TableInfoDTO newData) {
 */
 private String saveModelName;
 
- public TableInfo toTableInfo(PsiClass psiClass) {
- TableInfo tableInfo = new TableInfo();
- tableInfo.setPsiClassObj(psiClass);
- tableInfo.setName(this.getName());
- tableInfo.setPreName(this.getPreName());
- tableInfo.setTemplateGroupName(this.getTemplateGroupName());
- tableInfo.setSavePackageName(this.getSavePackageName());
- tableInfo.setSavePath(this.getSavePath());
- tableInfo.setComment(this.getComment());
- tableInfo.setSaveModelName(this.getSaveModelName());
- tableInfo.setFullColumn(new ArrayList<strong>());
- tableInfo.setPkColumn(new ArrayList<strong>());
- tableInfo.setOtherColumn(new ArrayList<strong>());
- for (PsiField field : psiClass.getAllFields()) {
- if (PsiClassGenerateUtils.isSkipField(field)) {
- continue;
- }
- ColumnInfo columnInfo = new ColumnInfo();
- columnInfo.setName(field.getName());
- columnInfo.setShortType(field.getType().getPresentableText());
- columnInfo.setType(field.getType().getCanonicalText());
- columnInfo.setComment(DocCommentUtils.getComment(field.getDocComment()));
- columnInfo.setCustom(false);
- tableInfo.getFullColumn().add(columnInfo);
- if (PsiClassGenerateUtils.isPkField(field)) {
- tableInfo.getPkColumn().add(columnInfo);
- } else {
- tableInfo.getOtherColumn().add(columnInfo);
- }
- }
- return tableInfo;
- }
-
+ @SuppressWarnings("unchecked")
 public TableInfo toTableInfo(DbTable dbTable) {
 TableInfo tableInfo = new TableInfo();
 tableInfo.setObj(dbTable);
@@ -211,7 +197,7 @@ public TableInfo toTableInfo(DbTable dbTable) {
 columnInfo.setShortType(split[split.length - 1]);
 columnInfo.setComment(dto.getComment());
 columnInfo.setCustom(dto.getCustom());
- columnInfo.setExt(dto.getExt());
+ columnInfo.setExt(JSON.parse(dto.getExt(), HashMap.class));
 tableInfo.getFullColumn().add(columnInfo);
 if (columnInfo.getObj() != null && DasUtil.isPrimary(columnInfo.getObj())) {
 tableInfo.getPkColumn().add(columnInfo);
@@ -237,7 +223,7 @@ public static TableInfoDTO valueOf(TableInfo tableInfo) {
 ColumnInfoDTO columnInfoDTO = new ColumnInfoDTO();
 columnInfoDTO.setName(columnInfo.getName());
 columnInfoDTO.setType(columnInfo.getType());
- columnInfoDTO.setExt(columnInfo.getExt());
+ columnInfoDTO.setExt(JSON.toJson(columnInfo.getExt()));
 columnInfoDTO.setCustom(columnInfo.getCustom());
 columnInfoDTO.setComment(columnInfo.getComment());
 dto.getFullColumn().add(columnInfoDTO);
diff --git a/src/main/java/com/sjhy/plugin/dto/TableInfoSettingsDTO.java b/src/main/java/com/sjhy/plugin/dto/TableInfoSettingsDTO.java
index d5b43f5a..c727a9db 100644
--- a/src/main/java/com/sjhy/plugin/dto/TableInfoSettingsDTO.java
+++ b/src/main/java/com/sjhy/plugin/dto/TableInfoSettingsDTO.java
@@ -3,14 +3,14 @@
 import com.intellij.database.model.DasNamespace;
 import com.intellij.database.psi.DbElement;
 import com.intellij.database.psi.DbTable;
-import com.intellij.psi.PsiClass;
 import com.sjhy.plugin.entity.TableInfo;
+import com.sjhy.plugin.tool.ReflectionUtils;
 import lombok.Data;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.TreeMap;
 
 /**
 * 表格信息设置传输对象
@@ -24,7 +24,7 @@ public class TableInfoSettingsDTO {
 private Map<string, TableInfoDTO> tableInfoMap;
 
 public TableInfoSettingsDTO() {
- this.tableInfoMap = new HashMap<strong>(16);
+ this.tableInfoMap = new TreeMap<strong>();
 }
 
 private String generateKey(DbTable dbTable) {
@@ -39,9 +39,12 @@ private String generateKey(DbTable dbTable) {
 }
 builder.insert(0, name);
 try {
- Method method = element.getClass().getDeclaredMethod("getParent");
+ Method method = ReflectionUtils.getDeclaredMethod(element.getClass(), "getParent");
+ if (method == null) {
+ break;
+ }
 element = (DbElement) method.invoke(element);
- } catch (NoSuchMethodException &#124; IllegalAccessException &#124; InvocationTargetException e) {
+ } catch (IllegalAccessException &#124; InvocationTargetException e) {
 break;
 }
 // 未必所有的数据库都是存在三层,例如MySQL就只有两层。如果上次层不是Namespace,则不再继续获取
@@ -52,24 +55,6 @@ private String generateKey(DbTable dbTable) {
 return builder.toString();
 }
 
- private String generateKey(PsiClass psiClass) {
- return psiClass.getQualifiedName();
- }
- /**
- * 读表信息
- *
- * @param psiClass psi类
- * @return {@link TableInfo}
- */
- @SuppressWarnings("Duplicates")
- public TableInfo readTableInfo(PsiClass psiClass) {
- String key = generateKey(psiClass);
- TableInfoDTO dto = this.tableInfoMap.get(key);
- dto = new TableInfoDTO(dto, psiClass);
- this.tableInfoMap.put(key, dto);
- return dto.toTableInfo(psiClass);
- }
-
 /**
 * 读表信息
 *
@@ -80,6 +65,7 @@ public TableInfo readTableInfo(PsiClass psiClass) {
 public TableInfo readTableInfo(DbTable dbTable) {
 String key = generateKey(dbTable);
 TableInfoDTO dto = this.tableInfoMap.get(key);
+ // 表可能新增了字段,需要重新合并保存
 dto = new TableInfoDTO(dto, dbTable);
 this.tableInfoMap.put(key, dto);
 return dto.toTableInfo(dbTable);
@@ -95,16 +81,10 @@ public void saveTableInfo(TableInfo tableInfo) {
 return;
 }
 DbTable dbTable = tableInfo.getObj();
- PsiClass psiClass = tableInfo.getPsiClassObj();
- String key;
 if (dbTable != null) {
- key = generateKey(dbTable);
- } else if (psiClass != null) {
- key = generateKey(psiClass);
- } else {
- return;
+ String key = generateKey(dbTable);
+ this.tableInfoMap.put(key, TableInfoDTO.valueOf(tableInfo));
 }
- this.tableInfoMap.put(key, TableInfoDTO.valueOf(tableInfo));
 }
 
 /**
@@ -116,4 +96,14 @@ public void resetTableInfo(DbTable dbTable) {
 String key = generateKey(dbTable);
 this.tableInfoMap.put(key, new TableInfoDTO(null, dbTable));
 }
+
+ /**
+ * 删除表信息
+ *
+ * @param dbTable 数据库表
+ */
+ public void removeTableInfo(DbTable dbTable) {
+ String key = generateKey(dbTable);
+ this.tableInfoMap.remove(key);
+ }
 }
diff --git a/src/main/java/com/sjhy/plugin/entity/AbstractGroup.java b/src/main/java/com/sjhy/plugin/entity/AbstractGroup.java
index 526f3eda..0cc93a50 100644
--- a/src/main/java/com/sjhy/plugin/entity/AbstractGroup.java
+++ b/src/main/java/com/sjhy/plugin/entity/AbstractGroup.java
@@ -58,8 +58,8 @@ default E defaultChild() {
 *
 * @return {@link T}
 */
+ @SuppressWarnings("unchecked")
 default T cloneObj() {
- //noinspection unchecked
 return (T) CloneUtils.cloneByJson(this);
 }
 }
diff --git a/src/main/java/com/sjhy/plugin/entity/SaveFile.java b/src/main/java/com/sjhy/plugin/entity/SaveFile.java
index 11b3b32a..54467931 100644
--- a/src/main/java/com/sjhy/plugin/entity/SaveFile.java
+++ b/src/main/java/com/sjhy/plugin/entity/SaveFile.java
@@ -249,7 +249,9 @@ private void saveOrReplaceFile(VirtualFile file, VirtualFile directory) {
 FileUtils.getInstance().reformatFile(project, file);
 }
 // 提交文档改动,并非VCS中的提交文件
- psiDocumentManager.commitDocument(document);
+ if (document != null) {
+ psiDocumentManager.commitDocument(document);
+ }
 }
 
 private String getFileText(VirtualFile file) {
diff --git a/src/main/java/com/sjhy/plugin/entity/TableInfo.java b/src/main/java/com/sjhy/plugin/entity/TableInfo.java
index 7286b6a9..2f5b975d 100644
--- a/src/main/java/com/sjhy/plugin/entity/TableInfo.java
+++ b/src/main/java/com/sjhy/plugin/entity/TableInfo.java
@@ -2,7 +2,6 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.intellij.database.psi.DbTable;
-import com.intellij.psi.PsiClass;
 import lombok.Data;
 
 import java.util.List;
@@ -22,12 +21,6 @@ public class TableInfo {
 @JsonIgnore
 private DbTable obj;
 
- /**
- * 原始对象(从实体生成)
- */
- @JsonIgnore
- private PsiClass psiClassObj;
-
 /**
 * 表名(首字母大写)
 */
diff --git a/src/main/java/com/sjhy/plugin/factory/AbstractItemFactory.java b/src/main/java/com/sjhy/plugin/factory/AbstractItemFactory.java
index b3acc8d5..003e5186 100644
--- a/src/main/java/com/sjhy/plugin/factory/AbstractItemFactory.java
+++ b/src/main/java/com/sjhy/plugin/factory/AbstractItemFactory.java
@@ -2,6 +2,8 @@
 
 import com.sjhy.plugin.entity.AbstractItem;
 
+import java.lang.reflect.InvocationTargetException;
+
 /**
 * 抽象的项目工厂
 *
@@ -13,9 +15,9 @@ public class AbstractItemFactory {
 
 public static <t extends AbstractItem<t>> T createDefaultVal(Class<t> cls) {
 try {
- T instance = cls.newInstance();
+ T instance = cls.getDeclaredConstructor().newInstance();
 return instance.defaultVal();
- } catch (InstantiationException &#124; IllegalAccessException e) {
+ } catch (InstantiationException &#124; IllegalAccessException &#124; NoSuchMethodException &#124; InvocationTargetException e) {
 throw new IllegalArgumentException("构建示例失败", e);
 }
 }
diff --git a/src/main/java/com/sjhy/plugin/factory/CellEditorFactory.java b/src/main/java/com/sjhy/plugin/factory/CellEditorFactory.java
index cec9f545..d9e45c4a 100644
--- a/src/main/java/com/sjhy/plugin/factory/CellEditorFactory.java
+++ b/src/main/java/com/sjhy/plugin/factory/CellEditorFactory.java
@@ -1,8 +1,6 @@
 package com.sjhy.plugin.factory;
 
 import com.intellij.openapi.ui.ComboBox;
-import com.intellij.ui.BooleanTableCellEditor;
-import com.intellij.ui.JBColor;
 import com.intellij.ui.components.JBTextField;
 
 import javax.swing.*;
@@ -10,7 +8,6 @@
 import java.awt.event.ActionListener;
 import java.awt.event.FocusEvent;
 import java.awt.event.FocusListener;
-import java.util.stream.Stream;
 
 /**
 * 表格编辑器构建工厂类
@@ -21,17 +18,6 @@
 */
 public class CellEditorFactory {
 
- /**
- * 创建下拉框编辑器
- *
- * @param editable 可编辑的
- * @return {@link TableCellEditor}
- */
- public static TableCellEditor createComboBoxEditor(boolean editable, Class<? extends Enum> enumCls) {
- Enum[] enumConstants = enumCls.getEnumConstants();
- return createComboBoxEditor(editable, Stream.of(enumConstants).map(Enum::name).toArray(value -> new String[enumConstants.length]));
- }
-
 /**
 * 创建下拉框编辑器
 *
@@ -42,21 +28,12 @@ public static TableCellEditor createComboBoxEditor(boolean editable, Class<? ext public static TableCellEditor createComboBoxEditor(boolean editable, String... items) { ComboBox<string> comboBox = new ComboBox<strong>(items);
 comboBox.setEditable(editable);
- // 配色
- if (comboBox.getPopup() != null) {
- comboBox.getPopup().getList().setBackground(JBColor.WHITE);
- comboBox.getPopup().getList().setForeground(JBColor.GREEN);
- }
 if (!editable) {
 transmitFocusEvent(comboBox);
 }
 return new DefaultCellEditor(comboBox);
 }
 
- public static TableCellEditor createBooleanEditor() {
- return new BooleanTableCellEditor();
- }
-
 /**
 * 创建文本框编辑器
 *
diff --git a/src/main/java/com/sjhy/plugin/service/TableInfoSettingsService.java b/src/main/java/com/sjhy/plugin/service/TableInfoSettingsService.java
index 7f1d80a4..7f339206 100644
--- a/src/main/java/com/sjhy/plugin/service/TableInfoSettingsService.java
+++ b/src/main/java/com/sjhy/plugin/service/TableInfoSettingsService.java
@@ -1,14 +1,17 @@
 package com.sjhy.plugin.service;
 
 import com.intellij.database.psi.DbTable;
+import com.intellij.openapi.command.WriteCommandAction;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.ServiceManager;
-import com.intellij.psi.PsiClass;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.sjhy.plugin.dto.TableInfoSettingsDTO;
 import com.sjhy.plugin.entity.TableInfo;
 import com.sjhy.plugin.service.impl.TableInfoSettingsServiceImpl;
 import com.sjhy.plugin.tool.ProjectUtils;
 
+import java.io.IOException;
+
 /**
 * @author makejava
 * @version 1.0.0
@@ -21,7 +24,26 @@ public interface TableInfoSettingsService extends PersistentStateComponent<table class="undef"> {
+ try {
+ configFile.delete(null);
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ }
+ });
+ }
+ }
+ // 重新获取配置
+ return ServiceManager.getService(ProjectUtils.getCurrProject(), TableInfoSettingsServiceImpl.class);
+ }
 }
 
 /**
@@ -32,14 +54,6 @@ static TableInfoSettingsService getInstance() {
 */
 TableInfo getTableInfo(DbTable dbTable);
 
- /**
- * 获取表信息
- *
- * @param psiClass psi类
- * @return {@link TableInfo}
- */
- TableInfo getTableInfo(PsiClass psiClass);
-
 /**
 * 保存表信息
 *
@@ -53,4 +67,11 @@ static TableInfoSettingsService getInstance() {
 * @param dbTable 数据库表
 */
 void resetTableInfo(DbTable dbTable);
+
+ /**
+ * 删除表信息
+ *
+ * @param dbTable 数据库表
+ */
+ void removeTableInfo(DbTable dbTable);
 }
diff --git a/src/main/java/com/sjhy/plugin/service/impl/ClipboardExportImportSettingsServiceImpl.java b/src/main/java/com/sjhy/plugin/service/impl/ClipboardExportImportSettingsServiceImpl.java
index d45ad45f..5606b81f 100644
--- a/src/main/java/com/sjhy/plugin/service/impl/ClipboardExportImportSettingsServiceImpl.java
+++ b/src/main/java/com/sjhy/plugin/service/impl/ClipboardExportImportSettingsServiceImpl.java
@@ -25,7 +25,7 @@ public class ClipboardExportImportSettingsServiceImpl implements ExportImportSet
 */
 @Override
 public void exportConfig(SettingsStorageDTO settingsStorage) {
- String json = JSON.toJson(settingsStorage);
+ String json = JSON.toJsonByFormat(settingsStorage);
 CopyPasteManager.getInstance().setContents(new TextTransferable(json));
 Messages.showInfoMessage("Config info success write to clipboard!", GlobalDict.TITLE_INFO);
 }
diff --git a/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java b/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java
index b8eeabeb..d561650c 100644
--- a/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java
+++ b/src/main/java/com/sjhy/plugin/service/impl/CodeGenerateServiceImpl.java
@@ -66,44 +66,34 @@ public CodeGenerateServiceImpl(Project project) {
 @Override
 public void generate(Collection<template> templates, GenerateOptions generateOptions) {
 // 获取选中表信息
- TableInfo selectedTableInfo;
- List<table class="undef"> tableInfoList;
- if (Boolean.TRUE.equals(generateOptions.getEntityModel())) {
- selectedTableInfo = tableInfoService.getTableInfo(cacheDataUtils.getSelectPsiClass());
- tableInfoList = cacheDataUtils.getPsiClassList().stream().map(item -> tableInfoService.getTableInfo(item)).collect(Collectors.toList());
- } else {
- selectedTableInfo = tableInfoService.getTableInfo(cacheDataUtils.getSelectDbTable());
- tableInfoList = cacheDataUtils.getDbTableList().stream().map(item -> tableInfoService.getTableInfo(item)).collect(Collectors.toList());
- }
+ TableInfo selectedTableInfo = tableInfoService.getTableInfo(cacheDataUtils.getSelectDbTable());
+ List<table class="undef"> tableInfoList = cacheDataUtils.getDbTableList().stream().map(item -> tableInfoService.getTableInfo(item)).collect(Collectors.toList());
 // 校验选中表的保存路径是否正确
 if (StringUtils.isEmpty(selectedTableInfo.getSavePath())) {
 if (selectedTableInfo.getObj() != null) {
 Messages.showInfoMessage(selectedTableInfo.getObj().getName() + "表配置信息不正确,请尝试重新配置", GlobalDict.TITLE_INFO);
- } else if (selectedTableInfo.getPsiClassObj() != null) {
- Messages.showInfoMessage(selectedTableInfo.getPsiClassObj().getName() + "类配置信息不正确,请尝试重新配置", GlobalDict.TITLE_INFO);
 } else {
 Messages.showInfoMessage("配置信息不正确,请尝试重新配置", GlobalDict.TITLE_INFO);
 }
 return;
 }
 // 将未配置的表进行配置覆盖
- TableInfo finalSelectedTableInfo = selectedTableInfo;
 tableInfoList.forEach(tableInfo -> {
 if (StringUtils.isEmpty(tableInfo.getSavePath())) {
- tableInfo.setSaveModelName(finalSelectedTableInfo.getSaveModelName());
- tableInfo.setSavePackageName(finalSelectedTableInfo.getSavePackageName());
- tableInfo.setSavePath(finalSelectedTableInfo.getSavePath());
- tableInfo.setPreName(finalSelectedTableInfo.getPreName());
+ tableInfo.setSaveModelName(selectedTableInfo.getSaveModelName());
+ tableInfo.setSavePackageName(selectedTableInfo.getSavePackageName());
+ tableInfo.setSavePath(selectedTableInfo.getSavePath());
+ tableInfo.setPreName(selectedTableInfo.getPreName());
 tableInfoService.saveTableInfo(tableInfo);
 }
 });
 // 如果使用统一配置,直接全部覆盖
 if (Boolean.TRUE.equals(generateOptions.getUnifiedConfig())) {
 tableInfoList.forEach(tableInfo -> {
- tableInfo.setSaveModelName(finalSelectedTableInfo.getSaveModelName());
- tableInfo.setSavePackageName(finalSelectedTableInfo.getSavePackageName());
- tableInfo.setSavePath(finalSelectedTableInfo.getSavePath());
- tableInfo.setPreName(finalSelectedTableInfo.getPreName());
+ tableInfo.setSaveModelName(selectedTableInfo.getSaveModelName());
+ tableInfo.setSavePackageName(selectedTableInfo.getSavePackageName());
+ tableInfo.setSavePath(selectedTableInfo.getSavePath());
+ tableInfo.setPreName(selectedTableInfo.getPreName());
 });
 }
 
diff --git a/src/main/java/com/sjhy/plugin/service/impl/LocalFileExportImportSettingsServiceImpl.java b/src/main/java/com/sjhy/plugin/service/impl/LocalFileExportImportSettingsServiceImpl.java
index 076dcd9b..60aa1dee 100644
--- a/src/main/java/com/sjhy/plugin/service/impl/LocalFileExportImportSettingsServiceImpl.java
+++ b/src/main/java/com/sjhy/plugin/service/impl/LocalFileExportImportSettingsServiceImpl.java
@@ -25,6 +25,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 /**
 * 本地文件导入导出设置服务实现
@@ -43,7 +44,7 @@ public class LocalFileExportImportSettingsServiceImpl implements ExportImportSet
 public void exportConfig(SettingsStorageDTO settingsStorage) {
 // 1.选择储存位置
 FileSaverDialog saveFileDialog = FileChooserFactory.getInstance().createSaveFileDialog(new FileSaverDescriptor("Save Config As Json", "Save to"), ProjectUtils.getCurrProject());
- VirtualFileWrapper saveFile = saveFileDialog.save(null, "EasyCodeConfig.json");
+ VirtualFileWrapper saveFile = saveFileDialog.save((VirtualFile) null, "EasyCodeConfig.json");
 if (saveFile == null) {
 return;
 }
@@ -52,7 +53,7 @@ public void exportConfig(SettingsStorageDTO settingsStorage) {
 FileUtil.createIfDoesntExist(file);
 WriteCommandAction.runWriteCommandAction(ProjectUtils.getCurrProject(), () -> {
 try {
- byte[] bytes = JSON.toJson(settingsStorage).getBytes();
+ byte[] bytes = JSON.toJsonByFormat(settingsStorage).getBytes(StandardCharsets.UTF_8);
 VirtualFile virtualFile = VfsUtil.findFileByIoFile(file, true);
 if (virtualFile != null) {
 virtualFile.setBinaryContent(bytes);
diff --git a/src/main/java/com/sjhy/plugin/service/impl/NetworkExportImportSettingsServiceImpl.java b/src/main/java/com/sjhy/plugin/service/impl/NetworkExportImportSettingsServiceImpl.java
index a2a09c96..4c9030c8 100644
--- a/src/main/java/com/sjhy/plugin/service/impl/NetworkExportImportSettingsServiceImpl.java
+++ b/src/main/java/com/sjhy/plugin/service/impl/NetworkExportImportSettingsServiceImpl.java
@@ -50,7 +50,7 @@ public void exportConfig(SettingsStorageDTO settingsStorage) {
 // 显示token
 try {
 Method method = Messages.class.getMethod("showInputDialog", Project.class, String.class, String.class, Icon.class, String.class, InputValidator.class, TextRange.class, String.class);
- method.invoke(null, ProjectUtils.getCurrProject(), result, GlobalDict.TITLE_INFO, AllIcons.General.InformationDialog, token, new NonEmptyInputValidator(), null, "Easy Code官网地址:<a href='/index.cgi/contrast/http://www.shujuhaiyang.com'>www.shujuhaiyang.com</a>");
+ method.invoke(null, ProjectUtils.getCurrProject(), result, GlobalDict.TITLE_INFO, AllIcons.General.InformationDialog, token, new NonEmptyInputValidator(), null, "Easy Code官网地址:<a href='/index.cgi/contrast/http://www.ieasycode.com:9527'>www.ieasycode.com:9527</a>");
 } catch (NoSuchMethodException &#124; IllegalAccessException &#124; InvocationTargetException e) {
 // 兼容旧版本
 Messages.showInputDialog(ProjectUtils.getCurrProject(), result, GlobalDict.TITLE_INFO, AllIcons.General.InformationDialog, token, new NonEmptyInputValidator(), null);
diff --git a/src/main/java/com/sjhy/plugin/service/impl/TableInfoSettingsServiceImpl.java b/src/main/java/com/sjhy/plugin/service/impl/TableInfoSettingsServiceImpl.java
index 34e030d8..5cadcca9 100644
--- a/src/main/java/com/sjhy/plugin/service/impl/TableInfoSettingsServiceImpl.java
+++ b/src/main/java/com/sjhy/plugin/service/impl/TableInfoSettingsServiceImpl.java
@@ -3,7 +3,6 @@
 import com.intellij.database.psi.DbTable;
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
-import com.intellij.psi.PsiClass;
 import com.sjhy.plugin.dto.TableInfoSettingsDTO;
 import com.sjhy.plugin.entity.TableInfo;
 import com.sjhy.plugin.service.TableInfoSettingsService;
@@ -44,17 +43,6 @@ public TableInfo getTableInfo(DbTable dbTable) {
 return Objects.requireNonNull(getState()).readTableInfo(dbTable);
 }
 
- /**
- * 获取表信息
- *
- * @param psiClass psi类
- * @return {@link TableInfo}
- */
- @Override
- public TableInfo getTableInfo(PsiClass psiClass) {
- return Objects.requireNonNull(getState()).readTableInfo(psiClass);
- }
-
 /**
 * 保存表信息
 *
@@ -74,4 +62,14 @@ public void saveTableInfo(TableInfo tableInfo) {
 public void resetTableInfo(DbTable dbTable) {
 Objects.requireNonNull(getState()).resetTableInfo(dbTable);
 }
+
+ /**
+ * 删除表信息
+ *
+ * @param dbTable 数据库表
+ */
+ @Override
+ public void removeTableInfo(DbTable dbTable) {
+ Objects.requireNonNull(getState()).removeTableInfo(dbTable);
+ }
 }
diff --git a/src/main/java/com/sjhy/plugin/tool/CacheDataUtils.java b/src/main/java/com/sjhy/plugin/tool/CacheDataUtils.java
index 39a77126..779ef055 100644
--- a/src/main/java/com/sjhy/plugin/tool/CacheDataUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/CacheDataUtils.java
@@ -1,7 +1,6 @@
 package com.sjhy.plugin.tool;
 
 import com.intellij.database.psi.DbTable;
-import com.intellij.psi.PsiClass;
 import lombok.Data;
 
 import java.util.List;
@@ -42,14 +41,4 @@ private CacheDataUtils() {
 * 所有选中的表
 */
 private List<dbtable> dbTableList;
-
- /**
- * 选中的类
- */
- private PsiClass selectPsiClass;
-
- /**
- * 所有选中的表
- */
- private List<psiclass> psiClassList;
 }
diff --git a/src/main/java/com/sjhy/plugin/tool/DocCommentUtils.java b/src/main/java/com/sjhy/plugin/tool/DocCommentUtils.java
deleted file mode 100644
index a6773302..00000000
--- a/src/main/java/com/sjhy/plugin/tool/DocCommentUtils.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.sjhy.plugin.tool;
-
-import com.intellij.psi.PsiElement;
-import com.intellij.psi.javadoc.PsiDocComment;
-import com.intellij.psi.javadoc.PsiDocToken;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Arrays;
-
-/**
- * 文档注释工具类
- *
- * @author makejava
- * @version 1.0.0
- * @date 2021年08月16日 17:37
- */
-public class DocCommentUtils {
-
- /**
- * 获取注释信息,获取第一条文本类型注释内容,不存在则返回null
- *
- * @param docComment 文档注释
- * @return 注释内容
- */
- public static String getComment(@Nullable PsiDocComment docComment) {
- if (docComment == null) {
- return null;
- }
- return Arrays.stream(docComment.getDescriptionElements())
- .filter(o -> o instanceof PsiDocToken)
- .map(PsiElement::getText)
- .findFirst()
- .map(String::trim)
- .orElse(null);
- }
-
-}
diff --git a/src/main/java/com/sjhy/plugin/tool/FileUtils.java b/src/main/java/com/sjhy/plugin/tool/FileUtils.java
index a6845b6c..5f476498 100644
--- a/src/main/java/com/sjhy/plugin/tool/FileUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/FileUtils.java
@@ -109,7 +109,14 @@ public Document writeFileContent(Project project, VirtualFile file, String fileN
 FileDocumentManager fileDocumentManager = FileDocumentManager.getInstance();
 Document document = fileDocumentManager.getDocument(file);
 if (document == null) {
- throw new IllegalStateException("获取文档对象失败,fileName:" + fileName);
+ WriteCommandAction.runWriteCommandAction(project, () -> {
+ try {
+ file.setBinaryContent(text.getBytes());
+ } catch (IOException e) {
+ throw new IllegalStateException("二进制文件写入失败,fileName:" + fileName);
+ }
+ });
+ return fileDocumentManager.getDocument(file);
 }
 WriteCommandAction.runWriteCommandAction(project, () -> document.setText(text));
 PsiDocumentManager psiDocumentManager = PsiDocumentManager.getInstance(project);
diff --git a/src/main/java/com/sjhy/plugin/tool/GlobalTool.java b/src/main/java/com/sjhy/plugin/tool/GlobalTool.java
index e000c0bf..720949a4 100644
--- a/src/main/java/com/sjhy/plugin/tool/GlobalTool.java
+++ b/src/main/java/com/sjhy/plugin/tool/GlobalTool.java
@@ -6,6 +6,8 @@
 import com.sjhy.plugin.entity.DebugField;
 import com.sjhy.plugin.entity.DebugMethod;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -154,8 +156,15 @@ public String debug(Object obj) {
 if (val != null) {
 debugMethod.setValue(val.toString());
 }
- } catch (IllegalAccessException &#124; InvocationTargetException e) {
- ExceptionUtil.rethrow(e);
+ } catch (IllegalAccessException e) {
+ // 忽略不允许访问异常
+ } catch (Throwable e) {
+ // 其他任何异常都捕获
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ PrintStream printStream = new PrintStream(out);
+ e.printStackTrace(printStream);
+ // 字节流的close方法本身就是空方法,没必要执行close操作
+ debugMethod.setValue("调用发生异常:" + out);
 }
 }
 }
@@ -221,7 +230,7 @@ public String serial() {
 * @param json json字符串
 * @return map对象
 */
- public Map parseJson(String json) {
+ public Map<?,?> parseJson(String json) {
 if (StringUtils.isEmpty(json)) {
 return null;
 }
diff --git a/src/main/java/com/sjhy/plugin/tool/HttpUtils.java b/src/main/java/com/sjhy/plugin/tool/HttpUtils.java
index f5086360..abd5ff3c 100644
--- a/src/main/java/com/sjhy/plugin/tool/HttpUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/HttpUtils.java
@@ -42,7 +42,7 @@ public final class HttpUtils {
 /**
 * 服务器地址
 */
- private static final String HOST_URL = "http://www.shujuhaiyang.com/easyCode";
+ private static final String HOST_URL = "http://www.ieasycode.com:9527/easyCode";
 /**
 * http客户端
 */
diff --git a/src/main/java/com/sjhy/plugin/tool/ModuleUtils.java b/src/main/java/com/sjhy/plugin/tool/ModuleUtils.java
index ac21dbd0..4a41cb85 100644
--- a/src/main/java/com/sjhy/plugin/tool/ModuleUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/ModuleUtils.java
@@ -35,6 +35,13 @@ private ModuleUtils() {
 * @return 路径
 */
 public static VirtualFile getModuleDir(@NotNull Module module) {
+ // 优先使用ModuleRootManager来获取module路径
+ ModuleRootManager moduleRootManager = ModuleRootManager.getInstance(module);
+ for (VirtualFile contentRoot : moduleRootManager.getContentRoots()) {
+ if (contentRoot.isDirectory() && contentRoot.getName().equals(module.getName())) {
+ return contentRoot;
+ }
+ }
 String modulePath = ModuleUtil.getModuleDirPath(module);
 // 统一路径分割符号
 modulePath = modulePath.replace("\\", "/");
diff --git a/src/main/java/com/sjhy/plugin/tool/PsiClassGenerateUtils.java b/src/main/java/com/sjhy/plugin/tool/PsiClassGenerateUtils.java
deleted file mode 100644
index 36661f4f..00000000
--- a/src/main/java/com/sjhy/plugin/tool/PsiClassGenerateUtils.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.sjhy.plugin.tool;
-
-import com.intellij.psi.PsiAnnotation;
-import com.intellij.psi.PsiField;
-import com.intellij.psi.PsiModifier;
-import com.intellij.psi.PsiModifierList;
-
-/**
- * 从实体类生成代码业务工具类
- *
- * @author Mario Luo
- */
-public final class PsiClassGenerateUtils {
-
- private PsiClassGenerateUtils() {
- }
-
- /**
- * 是否是主键字段
- */
- public static boolean isPkField(PsiField field) {
- if("id".equals(field.getName())) {
- return true;
- }
- if (existsAnnotation(field, "org.springframework.data.annotation.Id")) {
- return true;
- }
- if (existsAnnotation(field, "javax.persistence.Id")) {
- return true;
- }
- return false;
- }
-
- /**
- * 是否需要跳过该字段
- */
- public static boolean isSkipField(PsiField field) {
- PsiModifierList modifierList = field.getModifierList();
- if(modifierList != null && modifierList.hasExplicitModifier(PsiModifier.STATIC)) {
- return true;
- }
- if (existsAnnotation(field, "org.springframework.data.annotation.Transient")) {
- return true;
- }
- if (existsAnnotation(field, "javax.persistence.Transient")) {
- return true;
- }
- return false;
- }
-
- private static boolean existsAnnotation(PsiField field, String clsName) {
- return getAnnotation(field, clsName) != null;
- }
-
- private static PsiAnnotation getAnnotation(PsiField field, String clsName) {
- PsiModifierList list = field.getModifierList();
- return list == null ? null : list.findAnnotation(clsName);
- }
-}
diff --git a/src/main/java/com/sjhy/plugin/tool/ReflectionUtils.java b/src/main/java/com/sjhy/plugin/tool/ReflectionUtils.java
index 3c7ed070..c38f85b0 100644
--- a/src/main/java/com/sjhy/plugin/tool/ReflectionUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/ReflectionUtils.java
@@ -1,7 +1,13 @@
 package com.sjhy.plugin.tool;
 
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 
 /**
 * 反射工具
@@ -25,4 +31,59 @@ public static Class<?> getGenericClass(Object obj, int index) {
 }
 }
 
+ public static Method getDeclaredMethod(Class<?> clazz, String name, Class<?>... parameterTypes) {
+ Class<?> searchType = clazz;
+ while (searchType != null) {
+ Method[] methods = (searchType.isInterface() ? searchType.getMethods() : getDeclaredMethods(searchType));
+ for (Method method : methods) {
+ if (!Objects.equals(name, method.getName())) {
+ continue;
+ }
+ if (parameterTypes == null &#124;&#124; Arrays.equals(parameterTypes, method.getParameterTypes())) {
+ return method;
+ }
+ }
+ searchType = searchType.getSuperclass();
+ }
+ return null;
+ }
+
+ private static Method[] getDeclaredMethods(Class<?> clazz) {
+ Method[] result;
+ try {
+ Method[] declaredMethods = clazz.getDeclaredMethods();
+ List<method> defaultMethods = findConcreteMethodsOnInterfaces(clazz);
+ if (defaultMethods != null) {
+ result = new Method[declaredMethods.length + defaultMethods.size()];
+ System.arraycopy(declaredMethods, 0, result, 0, declaredMethods.length);
+ int index = declaredMethods.length;
+ for (Method defaultMethod : defaultMethods) {
+ result[index] = defaultMethod;
+ index++;
+ }
+ } else {
+ result = declaredMethods;
+ }
+ } catch (Throwable ex) {
+ throw new IllegalStateException("Failed to introspect Class [" + clazz.getName() +
+ "] from ClassLoader [" + clazz.getClassLoader() + "]", ex);
+ }
+ return result;
+ }
+
+ private static List<method> findConcreteMethodsOnInterfaces(Class<?> clazz) {
+ List<method> result = null;
+ for (Class<?> ifc : clazz.getInterfaces()) {
+ for (Method ifcMethod : ifc.getMethods()) {
+ if (!Modifier.isAbstract(ifcMethod.getModifiers())) {
+ if (result == null) {
+ result = new ArrayList<strong>();
+ }
+ result.add(ifcMethod);
+ }
+ }
+ }
+ return result;
+ }
+
 }
diff --git a/src/main/java/com/sjhy/plugin/tool/TemplateUtils.java b/src/main/java/com/sjhy/plugin/tool/TemplateUtils.java
index 9b0702c6..61510001 100644
--- a/src/main/java/com/sjhy/plugin/tool/TemplateUtils.java
+++ b/src/main/java/com/sjhy/plugin/tool/TemplateUtils.java
@@ -35,7 +35,7 @@ public static String addGlobalConfig(String template, Collection<globalconfig> g
 for (GlobalConfig globalConfig : globalConfigs) {
 String name = globalConfig.getName();
 // 正则被替换字符转义处理
- String value = globalConfig.getValue().replace("$", "\\$");
+ String value = globalConfig.getValue().replace("\\", "\\\\").replace("$", "\\$");
 
 // 将不带{}的变量加上{}
 template = template.replaceAll("\\$!?" + name + "(\\W)", "\\$!{" + name + "}1ドル");
diff --git a/src/main/java/com/sjhy/plugin/ui/ColumnConfigSettingForm.java b/src/main/java/com/sjhy/plugin/ui/ColumnConfigSettingForm.java
index a3416ed9..50d79354 100644
--- a/src/main/java/com/sjhy/plugin/ui/ColumnConfigSettingForm.java
+++ b/src/main/java/com/sjhy/plugin/ui/ColumnConfigSettingForm.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.intellij.openapi.options.Configurable;
+import com.intellij.openapi.ui.ComboBoxTableRenderer;
 import com.sjhy.plugin.dict.GlobalDict;
 import com.sjhy.plugin.dto.SettingsStorageDTO;
 import com.sjhy.plugin.entity.ColumnConfig;
@@ -15,11 +16,13 @@
 
 import javax.swing.*;
 import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableCellRenderer;
 import java.awt.*;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import java.util.stream.Stream;
 
 /**
 * @author makejava
@@ -27,7 +30,7 @@
 * @date 2021年08月10日 13:27
 */
 public class ColumnConfigSettingForm implements Configurable, BaseSettings {
- private JPanel mainPanel;
+ private final JPanel mainPanel;
 /**
 * 列配置
 */
@@ -51,14 +54,16 @@ public ColumnConfigSettingForm() {
 
 private void initTable() {
 // 第一列,类型
- TableCellEditor typeEditor = CellEditorFactory.createComboBoxEditor(false, ColumnConfigType.class);
- TableComponent.Column<columnconfig> typeColumn = new TableComponent.Column<strong>("type", item -> item.getType().name(), (entity, val) -> entity.setType(ColumnConfigType.valueOf(val)), typeEditor);
+ String[] columnConfigTypeNames = Stream.of(ColumnConfigType.values()).map(ColumnConfigType::name).toArray(String[]::new);
+ TableCellEditor typeEditor = CellEditorFactory.createComboBoxEditor(false, columnConfigTypeNames);
+ TableCellRenderer typeRenderer = new ComboBoxTableRenderer<strong>(columnConfigTypeNames);
+ TableComponent.Column<columnconfig> typeColumn = new TableComponent.Column<strong>("type", item -> item.getType().name(), (entity, val) -> entity.setType(ColumnConfigType.valueOf(val)), typeEditor, typeRenderer);
 // 第二列标题
 TableCellEditor titleEditor = CellEditorFactory.createTextFieldEditor();
- TableComponent.Column<columnconfig> titleColumn = new TableComponent.Column<strong>("title", ColumnConfig::getTitle, ColumnConfig::setTitle, titleEditor);
+ TableComponent.Column<columnconfig> titleColumn = new TableComponent.Column<strong>("title", ColumnConfig::getTitle, ColumnConfig::setTitle, titleEditor, null);
 // 第三列选项
 TableCellEditor selectValueEditor = CellEditorFactory.createTextFieldEditor();
- TableComponent.Column<columnconfig> selectValueColumn = new TableComponent.Column<strong>("selectValue", ColumnConfig::getSelectValue, ColumnConfig::setSelectValue, selectValueEditor);
+ TableComponent.Column<columnconfig> selectValueColumn = new TableComponent.Column<strong>("selectValue", ColumnConfig::getSelectValue, ColumnConfig::setSelectValue, selectValueEditor, null);
 List<table class="undef">> columns = Arrays.asList(typeColumn, titleColumn, selectValueColumn);
 
 // 表格初始化
diff --git a/src/main/java/com/sjhy/plugin/ui/ConfigTableDialog.java b/src/main/java/com/sjhy/plugin/ui/ConfigTableDialog.java
index 1a37bf48..2d50eac2 100644
--- a/src/main/java/com/sjhy/plugin/ui/ConfigTableDialog.java
+++ b/src/main/java/com/sjhy/plugin/ui/ConfigTableDialog.java
@@ -1,6 +1,9 @@
 package com.sjhy.plugin.ui;
 
+import com.intellij.openapi.ui.ComboBoxTableRenderer;
 import com.intellij.openapi.ui.DialogWrapper;
+import com.intellij.ui.BooleanTableCellEditor;
+import com.intellij.ui.BooleanTableCellRenderer;
 import com.intellij.ui.ToolbarDecorator;
 import com.intellij.ui.table.JBTable;
 import com.sjhy.plugin.dict.GlobalDict;
@@ -18,6 +21,8 @@
 import javax.swing.*;
 import javax.swing.table.TableColumn;
 import java.awt.*;
+import java.util.ArrayList;
+import java.util.Arrays;
 
 /**
 * 表配置窗口
@@ -30,7 +35,7 @@ public class ConfigTableDialog extends DialogWrapper {
 /**
 * 主面板
 */
- private JPanel mainPanel;
+ private final JPanel mainPanel;
 /**
 * 表信息对象
 */
@@ -50,27 +55,51 @@ private void initPanel() {
 JBTable table = new JBTable(model);
 table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 
+ int totalWidth = 0;
+
 // 配置列编辑器
- table.getColumn("name").setCellEditor(CellEditorFactory.createTextFieldEditor());
- table.getColumn("type").setCellEditor(CellEditorFactory.createComboBoxEditor(true, GlobalDict.DEFAULT_JAVA_TYPE_LIST));
- table.getColumn("type").setMinWidth(120);
- table.getColumn("comment").setCellEditor(CellEditorFactory.createTextFieldEditor());
+ TableColumn nameColumn = table.getColumn("name");
+ nameColumn.setCellEditor(CellEditorFactory.createTextFieldEditor());
+ nameColumn.setMinWidth(100);
+ totalWidth+=100;
+ TableColumn typeColumn = table.getColumn("type");
+ typeColumn.setCellRenderer(new ComboBoxTableRenderer<strong>(GlobalDict.DEFAULT_JAVA_TYPE_LIST));
+ typeColumn.setCellEditor(CellEditorFactory.createComboBoxEditor(true, GlobalDict.DEFAULT_JAVA_TYPE_LIST));
+ typeColumn.setMinWidth(120);
+ totalWidth+=120;
+ TableColumn commentColumn = table.getColumn("comment");
+ commentColumn.setCellEditor(CellEditorFactory.createTextFieldEditor());
+ commentColumn.setMinWidth(140);
+ totalWidth+=140;
 // 其他附加列
 for (ColumnConfig columnConfig : CurrGroupUtils.getCurrColumnConfigGroup().getElementList()) {
 TableColumn column = table.getColumn(columnConfig.getTitle());
 switch (columnConfig.getType()) {
 case TEXT:
 column.setCellEditor(CellEditorFactory.createTextFieldEditor());
+ column.setMinWidth(120);
+ totalWidth+=120;
 break;
 case SELECT:
 if (StringUtils.isEmpty(columnConfig.getSelectValue())) {
 column.setCellEditor(CellEditorFactory.createTextFieldEditor());
 } else {
- column.setCellEditor(CellEditorFactory.createComboBoxEditor(false, columnConfig.getSelectValue().split(",")));
+ String[] split = columnConfig.getSelectValue().split(",");
+ ArrayList<string> list = new ArrayList<strong>(Arrays.asList(split));
+ // 添加一个空值作为默认值
+ list.add(0, "");
+ split = list.toArray(new String[0]);
+ column.setCellRenderer(new ComboBoxTableRenderer<strong>(split));
+ column.setCellEditor(CellEditorFactory.createComboBoxEditor(false, split));
 }
+ column.setMinWidth(100);
+ totalWidth+=100;
 break;
 case BOOLEAN:
- column.setCellEditor(CellEditorFactory.createBooleanEditor());
+ column.setCellRenderer(new BooleanTableCellRenderer());
+ column.setCellEditor(new BooleanTableCellEditor());
+ column.setMinWidth(60);
+ totalWidth+=60;
 break;
 default:
 break;
@@ -79,7 +108,7 @@ private void initPanel() {
 
 final ToolbarDecorator decorator = ToolbarDecorator.createDecorator(table);
 this.mainPanel.add(decorator.createPanel(), BorderLayout.CENTER);
- this.mainPanel.setMinimumSize(new Dimension(600, 300));
+ this.mainPanel.setMinimumSize(new Dimension(totalWidth, Math.max(300, totalWidth / 3)));
 }
 
 @Override
diff --git a/src/main/java/com/sjhy/plugin/ui/MainSettingForm.form b/src/main/java/com/sjhy/plugin/ui/MainSettingForm.form
index 9a70deb6..3135745f 100644
--- a/src/main/java/com/sjhy/plugin/ui/MainSettingForm.form
+++ b/src/main/java/com/sjhy/plugin/ui/MainSettingForm.form
@@ -61,7 +61,6 @@
 <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties>
- <icon value="actions/intentionBulb.png"/>
 <text value=""/>
 </properties>
 </component>
@@ -91,12 +90,11 @@
 </constraints>
 <properties/>
 </component>
- <component id="b4580">
+ <component id="b4580" binding="authorTitle">
 <constraints>
 <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
 </constraints>
 <properties>
- <icon value="actions/intentionBulb.png"/>
 <text value=""/>
 <tooltiptext value="用于指定生成的Java文件中的作者名称"/>
 </properties>
diff --git a/src/main/java/com/sjhy/plugin/ui/MainSettingForm.java b/src/main/java/com/sjhy/plugin/ui/MainSettingForm.java
index 607b745a..be02396f 100644
--- a/src/main/java/com/sjhy/plugin/ui/MainSettingForm.java
+++ b/src/main/java/com/sjhy/plugin/ui/MainSettingForm.java
@@ -1,7 +1,9 @@
 package com.sjhy.plugin.ui;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
+import com.sjhy.plugin.dict.GlobalDict;
 import com.sjhy.plugin.dto.SettingsStorageDTO;
 import com.sjhy.plugin.service.impl.ClipboardExportImportSettingsServiceImpl;
 import com.sjhy.plugin.service.impl.LocalFileExportImportSettingsServiceImpl;
@@ -36,6 +38,7 @@ public class MainSettingForm implements Configurable, Configurable.Composite, Ba
 private JTextField authorEditor;
 private JLabel userSecureLabel;
 private JLabel userSecureTitle;
+ private JLabel authorTitle;
 
 /**
 * 子配置
@@ -86,7 +89,7 @@ public String getHelpTopic() {
 }
 
 @Override
- public @NotNull Configurable[] getConfigurables() {
+ public Configurable @NotNull [] getConfigurables() {
 this.childConfigurableArray = new Configurable[]{
 new TypeMapperSettingForm(),
 new TemplateSettingForm(),
@@ -114,6 +117,9 @@ private void loadChildSettingsStore() {
 this.userSecureEditor.setVisible(false);
 this.userSecureTitle.setVisible(false);
 this.userSecureLabel.setVisible(false);
+ // 初始图标
+ this.authorTitle.setIcon(AllIcons.Actions.IntentionBulb);
+ this.userSecureTitle.setIcon(AllIcons.Actions.IntentionBulb);
 // 加载储存数据
 this.loadSettingsStore();
 // 初始化事件
@@ -151,7 +157,7 @@ public void apply() throws ConfigurationException {
 */
 @Override
 public void loadSettingsStore(SettingsStorageDTO settingsStorage) {
- this.versionLabel.setText(settingsStorage.getVersion());
+ this.versionLabel.setText(GlobalDict.VERSION);
 this.authorEditor.setText(settingsStorage.getAuthor());
 this.userSecureEditor.setText(settingsStorage.getUserSecure());
 if (StringUtils.isEmpty(settingsStorage.getUserSecure())) {
diff --git a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form
index da41a410..abb73e80 100644
--- a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form
+++ b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.form
@@ -16,11 +16,13 @@
 <properties/>
 <border type="none"/>
 <children>
- <component id="76436" binding="moduleComboBox">
+ <component id="76436" binding="moduleComboBox">
 <constraints>
 <grid row="0" column="1" row-span="1" col-span="1" vsize-policy="0" hsize-policy="2" anchor="8" fill="1" indent="0" use-parent-layout="false"/>
 </constraints>
- <properties/>
+ <properties>
+ <swingpopup value="false"/>
+ </properties>
 </component>
 <component id="2dff5">
 <constraints>
diff --git a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java
index 04802373..37c3b862 100644
--- a/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java
+++ b/src/main/java/com/sjhy/plugin/ui/SelectSavePath.java
@@ -112,23 +112,11 @@ public class SelectSavePath extends DialogWrapper {
 */
 private List<module> moduleList;
 
- /**
- * 实体模式生成代码
- */
- private boolean entityMode;
-
 /**
 * 模板选择组件
 */
 private TemplateSelectComponent templateSelectComponent;
 
- /**
- * 构造方法
- */
- public SelectSavePath(Project project) {
- this(project, false);
- }
-
 @Override
 protected @Nullable JComponent createCenterPanel() {
 return this.contentPane;
@@ -137,9 +125,8 @@ public SelectSavePath(Project project) {
 /**
 * 构造方法
 */
- public SelectSavePath(Project project, boolean entityMode) {
+ public SelectSavePath(Project project) {
 super(project);
- this.entityMode = entityMode;
 this.project = project;
 this.tableInfoService = TableInfoSettingsService.getInstance();
 this.codeGenerateService = CodeGenerateService.getInstance(project);
@@ -225,12 +212,7 @@ public void focusLost(FocusEvent e) {
 
 private void refreshData() {
 // 获取选中的表信息(鼠标右键的那张表),并提示未知类型
- TableInfo tableInfo;
- if(entityMode) {
- tableInfo = tableInfoService.getTableInfo(cacheDataUtils.getSelectPsiClass());
- } else {
- tableInfo = tableInfoService.getTableInfo(cacheDataUtils.getSelectDbTable());
- }
+ TableInfo tableInfo = tableInfoService.getTableInfo(cacheDataUtils.getSelectDbTable());
 
 // 设置默认配置信息
 if (!StringUtils.isEmpty(tableInfo.getSaveModelName())) {
@@ -296,12 +278,7 @@ private void onOK() {
 }
 }
 // 保存配置
- TableInfo tableInfo;
- if(!entityMode) {
- tableInfo = tableInfoService.getTableInfo(cacheDataUtils.getSelectDbTable());
- } else {
- tableInfo = tableInfoService.getTableInfo(cacheDataUtils.getSelectPsiClass());
- }
+ TableInfo tableInfo = tableInfoService.getTableInfo(cacheDataUtils.getSelectDbTable());
 tableInfo.setSavePath(savePath);
 tableInfo.setSavePackageName(packageField.getText());
 tableInfo.setPreName(preField.getText());
@@ -338,7 +315,6 @@ private void initPanel() {
 */
 private GenerateOptions getGenerateOptions() {
 return GenerateOptions.builder()
- .entityModel(this.entityMode)
 .reFormat(reFormatCheckBox.isSelected())
 .titleSure(titleSureCheckBox.isSelected())
 .titleRefuse(titleRefuseCheckBox.isSelected())
diff --git a/src/main/java/com/sjhy/plugin/ui/TypeMapperSettingForm.java b/src/main/java/com/sjhy/plugin/ui/TypeMapperSettingForm.java
index 53a58b6e..5a2c23b3 100644
--- a/src/main/java/com/sjhy/plugin/ui/TypeMapperSettingForm.java
+++ b/src/main/java/com/sjhy/plugin/ui/TypeMapperSettingForm.java
@@ -1,6 +1,7 @@
 package com.sjhy.plugin.ui;
 
 import com.fasterxml.jackson.core.type.TypeReference;
+import com.intellij.openapi.ui.ComboBoxTableRenderer;
 import com.sjhy.plugin.dict.GlobalDict;
 import com.sjhy.plugin.dto.SettingsStorageDTO;
 import com.sjhy.plugin.entity.TypeMapper;
@@ -14,11 +15,13 @@
 
 import javax.swing.*;
 import javax.swing.table.TableCellEditor;
+import javax.swing.table.TableCellRenderer;
 import java.awt.*;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Consumer;
+import java.util.stream.Stream;
 
 /**
 * @author makejava
@@ -26,7 +29,7 @@
 * @date 2021年08月07日 15:33
 */
 public class TypeMapperSettingForm implements BaseSettings {
- private JPanel mainPanel;
+ private final JPanel mainPanel;
 /**
 * 类型映射配置
 */
@@ -50,18 +53,22 @@ public TypeMapperSettingForm() {
 
 private void initTable() {
 // 第一列仅适用下拉框
- TableCellEditor matchTypeEditor = CellEditorFactory.createComboBoxEditor(false, MatchType.class);
+ String[] matchTypeNames = Stream.of(MatchType.values()).map(MatchType::name).toArray(String[]::new);
+ TableCellEditor matchTypeEditor = CellEditorFactory.createComboBoxEditor(false, matchTypeNames);
+ TableCellRenderer matchTypeRenderer = new ComboBoxTableRenderer<strong>(matchTypeNames);
 TableComponent.Column<typemapper> matchTypeColumn = new TableComponent.Column<strong>("matchType",
 item -> item.getMatchType() != null ? item.getMatchType().name() : MatchType.REGEX.name(),
 (entity, val) -> entity.setMatchType(MatchType.valueOf(val)),
- matchTypeEditor
+ matchTypeEditor,
+ matchTypeRenderer
 );
 // 第二列监听输入状态,及时修改属性值
 TableCellEditor columnTypeEditor = CellEditorFactory.createTextFieldEditor();
- TableComponent.Column<typemapper> columnTypeColumn = new TableComponent.Column<strong>("columnType", TypeMapper::getColumnType, TypeMapper::setColumnType, columnTypeEditor);
+ TableComponent.Column<typemapper> columnTypeColumn = new TableComponent.Column<strong>("columnType", TypeMapper::getColumnType, TypeMapper::setColumnType, columnTypeEditor, null);
 // 第三列支持下拉框
 TableCellEditor javaTypeEditor = CellEditorFactory.createComboBoxEditor(true, GlobalDict.DEFAULT_JAVA_TYPE_LIST);
- TableComponent.Column<typemapper> javaTypeColumn = new TableComponent.Column<strong>("javaType", TypeMapper::getJavaType, TypeMapper::setJavaType, javaTypeEditor);
+ TableCellRenderer javaTypeRenderer = new ComboBoxTableRenderer<strong>(GlobalDict.DEFAULT_JAVA_TYPE_LIST);
+ TableComponent.Column<typemapper> javaTypeColumn = new TableComponent.Column<strong>("javaType", TypeMapper::getJavaType, TypeMapper::setJavaType, javaTypeEditor, javaTypeRenderer);
 List<table class="undef">> columns = Arrays.asList(matchTypeColumn, columnTypeColumn, javaTypeColumn);
 // 表格初始化
 this.tableComponent = new TableComponent<strong>(columns, this.currTypeMapperGroup.getElementList(), TypeMapper.class);
diff --git a/src/main/java/com/sjhy/plugin/ui/component/RealtimeDebugComponent.java b/src/main/java/com/sjhy/plugin/ui/component/RealtimeDebugComponent.java
index 71a95cfd..c41a3a77 100644
--- a/src/main/java/com/sjhy/plugin/ui/component/RealtimeDebugComponent.java
+++ b/src/main/java/com/sjhy/plugin/ui/component/RealtimeDebugComponent.java
@@ -14,15 +14,10 @@
 import com.intellij.openapi.editor.EditorFactory;
 import com.intellij.openapi.editor.ex.EditorEx;
 import com.intellij.openapi.editor.highlighter.EditorHighlighterFactory;
-import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.ui.ComboBox;
 import com.intellij.openapi.ui.DialogBuilder;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Conditions;
-import com.intellij.psi.PsiDocumentManager;
-import com.intellij.psi.PsiFile;
-import com.intellij.psi.PsiFileFactory;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.util.ExceptionUtil;
 import com.intellij.util.ReflectionUtil;
@@ -129,17 +124,12 @@ private void runDebug() {
 }
 // 生成代码
 String code = CodeGenerateService.getInstance(ProjectUtils.getCurrProject()).generate(new Template("temp", editorComponent.getFile().getCode()), tableInfo);
-
+ String fileName = editorComponent.getFile().getName();
 // 创建编辑框
 EditorFactory editorFactory = EditorFactory.getInstance();
- PsiFileFactory psiFileFactory = PsiFileFactory.getInstance(ProjectUtils.getCurrProject());
- String fileName = editorComponent.getFile().getName();
- FileType fileType = FileTypeManager.getInstance().getFileTypeByFileName(fileName);
- PsiFile psiFile = psiFileFactory.createFileFromText(fileName, fileType, code, 0, true);
+ Document document = editorFactory.createDocument(code);
 // 标识为模板,让velocity跳过语法校验
- psiFile.getViewProvider().putUserData(FileTemplateManager.DEFAULT_TEMPLATE_PROPERTIES, FileTemplateManager.getInstance(ProjectUtils.getCurrProject()).getDefaultProperties());
- Document document = PsiDocumentManager.getInstance(ProjectUtils.getCurrProject()).getDocument(psiFile);
- assert document != null;
+ document.putUserData(FileTemplateManager.DEFAULT_TEMPLATE_PROPERTIES, FileTemplateManager.getInstance(ProjectUtils.getCurrProject()).getDefaultProperties());
 Editor editor = editorFactory.createViewer(document, ProjectUtils.getCurrProject());
 // 配置编辑框
 EditorSettingsInit.init(editor);
diff --git a/src/main/java/com/sjhy/plugin/ui/component/TableComponent.java b/src/main/java/com/sjhy/plugin/ui/component/TableComponent.java
index 10262526..e0a3a1f0 100644
--- a/src/main/java/com/sjhy/plugin/ui/component/TableComponent.java
+++ b/src/main/java/com/sjhy/plugin/ui/component/TableComponent.java
@@ -13,7 +13,7 @@
 import javax.swing.*;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableCellEditor;
-import java.util.Collections;
+import javax.swing.table.TableCellRenderer;
 import java.util.List;
 import java.util.Vector;
 import java.util.function.BiConsumer;
@@ -30,7 +30,7 @@ public class TableComponent<t extends AbstractItem<t>> extends DefaultTableModel
 /**
 * 列信息
 */
- private List<column<t>> columns;
+ private final List<column<t>> columns;
 /**
 * 表数据
 */
@@ -41,7 +41,7 @@ public class TableComponent<t extends AbstractItem<t>> extends DefaultTableModel
 @Getter
 private JBTable table;
 
- private Class<t> cls;
+ private final Class<t> cls;
 
 public TableComponent(@NonNull List<column<t>> columns, @NonNull List<t> dataList, Class<t> cls) {
 this.columns = columns;
@@ -68,6 +68,9 @@ private void initTable() {
 this.table.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
 // 指定编辑器
 for (Column<t> column : this.columns) {
+ if (column.renderer != null) {
+ this.table.getColumn(column.name).setCellRenderer(column.renderer);
+ }
 if (column.editor != null) {
 this.table.getColumn(column.name).setCellEditor(column.editor);
 }
@@ -157,5 +160,9 @@ public static class Column<t> {
 * 列编辑器
 */
 private TableCellEditor editor;
+ /**
+ * 列展示器
+ */
+ private TableCellRenderer renderer;
 }
 }
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index 51cb566b..1a82877b 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
 <id>com.sjhy.plugin.easycode</id>
- <name>Easy Code</name>
- <vendor email="1353036300@qq.com" url="http://www.shujuhaiyang.com">Easy Code Office Website</vendor>
+ <name>EasyCode</name>
+ <vendor email="1353036300@qq.com" url="http://www.ieasycode.com:9527">Easy Code Office Website</vendor>
 
 <description><![cdata[ <tag>EasyCode,Easy Code,easy,code,code generate,code tools</tag>
@@ -20,6 +20,52 @@
 
 
 <change-notes><![cdata[ + <p>1.2.8-RELEASE</p>
+ <ul>
+ <li>1.Fix the error issue caused by missing icons in version 2023.1</li>
+ <li>2.Fix remote service connection failure issue</li>
+ </ul>
+ <ul>
+ <li>1.修复2023.1版本图标丢失导致报错问题</li>
+ <li>2.修复远程服务连接失败问题</li>
+ </ul>
+ <p>1.2.7-RELEASE</p>
+ <ul>
+ <li>1.Fix extended attribute save loss</li>
+ <li>2.Fix the problem that the order of newly added fields in the table cannot be consistent</li>
+ <li>3.Optimize UI</li>
+ <li>4.Optimize module selection, support module name search</li>
+ <li>5.Optimize cleanup table configuration function</li>
+ </ul>
+ <ul>
+ <li>1.修复扩展属性保存丢失问题</li>
+ <li>2.修复表新增字段后顺序无法保持一致问题</li>
+ <li>3.优化UI界面</li>
+ </ul>
+ <p>1.2.6-java.RELEASE</p>
+ <ul>
+ <li>1.Fix the problem of exported Chinese garbled code</li>
+ <li>2.Fix the problem that additional columns cannot be edited</li>
+ <li>3.Fix the inconsistency between the template and the global variable escape character</li>
+ <li>4.Optimize module selection, support module name search</li>
+ <li>5.Optimize cleanup table configuration function</li>
+ </ul>
+ <ul>
+ <li>1.修复导出中文乱码问题</li>
+ <li>2.修复附加列无法编辑问题</li>
+ <li>3.修复模板与全局变量转义符不一致问题</li>
+ <li>4.优化模块选择,支持搜索</li>
+ <li>5.优化清理表配置功能</li>
+ </ul>
+ <p>1.2.5-RELEASE</p>
+ <ul>
+ <li>1.Fix failure to switch grouping</li>
+ <li>2.Remove code generation through entity classes(Migrate to EasyCode4Java)</li>
+ </ul>
+ <ul>
+ <li>1.修复无法切换模板分组问题</li>
+ <li>2.删除通过实体类生成代码(迁移至EasyCode4Java)</li>
+ </ul>
 <p>1.2.4-RELEASE</p>
 <ul>
 <li>1.Optimize GUI interface</li>
@@ -223,9 +269,8 @@
 
- 
- <depends>com.intellij.modules.lang</depends>
 
+ <depends>com.intellij.modules.platform</depends>
 <depends>com.intellij.database</depends>
 
 <application-components>
@@ -253,12 +298,6 @@
 
 <add-to-group group-id="DatabaseViewPopupMenu" anchor="first"/>
 </group>
- 
- <action id="com.sjhy.plugin.actions.EasyCodeEntityAction" ->
- <add-to-group group-id="GenerateGroup" anchor="last"/>
- <add-to-group group-id="ProjectViewPopupMenu" anchor="last"/>
- </action>
 </actions>
 
 </idea-plugin>
diff --git a/src/main/resources/defaultConfig.json b/src/main/resources/defaultConfig.json
index 3c1c6ccf..d9ad1d67 100644
--- a/src/main/resources/defaultConfig.json
+++ b/src/main/resources/defaultConfig.json
@@ -1 +1 @@
-{"author":"makejava","version":"1.2.4","userSecure":"","currTypeMapperGroupName":"Default","currTemplateGroupName":"Default","currColumnConfigGroupName":"Default","currGlobalConfigGroupName":"Default","typeMapper":{"Default":{"name":"Default","elementList":[{"matchType":"REGEX","columnType":"varchar(\\(\\d+\\))?","javaType":"java.lang.String"},{"matchType":"REGEX","columnType":"char(\\(\\d+\\))?","javaType":"java.lang.String"},{"matchType":"REGEX","columnType":"(tiny&#124;medium&#124;long)*text","javaType":"java.lang.String"},{"matchType":"REGEX","columnType":"decimal(\\(\\d+,\\d+\\))?","javaType":"java.lang.Double"},{"matchType":"ORDINARY","columnType":"integer","javaType":"java.lang.Integer"},{"matchType":"REGEX","columnType":"(tiny&#124;small&#124;medium)*int(\\(\\d+\\))?","javaType":"java.lang.Integer"},{"matchType":"ORDINARY","columnType":"int4","javaType":"java.lang.Integer"},{"matchType":"ORDINARY","columnType":"int8","javaType":"java.lang.Long"},{"matchType":"REGEX","columnType":"bigint(\\(\\d+\\))?","javaType":"java.lang.Long"},{"matchType":"ORDINARY","columnType":"date","javaType":"java.util.Date"},{"matchType":"ORDINARY","columnType":"datetime","javaType":"java.util.Date"},{"matchType":"ORDINARY","columnType":"timestamp","javaType":"java.util.Date"},{"matchType":"ORDINARY","columnType":"time","javaType":"java.time.LocalTime"},{"matchType":"ORDINARY","columnType":"boolean","javaType":"java.lang.Boolean"}]}},"template":{"spring-data-mongodb":{"name":"spring-data-mongodb","elementList":[{"name":"controller.java.vm","code":"##导入宏定义、设置包名、类名、文件名##导入宏定义\n$!{define.vm}\n#setPackageSuffix(\"controller\")\n#setTableSuffix(\"Controller\")\n#save(\"/controller\", \"Controller.java\")\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n##定义服务名\n#set($serviceSortType = $!tool.append($!tableInfo.name, \"Service\"))\n#set($serviceType = $!tool.append($!tableInfo.savePackageName, \".service.\", $serviceSortType))\n#set($serviceVarName = $!tool.firstLowerCase($serviceSortType))\n\n#set($entityShortType = $!tableInfo.name)\n#set($entityType = $!tableInfo.psiClassObj.getQualifiedName())\n#set($entityVarName = $!tool.firstLowerCase($!tableInfo.name))\n#set($pkType = $!pk.type)\n\nimport $pkType;\nimport $entityType;\nimport $serviceType;\nimport lombok.AllArgsConstructor;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.Pageable;\nimport org.springframework.web.bind.annotation.GetMapping;\nimport org.springframework.web.bind.annotation.PostMapping;\nimport org.springframework.web.bind.annotation.RequestBody;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RestController;\n\n\n/**\n * $!{tableInfo.comment}控制层\n *\n * @author $!author\n * @since $!time.currTime()\n */\n@RestController\n@RequestMapping(\"/$!tool.firstLowerCase($!tableInfo.name)\")\n@AllArgsConstructor\npublic class $!{tableName} {\n\n\tprivate $serviceSortType $serviceVarName;\n\n\t/**\n\t * 获取$!{tableInfo.comment}列表(分页)\n\t */\n\t@GetMapping(\"/list\")\n\tpublic Page<$entityshorttype> list(Pageable page) {\n\t\treturn null;\n\t}\n\n\t/**\n\t * 获取$!{tableInfo.comment}\n\t */\n\t@GetMapping(\"/get\")\n\tpublic $entityShortType get($!pk.shortType id) {\n\t\treturn ${serviceVarName}.findById(id);\n\t}\n\n\t/**\n\t * 添加$!{tableInfo.comment}\n\t */\n\t@PostMapping(\"/add\")\n\tpublic void add(@RequestBody $entityShortType $entityVarName) {\n\t\t${serviceVarName}.save($entityVarName);\n\t}\n\n\n\t/**\n\t * 修改$!{tableInfo.comment}\n\t */\n\t@PostMapping(\"/update\")\n\tpublic void update(@RequestBody $entityShortType $entityVarName) {\n\t\t${serviceVarName}.save($entityVarName);\n\t}\n\n\t/**\n\t * 删除$!{tableInfo.comment}\n\t */\n\t@PostMapping(\"/delete\")\n\tpublic void delete($!pk.shortType id) {\n\t\t${serviceVarName}.deleteById(id);\n\t}\n\n}\n"},{"name":"entity.java.vm","code":"##引入宏定义\n$!{define.vm}\n\n##使用宏定义设置回调(保存位置与文件后缀)\n#save(\"/entity\", \".java\")\n\n##使用宏定义设置包后缀\n#setPackageSuffix(\"entity\")\n\n##使用全局变量实现默认包导入\n$!{autoImport.vm}\nimport java.io.Serializable;\n\n##使用宏定义实现类注释信息\n#tableComment(\"实体类\")\npublic class $!{tableInfo.name} implements Serializable {\n private static final long serialVersionUID = $!tool.serial();\n#foreach($column in $tableInfo.fullColumn)\n #if(${column.comment})/**\n * ${column.comment}\n */#end\n\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n#end\n\n#foreach($column in $tableInfo.fullColumn)\n##使用宏定义实现get,set方法\n#getSetMethod($column)\n#end\n\n}\n"},{"name":"repository.java.vm","code":"##导入宏定义、设置包名、类名、文件名##导入宏定义\n$!{define.vm}\n#setPackageSuffix(\"repository\")\n#setTableSuffix(\"Repository\")\n#save(\"/repository\", \"Repository.java\")\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n##实体类名、主键类名\n#set($entityShortType = $!tableInfo.name)\n#set($entityType = $!tableInfo.psiClassObj.getQualifiedName())\n#set($pkShortType = $!pk.shortType)\n#set($pkType = $!pk.type)\n\nimport $pkType;\nimport $entityType;\nimport org.springframework.data.mongodb.repository.MongoRepository;\n\n\n/**\n * $!{tableInfo.comment}持久层\n *\n * @author $!author\n * @since $!time.currTime()\n */\npublic interface $!{tableName} extends MongoRepository<$entityshorttype, $pkShortType> {\n\n}\n"},{"name":"service.java.vm","code":"##导入宏定义、设置包名、类名、文件名##导入宏定义\n$!{define.vm}\n#setPackageSuffix(\"service\")\n#setTableSuffix(\"Service\")\n#save(\"/service\", \"Service.java\")\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n##实体类名、主键类名\n#set($entityShortType = $!tableInfo.name)\n#set($entityType = $!tableInfo.psiClassObj.getQualifiedName())\n#set($entityVarName = $!tool.firstLowerCase($!tableInfo.name))\n#set($pkShortType = $!pk.shortType)\n#set($pkType = $!pk.type)\n\nimport $pkType;\nimport $entityType;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.Pageable;\nimport java.util.Collection;\nimport java.util.List;\n\n\n/**\n * $!{tableInfo.comment}业务层\n *\n * @author $!author\n * @since $!time.currTime()\n */\npublic interface $!{tableName} {\n\n void save($entityShortType $entityVarName);\n\n void deleteById($pkShortType id);\n\n $entityShortType findById($pkShortType id);\n\n List<$entityshorttype> findById(Collection<$pkshorttype> ids);\n\n Page<$entityshorttype> list(Pageable page);\n\n}\n"},{"name":"serviceImpl.java.vm","code":"##导入宏定义、设置包名、类名、文件名\n$!{define.vm}\n#setPackageSuffix(\"service.impl\")\n#setTableSuffix(\"ServiceImpl\")\n#save(\"/service/impl\", \"ServiceImpl.java\")\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n##业务层类名、持久层类名、实体名\n#set($serviceSortType = $!tool.append($!tableInfo.name, \"Service\"))\n#set($serviceType = $!tool.append($!tableInfo.savePackageName, \".service.\", $serviceSortType))\n#set($repositorySortType = $!tool.append($!tableInfo.name, \"Repository\"))\n#set($repositoryType = $!tool.append($!tableInfo.savePackageName, \".repository.\", $repositorySortType))\n#set($repositoryVarName = $!tool.firstLowerCase($!repositorySortType))\n#set($entityShortType = $!tableInfo.name)\n#set($entityType = $!tableInfo.psiClassObj.getQualifiedName())\n#set($entityVarName = $!tool.firstLowerCase($!tableInfo.name))\n#set($pkShortType = $!pk.shortType)\n#set($pkType = $!pk.type)\n\nimport $pkType;\nimport $entityType;\nimport $serviceType;\nimport $repositoryType;\nimport org.springframework.stereotype.Service;\nimport javax.annotation.Resource;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.Pageable;\nimport java.util.Collection;\nimport java.util.List;\nimport java.util.stream.Collectors;\nimport java.util.stream.StreamSupport;\n\n\n/**\n * $!{tableInfo.comment}业务层\n *\n * @author $!author\n * @since $!time.currTime()\n */\n@Service\npublic class $!{tableName} implements $!serviceSortType {\n\n\t@Resource\n private $repositorySortType $repositoryVarName;\n\n @Override\n public void save($entityShortType $entityVarName) {\n $!{repositoryVarName}.save($entityVarName);\n }\n\n @Override\n public void deleteById($pkShortType id) {\n $!{repositoryVarName}.delete(id);\n }\n\n @Override\n public $entityShortType findById($pkShortType id) {\n return $!{repositoryVarName}.findOne(id);\n }\n\n @Override\n public List<$entityshorttype> findById(Collection<$pkshorttype> ids) {\n Iterable<$entityshorttype> iterable = $!{repositoryVarName}.findAll(ids);\n return StreamSupport.stream(iterable.spliterator(), false)\n .collect(Collectors.toList());\n }\n\n @Override\n public Page<$entityshorttype> list(Pageable page) {\n return $!{repositoryVarName}.findAll(page);\n }\n\n}\n"}]},"MybatisPlus-Mixed":{"name":"MybatisPlus-Mixed","elementList":[{"name":"controller.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Controller\")\n\n##保存文件(宏定义)\n#save(\"/controller\", \"Controller.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"controller\")\n\n##定义服务名\n#set($serviceName = $!tool.append($!tool.firstLowerCase($!tableInfo.name), \"Service\"))\n\n##定义实体对象名\n#set($entityName = $!tool.firstLowerCase($!tableInfo.name))\n\nimport com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;\nimport com.baomidou.mybatisplus.extension.api.ApiController;\nimport com.baomidou.mybatisplus.extension.api.R;\nimport com.baomidou.mybatisplus.extension.plugins.pagination.Page;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.web.bind.annotation.*;\n\nimport javax.annotation.Resource;\nimport java.io.Serializable;\nimport java.util.List;\n\n##表注释(宏定义)\n#tableComment(\"表控制层\")\n@RestController\n@RequestMapping(\"$!tool.firstLowerCase($!tableInfo.name)\")\npublic class $!{tableName} extends ApiController {\n /**\n * 服务对象\n */\n @Resource\n private $!{tableInfo.name}Service $!{serviceName};\n\n /**\n * 分页查询所有数据\n *\n * @param page 分页对象\n * @param $!entityName 查询实体\n * @return 所有数据\n */\n @GetMapping\n public R selectAll(Page<$!tableinfo.name> page, $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.page(page, new QueryWrapper<strong>($!entityName)));\n }\n\n /**\n * 通过主键查询单条数据\n *\n * @param id 主键\n * @return 单条数据\n */\n @GetMapping(\"{id}\")\n public R selectOne(@PathVariable Serializable id) {\n return success(this.$!{serviceName}.getById(id));\n }\n\n /**\n * 新增数据\n *\n * @param $!entityName 实体对象\n * @return 新增结果\n */\n @PostMapping\n public R insert(@RequestBody $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.save($!entityName));\n }\n\n /**\n * 修改数据\n *\n * @param $!entityName 实体对象\n * @return 修改结果\n */\n @PutMapping\n public R update(@RequestBody $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.updateById($!entityName));\n }\n\n /**\n * 删除数据\n *\n * @param idList 主键结合\n * @return 删除结果\n */\n @DeleteMapping\n public R delete(@RequestParam(\"idList\") List<long> idList) {\n return success(this.$!{serviceName}.removeByIds(idList));\n }\n}\n"},{"name":"dao.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Dao\")\n\n##保存文件(宏定义)\n#save(\"/dao\", \"Dao.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"dao\")\n\nimport java.util.List;\n\nimport com.baomidou.mybatisplus.core.mapper.BaseMapper;\nimport org.apache.ibatis.annotations.Param;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\n\n##表注释(宏定义)\n#tableComment(\"表数据库访问层\")\npublic interface $!{tableName} extends BaseMapper<$!tableinfo.name> {\n\n/**\n* 批量新增数据(MyBatis原生foreach方法)\n*\n* @param entities List<$!{tableinfo.name}> 实例对象列表\n* @return 影响行数\n*/\nint insertBatch(@Param(\"entities\") List<$!{tableinfo.name}> entities);\n\n/**\n* 批量新增或按主键更新数据(MyBatis原生foreach方法)\n*\n* @param entities List<$!{tableinfo.name}> 实例对象列表\n* @return 影响行数\n* @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参\n*/\nint insertOrUpdateBatch(@Param(\"entities\") List<$!{tableinfo.name}> entities);\n\n}\n"},{"name":"entity.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##保存文件(宏定义)\n#save(\"/entity\", \".java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"entity\")\n\n##自动导入包(全局变量)\n$!autoImport\nimport com.baomidou.mybatisplus.extension.activerecord.Model;\nimport java.io.Serializable;\n\n##表注释(宏定义)\n#tableComment(\"表实体类\")\n@SuppressWarnings(\"serial\")\npublic class $!{tableInfo.name} extends Model<$!{tableinfo.name}> {\n#foreach($column in $tableInfo.fullColumn)\n #if(${column.comment})//${column.comment}#end\n\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n#end\n\n#foreach($column in $tableInfo.fullColumn)\n#getSetMethod($column)\n#end\n\n#foreach($column in $tableInfo.pkColumn)\n /**\n * 获取主键值\n *\n * @return 主键值\n */\n @Override\n protected Serializable pkVal() {\n return this.$!column.name;\n }\n #break\n#end\n}\n"},{"name":"mapper.xml.vm","code":"##引入mybatis支持\n$!{mybatisSupport.vm}\n\n##设置保存名称与保存位置\n$!callback.setFileName($tool.append($!{tableInfo.name}, \"Dao.xml\"))\n$!callback.setSavePath($tool.append($modulePath, \"/src/main/resources/mapper\"))\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!doctype mapper PUBLIC \"-//mybatis.org//DTD Mapper 3.0//EN\" \"http://mybatis.org/dtd/mybatis-3-mapper.dtd\">\n<ul class="image_map">\n\n <resultmap type=\"$!{tableInfo.savePackageName}.entity.$!{tableInfo.name}\" id=\"$!{tableInfo.name}Map\">\n#foreach($column in $tableInfo.fullColumn)\n <result property=\"$!column.name\" column=\"$!column.obj.name\" jdbcType=\"$!column.ext.jdbcType\"/>\n#end\n </resultmap>\n\n \n <insert id=\"insertBatch\" keyProperty=\"$!pk.name\" useGeneratedKeys=\"true\">\n insert into $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)\n values\n <foreach collection=\"entities\" item=\"entity\" separator=\",\">\n (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)\n </foreach>\n </insert>\n \n <insert id=\"insertOrUpdateBatch\" keyProperty=\"$!pk.name\" useGeneratedKeys=\"true\">\n insert into $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)\n values\n <foreach collection=\"entities\" item=\"entity\" separator=\",\">\n (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)\n </foreach>\n on duplicate key update\n #foreach($column in $tableInfo.otherColumn)$!column.obj.name = values($!column.obj.name) #if($velocityHasNext), #end#end\n </insert>\n\n</mapper>\n"},{"name":"service.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Service\")\n\n##保存文件(宏定义)\n#save(\"/service\", \"Service.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"service\")\n\nimport com.baomidou.mybatisplus.extension.service.IService;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\n\n##表注释(宏定义)\n#tableComment(\"表服务接口\")\npublic interface $!{tableName} extends IService<$!tableinfo.name> {\n\n}\n"},{"name":"serviceImpl.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"ServiceImpl\")\n\n##保存文件(宏定义)\n#save(\"/service/impl\", \"ServiceImpl.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"service.impl\")\n\nimport com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;\nimport $!{tableInfo.savePackageName}.dao.$!{tableInfo.name}Dao;\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.stereotype.Service;\n\n##表注释(宏定义)\n#tableComment(\"表服务实现类\")\n@Service(\"$!tool.firstLowerCase($tableInfo.name)Service\")\npublic class $!{tableName} extends ServiceImpl<$!{tableinfo.name}dao, $!{tableInfo.name}> implements $!{tableInfo.name}Service {\n\n}\n"}]},"MybatisPlus":{"name":"MybatisPlus","elementList":[{"name":"controller.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Controller\")\n\n##保存文件(宏定义)\n#save(\"/controller\", \"Controller.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"controller\")\n\n##定义服务名\n#set($serviceName = $!tool.append($!tool.firstLowerCase($!tableInfo.name), \"Service\"))\n\n##定义实体对象名\n#set($entityName = $!tool.firstLowerCase($!tableInfo.name))\n\nimport com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;\nimport com.baomidou.mybatisplus.extension.api.ApiController;\nimport com.baomidou.mybatisplus.extension.api.R;\nimport com.baomidou.mybatisplus.extension.plugins.pagination.Page;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.web.bind.annotation.*;\n\nimport javax.annotation.Resource;\nimport java.io.Serializable;\nimport java.util.List;\n\n##表注释(宏定义)\n#tableComment(\"表控制层\")\n@RestController\n@RequestMapping(\"$!tool.firstLowerCase($!tableInfo.name)\")\npublic class $!{tableName} extends ApiController {\n /**\n * 服务对象\n */\n @Resource\n private $!{tableInfo.name}Service $!{serviceName};\n\n /**\n * 分页查询所有数据\n *\n * @param page 分页对象\n * @param $!entityName 查询实体\n * @return 所有数据\n */\n @GetMapping\n public R selectAll(Page<$!tableinfo.name> page, $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.page(page, new QueryWrapper<strong>($!entityName)));\n }\n\n /**\n * 通过主键查询单条数据\n *\n * @param id 主键\n * @return 单条数据\n */\n @GetMapping(\"{id}\")\n public R selectOne(@PathVariable Serializable id) {\n return success(this.$!{serviceName}.getById(id));\n }\n\n /**\n * 新增数据\n *\n * @param $!entityName 实体对象\n * @return 新增结果\n */\n @PostMapping\n public R insert(@RequestBody $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.save($!entityName));\n }\n\n /**\n * 修改数据\n *\n * @param $!entityName 实体对象\n * @return 修改结果\n */\n @PutMapping\n public R update(@RequestBody $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.updateById($!entityName));\n }\n\n /**\n * 删除数据\n *\n * @param idList 主键结合\n * @return 删除结果\n */\n @DeleteMapping\n public R delete(@RequestParam(\"idList\") List<long> idList) {\n return success(this.$!{serviceName}.removeByIds(idList));\n }\n}\n"},{"name":"dao.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Dao\")\n\n##保存文件(宏定义)\n#save(\"/dao\", \"Dao.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"dao\")\n\nimport com.baomidou.mybatisplus.core.mapper.BaseMapper;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\n\n##表注释(宏定义)\n#tableComment(\"表数据库访问层\")\npublic interface $!{tableName} extends BaseMapper<$!tableinfo.name> {\n\n}\n"},{"name":"entity.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##保存文件(宏定义)\n#save(\"/entity\", \".java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"entity\")\n\n##自动导入包(全局变量)\n$!{autoImport.vm}\nimport com.baomidou.mybatisplus.extension.activerecord.Model;\nimport java.io.Serializable;\n\n##表注释(宏定义)\n#tableComment(\"表实体类\")\n@SuppressWarnings(\"serial\")\npublic class $!{tableInfo.name} extends Model<$!{tableinfo.name}> {\n#foreach($column in $tableInfo.fullColumn)\n #if(${column.comment})//${column.comment}#end\n\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n#end\n\n#foreach($column in $tableInfo.fullColumn)\n#getSetMethod($column)\n#end\n\n#foreach($column in $tableInfo.pkColumn)\n /**\n * 获取主键值\n *\n * @return 主键值\n */\n @Override\n protected Serializable pkVal() {\n return this.$!column.name;\n }\n #break\n#end\n}\n"},{"name":"service.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Service\")\n\n##保存文件(宏定义)\n#save(\"/service\", \"Service.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"service\")\n\nimport com.baomidou.mybatisplus.extension.service.IService;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\n\n##表注释(宏定义)\n#tableComment(\"表服务接口\")\npublic interface $!{tableName} extends IService<$!tableinfo.name> {\n\n}\n"},{"name":"serviceImpl.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"ServiceImpl\")\n\n##保存文件(宏定义)\n#save(\"/service/impl\", \"ServiceImpl.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"service.impl\")\n\nimport com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;\nimport $!{tableInfo.savePackageName}.dao.$!{tableInfo.name}Dao;\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.stereotype.Service;\n\n##表注释(宏定义)\n#tableComment(\"表服务实现类\")\n@Service(\"$!tool.firstLowerCase($tableInfo.name)Service\")\npublic class $!{tableName} extends ServiceImpl<$!{tableinfo.name}dao, $!{tableInfo.name}> implements $!{tableInfo.name}Service {\n\n}\n"}]},"Default":{"name":"Default","elementList":[{"name":"controller.java.vm","code":"##定义初始变量\n#set($tableName = $tool.append($tableInfo.name, \"Controller\"))\n##设置回调\n$!callback.setFileName($tool.append($tableName, \".java\"))\n$!callback.setSavePath($tool.append($tableInfo.savePath, \"/controller\"))\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n#if($tableInfo.savePackageName)package $!{tableInfo.savePackageName}.#{end}controller;\n\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.PageRequest;\nimport org.springframework.http.ResponseEntity;\nimport org.springframework.web.bind.annotation.*;\n\nimport javax.annotation.Resource;\n\n/**\n * $!{tableInfo.comment}($!{tableInfo.name})表控制层\n *\n * @author $!author\n * @since $!time.currTime()\n */\n@RestController\n@RequestMapping(\"$!tool.firstLowerCase($tableInfo.name)\")\npublic class $!{tableName} {\n /**\n * 服务对象\n */\n @Resource\n private $!{tableInfo.name}Service $!tool.firstLowerCase($tableInfo.name)Service;\n\n /**\n * 分页查询\n *\n * @param $!{tool.firstLowerCase($tableInfo.name)} 筛选条件\n * @param pageRequest 分页对象\n * @return 查询结果\n */\n @GetMapping\n public ResponseEntity<page<$!{tableinfo.name}>> queryByPage($!{tableInfo.name} $!{tool.firstLowerCase($tableInfo.name)}, PageRequest pageRequest) {\n return ResponseEntity.ok(this.$!{tool.firstLowerCase($tableInfo.name)}Service.queryByPage($!{tool.firstLowerCase($tableInfo.name)}, pageRequest));\n }\n\n /**\n * 通过主键查询单条数据\n *\n * @param id 主键\n * @return 单条数据\n */\n @GetMapping(\"{id}\")\n public ResponseEntity<$!{tableinfo.name}> queryById(@PathVariable(\"id\") $!pk.shortType id) {\n return ResponseEntity.ok(this.$!{tool.firstLowerCase($tableInfo.name)}Service.queryById(id));\n }\n\n /**\n * 新增数据\n *\n * @param $!{tool.firstLowerCase($tableInfo.name)} 实体\n * @return 新增结果\n */\n @PostMapping\n public ResponseEntity<$!{tableinfo.name}> add($!{tableInfo.name} $!{tool.firstLowerCase($tableInfo.name)}) {\n return ResponseEntity.ok(this.$!{tool.firstLowerCase($tableInfo.name)}Service.insert($!{tool.firstLowerCase($tableInfo.name)}));\n }\n\n /**\n * 编辑数据\n *\n * @param $!{tool.firstLowerCase($tableInfo.name)} 实体\n * @return 编辑结果\n */\n @PutMapping\n public ResponseEntity<$!{tableinfo.name}> edit($!{tableInfo.name} $!{tool.firstLowerCase($tableInfo.name)}) {\n return ResponseEntity.ok(this.$!{tool.firstLowerCase($tableInfo.name)}Service.update($!{tool.firstLowerCase($tableInfo.name)}));\n }\n\n /**\n * 删除数据\n *\n * @param id 主键\n * @return 删除是否成功\n */\n @DeleteMapping\n public ResponseEntity<boolean> deleteById($!pk.shortType id) {\n return ResponseEntity.ok(this.$!{tool.firstLowerCase($tableInfo.name)}Service.deleteById(id));\n }\n\n}\n"},{"name":"dao.java.vm","code":"##定义初始变量\n#set($tableName = $tool.append($tableInfo.name, \"Dao\"))\n##设置回调\n$!callback.setFileName($tool.append($tableName, \".java\"))\n$!callback.setSavePath($tool.append($tableInfo.savePath, \"/dao\"))\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n#if($tableInfo.savePackageName)package $!{tableInfo.savePackageName}.#{end}dao;\n\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport org.apache.ibatis.annotations.Param;\nimport org.springframework.data.domain.Pageable;\nimport java.util.List;\n\n/**\n * $!{tableInfo.comment}($!{tableInfo.name})表数据库访问层\n *\n * @author $!author\n * @since $!time.currTime()\n */\npublic interface $!{tableName} {\n\n /**\n * 通过ID查询单条数据\n *\n * @param $!pk.name 主键\n * @return 实例对象\n */\n $!{tableInfo.name} queryById($!pk.shortType $!pk.name);\n\n /**\n * 查询指定行数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 查询条件\n * @param pageable 分页对象\n * @return 对象列表\n */\n List<$!{tableinfo.name}> queryAllByLimit($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}), @Param(\"pageable\") Pageable pageable);\n\n /**\n * 统计总行数\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 查询条件\n * @return 总行数\n */\n long count($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));\n\n /**\n * 新增数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 影响行数\n */\n int insert($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));\n\n /**\n * 批量新增数据(MyBatis原生foreach方法)\n *\n * @param entities List<$!{tableinfo.name}> 实例对象列表\n * @return 影响行数\n */\n int insertBatch(@Param(\"entities\") List<$!{tableinfo.name}> entities);\n\n /**\n * 批量新增或按主键更新数据(MyBatis原生foreach方法)\n *\n * @param entities List<$!{tableinfo.name}> 实例对象列表\n * @return 影响行数\n * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参\n */\n int insertOrUpdateBatch(@Param(\"entities\") List<$!{tableinfo.name}> entities);\n\n /**\n * 修改数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 影响行数\n */\n int update($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));\n\n /**\n * 通过主键删除数据\n *\n * @param $!pk.name 主键\n * @return 影响行数\n */\n int deleteById($!pk.shortType $!pk.name);\n\n}\n"},{"name":"debug.json.vm","code":"// 禁止将生成结果写入到文件\n$!callback.setWriteFile(false)\n\n//调试表原始对象\n$!tool.debug($tableInfo.obj)\n\n//调试列原始对象\n$!tool.debug($tableInfo.fullColumn.get(0).obj)\n\n//调试列原始列类型\n$!tool.debug($tableInfo.fullColumn.get(0).obj.dataType)\n\n//获取原始列类型中的字段\nsqlType = $!tool.getField($tableInfo.fullColumn.get(0).obj.dataType, \"typeName\")\n\n//执行原始列类型中的方法\nsqlTypeLen = $!tableInfo.fullColumn.get(0).obj.dataType.getLength()\n"},{"name":"entity.java.vm","code":"##引入宏定义\n$!{define.vm}\n\n##使用宏定义设置回调(保存位置与文件后缀)\n#save(\"/entity\", \".java\")\n\n##使用宏定义设置包后缀\n#setPackageSuffix(\"entity\")\n\n##使用全局变量实现默认包导入\n$!{autoImport.vm}\nimport java.io.Serializable;\n\n##使用宏定义实现类注释信息\n#tableComment(\"实体类\")\npublic class $!{tableInfo.name} implements Serializable {\n private static final long serialVersionUID = $!tool.serial();\n#foreach($column in $tableInfo.fullColumn)\n #if(${column.comment})/**\n * ${column.comment}\n */#end\n\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n#end\n\n#foreach($column in $tableInfo.fullColumn)\n##使用宏定义实现get,set方法\n#getSetMethod($column)\n#end\n\n}\n"},{"name":"mapper.xml.vm","code":"##引入mybatis支持\n$!{mybatisSupport.vm}\n\n##设置保存名称与保存位置\n$!callback.setFileName($tool.append($!{tableInfo.name}, \"Dao.xml\"))\n$!callback.setSavePath($tool.append($modulePath, \"/src/main/resources/mapper\"))\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!doctype mapper PUBLIC \"-//mybatis.org//DTD Mapper 3.0//EN\" \"http://mybatis.org/dtd/mybatis-3-mapper.dtd\">\n<ul class="image_map">\n\n <resultmap type=\"$!{tableInfo.savePackageName}.entity.$!{tableInfo.name}\" id=\"$!{tableInfo.name}Map\">\n#foreach($column in $tableInfo.fullColumn)\n <result property=\"$!column.name\" column=\"$!column.obj.name\" jdbcType=\"$!column.ext.jdbcType\"/>\n#end\n </resultmap>\n\n \n <select id=\"queryById\" resultMap=\"$!{tableInfo.name}Map\">\n select\n #allSqlColumn()\n\n from $!tableInfo.obj.name\n where $!pk.obj.name = #{$!pk.name}\n </select>\n\n \n <select id=\"queryAllByLimit\" resultMap=\"$!{tableInfo.name}Map\">\n select\n #allSqlColumn()\n\n from $!tableInfo.obj.name\n <where>\n#foreach($column in $tableInfo.fullColumn)\n <if test=\"$!column.name != null#if($column.type.equals(\"java.lang.String\")) and $!column.name != ''#end\">\n and $!column.obj.name = #{$!column.name}\n </if>\n#end\n </where>\n limit #{pageable.offset}, #{pageable.pageSize}\n </select>\n\n \n <select id=\"count\" resultType=\"java.lang.Long\">\n select count(1)\n from $!tableInfo.obj.name\n <where>\n#foreach($column in $tableInfo.fullColumn)\n <if test=\"$!column.name != null#if($column.type.equals(\"java.lang.String\")) and $!column.name != ''#end\">\n and $!column.obj.name = #{$!column.name}\n </if>\n#end\n </where>\n </select>\n\n \n <insert id=\"insert\" keyProperty=\"$!pk.name\" useGeneratedKeys=\"true\">\n insert into $!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)\n values (#foreach($column in $tableInfo.otherColumn)#{$!{column.name}}#if($velocityHasNext), #end#end)\n </insert>\n\n <insert id=\"insertBatch\" keyProperty=\"$!pk.name\" useGeneratedKeys=\"true\">\n insert into $!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)\n values\n <foreach collection=\"entities\" item=\"entity\" separator=\",\">\n (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)\n </foreach>\n </insert>\n\n <insert id=\"insertOrUpdateBatch\" keyProperty=\"$!pk.name\" useGeneratedKeys=\"true\">\n insert into $!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)\n values\n <foreach collection=\"entities\" item=\"entity\" separator=\",\">\n (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)\n </foreach>\n on duplicate key update\n #foreach($column in $tableInfo.otherColumn)$!column.obj.name = values($!column.obj.name)#if($velocityHasNext),\n #end#end\n\n </insert>\n\n \n <update id=\"update\">\n update $!{tableInfo.obj.name}\n <set>\n#foreach($column in $tableInfo.otherColumn)\n <if test=\"$!column.name != null#if($column.type.equals(\"java.lang.String\")) and $!column.name != ''#end\">\n $!column.obj.name = #{$!column.name},\n </if>\n#end\n </set>\n where $!pk.obj.name = #{$!pk.name}\n </update>\n\n \n <delete id=\"deleteById\">\n delete from $!{tableInfo.obj.name} where $!pk.obj.name = #{$!pk.name}\n </delete>\n\n</mapper>\n"},{"name":"service.java.vm","code":"##定义初始变量\n#set($tableName = $tool.append($tableInfo.name, \"Service\"))\n##设置回调\n$!callback.setFileName($tool.append($tableName, \".java\"))\n$!callback.setSavePath($tool.append($tableInfo.savePath, \"/service\"))\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n#if($tableInfo.savePackageName)package $!{tableInfo.savePackageName}.#{end}service;\n\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.PageRequest;\n\n/**\n * $!{tableInfo.comment}($!{tableInfo.name})表服务接口\n *\n * @author $!author\n * @since $!time.currTime()\n */\npublic interface $!{tableName} {\n\n /**\n * 通过ID查询单条数据\n *\n * @param $!pk.name 主键\n * @return 实例对象\n */\n $!{tableInfo.name} queryById($!pk.shortType $!pk.name);\n\n /**\n * 分页查询\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 筛选条件\n * @param pageRequest 分页对象\n * @return 查询结果\n */\n Page<$!{tableinfo.name}> queryByPage($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}), PageRequest pageRequest);\n\n /**\n * 新增数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 实例对象\n */\n $!{tableInfo.name} insert($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));\n\n /**\n * 修改数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 实例对象\n */\n $!{tableInfo.name} update($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));\n\n /**\n * 通过主键删除数据\n *\n * @param $!pk.name 主键\n * @return 是否成功\n */\n boolean deleteById($!pk.shortType $!pk.name);\n\n}"},{"name":"serviceImpl.java.vm","code":"##定义初始变量\n#set($tableName = $tool.append($tableInfo.name, \"ServiceImpl\"))\n##设置回调\n$!callback.setFileName($tool.append($tableName, \".java\"))\n$!callback.setSavePath($tool.append($tableInfo.savePath, \"/service/impl\"))\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n#if($tableInfo.savePackageName)package $!{tableInfo.savePackageName}.#{end}service.impl;\n\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport $!{tableInfo.savePackageName}.dao.$!{tableInfo.name}Dao;\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.stereotype.Service;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.PageImpl;\nimport org.springframework.data.domain.PageRequest;\n\nimport javax.annotation.Resource;\n\n/**\n * $!{tableInfo.comment}($!{tableInfo.name})表服务实现类\n *\n * @author $!author\n * @since $!time.currTime()\n */\n@Service(\"$!tool.firstLowerCase($!{tableInfo.name})Service\")\npublic class $!{tableName} implements $!{tableInfo.name}Service {\n @Resource\n private $!{tableInfo.name}Dao $!tool.firstLowerCase($!{tableInfo.name})Dao;\n\n /**\n * 通过ID查询单条数据\n *\n * @param $!pk.name 主键\n * @return 实例对象\n */\n @Override\n public $!{tableInfo.name} queryById($!pk.shortType $!pk.name) {\n return this.$!{tool.firstLowerCase($!{tableInfo.name})}Dao.queryById($!pk.name);\n }\n\n /**\n * 分页查询\n *\n * @param $!{tool.firstLowerCase($tableInfo.name)} 筛选条件\n * @param pageRequest 分页对象\n * @return 查询结果\n */\n @Override\n public Page<$!{tableinfo.name}> queryByPage($!{tableInfo.name} $!{tool.firstLowerCase($tableInfo.name)}, PageRequest pageRequest) {\n long total = this.$!{tool.firstLowerCase($tableInfo.name)}Dao.count($!{tool.firstLowerCase($tableInfo.name)});\n return new PageImpl<strong>(this.$!{tool.firstLowerCase($tableInfo.name)}Dao.queryAllByLimit($!{tool.firstLowerCase($tableInfo.name)}, pageRequest), pageRequest, total);\n }\n\n /**\n * 新增数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 实例对象\n */\n @Override\n public $!{tableInfo.name} insert($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name})) {\n this.$!{tool.firstLowerCase($!{tableInfo.name})}Dao.insert($!tool.firstLowerCase($!{tableInfo.name}));\n return $!tool.firstLowerCase($!{tableInfo.name});\n }\n\n /**\n * 修改数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 实例对象\n */\n @Override\n public $!{tableInfo.name} update($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name})) {\n this.$!{tool.firstLowerCase($!{tableInfo.name})}Dao.update($!tool.firstLowerCase($!{tableInfo.name}));\n return this.queryById($!{tool.firstLowerCase($!{tableInfo.name})}.get$!tool.firstUpperCase($pk.name)());\n }\n\n /**\n * 通过主键删除数据\n *\n * @param $!pk.name 主键\n * @return 是否成功\n */\n @Override\n public boolean deleteById($!pk.shortType $!pk.name) {\n return this.$!{tool.firstLowerCase($!{tableInfo.name})}Dao.deleteById($!pk.name)> 0;\n }\n}"}]}},"columnConfig":{"Default":{"name":"Default","elementList":[{"title":"disable","type":"BOOLEAN","selectValue":""},{"title":"support","type":"SELECT","selectValue":"add,edit,query,del,ui"}]}},"globalConfig":{"Default":{"name":"Default","elementList":[{"name":"autoImport.vm","value":"##自动导入包(仅导入实体属性需要的包,通常用于实体类)\n#foreach($import in $importList)\nimport $!import;\n#end"},{"name":"define.vm","value":"##(Velocity宏定义)\n\n##定义设置表名后缀的宏定义,调用方式:#setTableSuffix(\"Test\")\n#macro(setTableSuffix $suffix)\n #set($tableName = $!tool.append($tableInfo.name, $suffix))\n#end\n\n##定义设置包名后缀的宏定义,调用方式:#setPackageSuffix(\"Test\")\n#macro(setPackageSuffix $suffix)\n#if($suffix!=\"\")package #end#if($tableInfo.savePackageName!=\"\")$!{tableInfo.savePackageName}.#{end}$!suffix;\n#end\n\n##定义直接保存路径与文件名简化的宏定义,调用方式:#save(\"/entity\", \".java\")\n#macro(save $path $fileName)\n $!callback.setSavePath($tool.append($tableInfo.savePath, $path))\n $!callback.setFileName($tool.append($tableInfo.name, $fileName))\n#end\n\n##定义表注释的宏定义,调用方式:#tableComment(\"注释信息\")\n#macro(tableComment $desc)\n/**\n * $!{tableInfo.comment}($!{tableInfo.name})$desc\n *\n * @author $!author\n * @since $!time.currTime()\n */\n#end\n\n##定义GET,SET方法的宏定义,调用方式:#getSetMethod($column)\n#macro(getSetMethod $column)\n\n public $!{tool.getClsNameByFullName($column.type)} get$!{tool.firstUpperCase($column.name)}() {\n return $!{column.name};\n }\n\n public void set$!{tool.firstUpperCase($column.name)}($!{tool.getClsNameByFullName($column.type)} $!{column.name}) {\n this.$!{column.name} = $!{column.name};\n }\n#end"},{"name":"init.vm","value":"##初始化区域\n\n##去掉表的t_前缀\n$!tableInfo.setName($tool.getClassName($tableInfo.obj.name.replaceFirst(\"book_\",\"\")))\n\n##参考阿里巴巴开发手册,POJO 类中布尔类型的变量,都不要加 is 前缀,否则部分框架解析会引起序列化错误\n#foreach($column in $tableInfo.fullColumn)\n#if($column.name.startsWith(\"is\") && $column.type.equals(\"java.lang.Boolean\"))\n $!column.setName($tool.firstLowerCase($column.name.substring(2)))\n#end\n#end\n\n##实现动态排除列\n#set($temp = $tool.newHashSet(\"testCreateTime\", \"otherColumn\"))\n#foreach($item in $temp)\n #set($newList = $tool.newArrayList())\n #foreach($column in $tableInfo.fullColumn)\n #if($column.name!=$item)\n ##带有反回值的方法调用时使用$tool.call来消除返回值\n $tool.call($newList.add($column))\n #end\n #end\n ##重新保存\n $tableInfo.setFullColumn($newList)\n#end\n\n##对importList进行篡改\n#set($temp = $tool.newHashSet())\n#foreach($column in $tableInfo.fullColumn)\n #if(!$column.type.startsWith(\"java.lang.\"))\n ##带有反回值的方法调用时使用$tool.call来消除返回值\n $tool.call($temp.add($column.type))\n #end\n#end\n##覆盖\n#set($importList = $temp)"},{"name":"mybatisSupport.vm","value":"##针对Mybatis 进行支持,主要用于生成xml文件\n#foreach($column in $tableInfo.fullColumn)\n ##储存列类型\n $tool.call($column.ext.put(\"sqlType\", $tool.getField($column.obj.dataType, \"typeName\")))\n #if($tool.newHashSet(\"java.lang.String\").contains($column.type))\n #set($jdbcType=\"VARCHAR\")\n #elseif($tool.newHashSet(\"java.lang.Boolean\", \"boolean\").contains($column.type))\n #set($jdbcType=\"BOOLEAN\")\n #elseif($tool.newHashSet(\"java.lang.Byte\", \"byte\").contains($column.type))\n #set($jdbcType=\"BYTE\")\n #elseif($tool.newHashSet(\"java.lang.Integer\", \"int\", \"java.lang.Short\", \"short\").contains($column.type))\n #set($jdbcType=\"INTEGER\")\n #elseif($tool.newHashSet(\"java.lang.Long\", \"long\").contains($column.type))\n #set($jdbcType=\"INTEGER\")\n #elseif($tool.newHashSet(\"java.lang.Float\", \"float\", \"java.lang.Double\", \"double\").contains($column.type))\n #set($jdbcType=\"NUMERIC\")\n #elseif($tool.newHashSet(\"java.util.Date\", \"java.sql.Timestamp\", \"java.time.Instant\", \"java.time.LocalDateTime\", \"java.time.OffsetDateTime\", \"\tjava.time.ZonedDateTime\").contains($column.type))\n #set($jdbcType=\"TIMESTAMP\")\n #elseif($tool.newHashSet(\"java.sql.Date\", \"java.time.LocalDate\").contains($column.type))\n #set($jdbcType=\"TIMESTAMP\")\n #else\n ##其他类型\n #set($jdbcType=\"VARCHAR\")\n #end\n $tool.call($column.ext.put(\"jdbcType\", $jdbcType))\n#end\n\n##定义宏,查询所有列\n#macro(allSqlColumn)#foreach($column in $tableInfo.fullColumn)$column.obj.name#if($velocityHasNext), #end#end#end\n"}]}}}
\ No newline at end of file
+{"author":"makejava","version":"1.2.8","userSecure":"","currTypeMapperGroupName":"Default","currTemplateGroupName":"Default","currColumnConfigGroupName":"Default","currGlobalConfigGroupName":"Default","typeMapper":{"Default":{"name":"Default","elementList":[{"matchType":"REGEX","columnType":"varchar(\\(\\d+\\))?","javaType":"java.lang.String"},{"matchType":"REGEX","columnType":"char(\\(\\d+\\))?","javaType":"java.lang.String"},{"matchType":"REGEX","columnType":"(tiny&#124;medium&#124;long)*text","javaType":"java.lang.String"},{"matchType":"REGEX","columnType":"decimal(\\(\\d+,\\d+\\))?","javaType":"java.lang.Double"},{"matchType":"ORDINARY","columnType":"integer","javaType":"java.lang.Integer"},{"matchType":"REGEX","columnType":"(tiny&#124;small&#124;medium)*int(\\(\\d+\\))?","javaType":"java.lang.Integer"},{"matchType":"ORDINARY","columnType":"int4","javaType":"java.lang.Integer"},{"matchType":"ORDINARY","columnType":"int8","javaType":"java.lang.Long"},{"matchType":"REGEX","columnType":"bigint(\\(\\d+\\))?","javaType":"java.lang.Long"},{"matchType":"ORDINARY","columnType":"date","javaType":"java.util.Date"},{"matchType":"ORDINARY","columnType":"datetime","javaType":"java.util.Date"},{"matchType":"ORDINARY","columnType":"timestamp","javaType":"java.util.Date"},{"matchType":"ORDINARY","columnType":"time","javaType":"java.time.LocalTime"},{"matchType":"ORDINARY","columnType":"boolean","javaType":"java.lang.Boolean"}]}},"template":{"spring-data-mongodb":{"name":"spring-data-mongodb","elementList":[{"name":"controller.java.vm","code":"##导入宏定义、设置包名、类名、文件名##导入宏定义\n$!{define.vm}\n#setPackageSuffix(\"controller\")\n#setTableSuffix(\"Controller\")\n#save(\"/controller\", \"Controller.java\")\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n##定义服务名\n#set($serviceSortType = $!tool.append($!tableInfo.name, \"Service\"))\n#set($serviceType = $!tool.append($!tableInfo.savePackageName, \".service.\", $serviceSortType))\n#set($serviceVarName = $!tool.firstLowerCase($serviceSortType))\n\n#set($entityShortType = $!tableInfo.name)\n#set($entityType = $!tableInfo.psiClassObj.getQualifiedName())\n#set($entityVarName = $!tool.firstLowerCase($!tableInfo.name))\n#set($pkType = $!pk.type)\n\nimport $pkType;\nimport $entityType;\nimport $serviceType;\nimport lombok.AllArgsConstructor;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.Pageable;\nimport org.springframework.web.bind.annotation.GetMapping;\nimport org.springframework.web.bind.annotation.PostMapping;\nimport org.springframework.web.bind.annotation.RequestBody;\nimport org.springframework.web.bind.annotation.RequestMapping;\nimport org.springframework.web.bind.annotation.RestController;\n\n\n/**\n * $!{tableInfo.comment}控制层\n *\n * @author $!author\n * @since $!time.currTime()\n */\n@RestController\n@RequestMapping(\"/$!tool.firstLowerCase($!tableInfo.name)\")\n@AllArgsConstructor\npublic class $!{tableName} {\n\n\tprivate $serviceSortType $serviceVarName;\n\n\t/**\n\t * 获取$!{tableInfo.comment}列表(分页)\n\t */\n\t@GetMapping(\"/list\")\n\tpublic Page<$entityshorttype> list(Pageable page) {\n\t\treturn null;\n\t}\n\n\t/**\n\t * 获取$!{tableInfo.comment}\n\t */\n\t@GetMapping(\"/get\")\n\tpublic $entityShortType get($!pk.shortType id) {\n\t\treturn ${serviceVarName}.findById(id);\n\t}\n\n\t/**\n\t * 添加$!{tableInfo.comment}\n\t */\n\t@PostMapping(\"/add\")\n\tpublic void add(@RequestBody $entityShortType $entityVarName) {\n\t\t${serviceVarName}.save($entityVarName);\n\t}\n\n\n\t/**\n\t * 修改$!{tableInfo.comment}\n\t */\n\t@PostMapping(\"/update\")\n\tpublic void update(@RequestBody $entityShortType $entityVarName) {\n\t\t${serviceVarName}.save($entityVarName);\n\t}\n\n\t/**\n\t * 删除$!{tableInfo.comment}\n\t */\n\t@PostMapping(\"/delete\")\n\tpublic void delete($!pk.shortType id) {\n\t\t${serviceVarName}.deleteById(id);\n\t}\n\n}\n"},{"name":"entity.java.vm","code":"##引入宏定义\n$!{define.vm}\n\n##使用宏定义设置回调(保存位置与文件后缀)\n#save(\"/entity\", \".java\")\n\n##使用宏定义设置包后缀\n#setPackageSuffix(\"entity\")\n\n##使用全局变量实现默认包导入\n$!{autoImport.vm}\nimport java.io.Serializable;\n\n##使用宏定义实现类注释信息\n#tableComment(\"实体类\")\npublic class $!{tableInfo.name} implements Serializable {\n private static final long serialVersionUID = $!tool.serial();\n#foreach($column in $tableInfo.fullColumn)\n #if(${column.comment})/**\n * ${column.comment}\n */#end\n\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n#end\n\n#foreach($column in $tableInfo.fullColumn)\n##使用宏定义实现get,set方法\n#getSetMethod($column)\n#end\n\n}\n"},{"name":"repository.java.vm","code":"##导入宏定义、设置包名、类名、文件名##导入宏定义\n$!{define.vm}\n#setPackageSuffix(\"repository\")\n#setTableSuffix(\"Repository\")\n#save(\"/repository\", \"Repository.java\")\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n##实体类名、主键类名\n#set($entityShortType = $!tableInfo.name)\n#set($entityType = $!tableInfo.psiClassObj.getQualifiedName())\n#set($pkShortType = $!pk.shortType)\n#set($pkType = $!pk.type)\n\nimport $pkType;\nimport $entityType;\nimport org.springframework.data.mongodb.repository.MongoRepository;\n\n\n/**\n * $!{tableInfo.comment}持久层\n *\n * @author $!author\n * @since $!time.currTime()\n */\npublic interface $!{tableName} extends MongoRepository<$entityshorttype, $pkShortType> {\n\n}\n"},{"name":"service.java.vm","code":"##导入宏定义、设置包名、类名、文件名##导入宏定义\n$!{define.vm}\n#setPackageSuffix(\"service\")\n#setTableSuffix(\"Service\")\n#save(\"/service\", \"Service.java\")\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n##实体类名、主键类名\n#set($entityShortType = $!tableInfo.name)\n#set($entityType = $!tableInfo.psiClassObj.getQualifiedName())\n#set($entityVarName = $!tool.firstLowerCase($!tableInfo.name))\n#set($pkShortType = $!pk.shortType)\n#set($pkType = $!pk.type)\n\nimport $pkType;\nimport $entityType;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.Pageable;\nimport java.util.Collection;\nimport java.util.List;\n\n\n/**\n * $!{tableInfo.comment}业务层\n *\n * @author $!author\n * @since $!time.currTime()\n */\npublic interface $!{tableName} {\n\n void save($entityShortType $entityVarName);\n\n void deleteById($pkShortType id);\n\n $entityShortType findById($pkShortType id);\n\n List<$entityshorttype> findById(Collection<$pkshorttype> ids);\n\n Page<$entityshorttype> list(Pageable page);\n\n}\n"},{"name":"serviceImpl.java.vm","code":"##导入宏定义、设置包名、类名、文件名\n$!{define.vm}\n#setPackageSuffix(\"service.impl\")\n#setTableSuffix(\"ServiceImpl\")\n#save(\"/service/impl\", \"ServiceImpl.java\")\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n##业务层类名、持久层类名、实体名\n#set($serviceSortType = $!tool.append($!tableInfo.name, \"Service\"))\n#set($serviceType = $!tool.append($!tableInfo.savePackageName, \".service.\", $serviceSortType))\n#set($repositorySortType = $!tool.append($!tableInfo.name, \"Repository\"))\n#set($repositoryType = $!tool.append($!tableInfo.savePackageName, \".repository.\", $repositorySortType))\n#set($repositoryVarName = $!tool.firstLowerCase($!repositorySortType))\n#set($entityShortType = $!tableInfo.name)\n#set($entityType = $!tableInfo.psiClassObj.getQualifiedName())\n#set($entityVarName = $!tool.firstLowerCase($!tableInfo.name))\n#set($pkShortType = $!pk.shortType)\n#set($pkType = $!pk.type)\n\nimport $pkType;\nimport $entityType;\nimport $serviceType;\nimport $repositoryType;\nimport org.springframework.stereotype.Service;\nimport javax.annotation.Resource;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.Pageable;\nimport java.util.Collection;\nimport java.util.List;\nimport java.util.stream.Collectors;\nimport java.util.stream.StreamSupport;\n\n\n/**\n * $!{tableInfo.comment}业务层\n *\n * @author $!author\n * @since $!time.currTime()\n */\n@Service\npublic class $!{tableName} implements $!serviceSortType {\n\n\t@Resource\n private $repositorySortType $repositoryVarName;\n\n @Override\n public void save($entityShortType $entityVarName) {\n $!{repositoryVarName}.save($entityVarName);\n }\n\n @Override\n public void deleteById($pkShortType id) {\n $!{repositoryVarName}.delete(id);\n }\n\n @Override\n public $entityShortType findById($pkShortType id) {\n return $!{repositoryVarName}.findOne(id);\n }\n\n @Override\n public List<$entityshorttype> findById(Collection<$pkshorttype> ids) {\n Iterable<$entityshorttype> iterable = $!{repositoryVarName}.findAll(ids);\n return StreamSupport.stream(iterable.spliterator(), false)\n .collect(Collectors.toList());\n }\n\n @Override\n public Page<$entityshorttype> list(Pageable page) {\n return $!{repositoryVarName}.findAll(page);\n }\n\n}\n"}]},"MybatisPlus-Mixed":{"name":"MybatisPlus-Mixed","elementList":[{"name":"controller.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Controller\")\n\n##保存文件(宏定义)\n#save(\"/controller\", \"Controller.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"controller\")\n\n##定义服务名\n#set($serviceName = $!tool.append($!tool.firstLowerCase($!tableInfo.name), \"Service\"))\n\n##定义实体对象名\n#set($entityName = $!tool.firstLowerCase($!tableInfo.name))\n\nimport com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;\nimport com.baomidou.mybatisplus.extension.api.ApiController;\nimport com.baomidou.mybatisplus.extension.api.R;\nimport com.baomidou.mybatisplus.extension.plugins.pagination.Page;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.web.bind.annotation.*;\n\nimport javax.annotation.Resource;\nimport java.io.Serializable;\nimport java.util.List;\n\n##表注释(宏定义)\n#tableComment(\"表控制层\")\n@RestController\n@RequestMapping(\"$!tool.firstLowerCase($!tableInfo.name)\")\npublic class $!{tableName} extends ApiController {\n /**\n * 服务对象\n */\n @Resource\n private $!{tableInfo.name}Service $!{serviceName};\n\n /**\n * 分页查询所有数据\n *\n * @param page 分页对象\n * @param $!entityName 查询实体\n * @return 所有数据\n */\n @GetMapping\n public R selectAll(Page<$!tableinfo.name> page, $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.page(page, new QueryWrapper<strong>($!entityName)));\n }\n\n /**\n * 通过主键查询单条数据\n *\n * @param id 主键\n * @return 单条数据\n */\n @GetMapping(\"{id}\")\n public R selectOne(@PathVariable Serializable id) {\n return success(this.$!{serviceName}.getById(id));\n }\n\n /**\n * 新增数据\n *\n * @param $!entityName 实体对象\n * @return 新增结果\n */\n @PostMapping\n public R insert(@RequestBody $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.save($!entityName));\n }\n\n /**\n * 修改数据\n *\n * @param $!entityName 实体对象\n * @return 修改结果\n */\n @PutMapping\n public R update(@RequestBody $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.updateById($!entityName));\n }\n\n /**\n * 删除数据\n *\n * @param idList 主键结合\n * @return 删除结果\n */\n @DeleteMapping\n public R delete(@RequestParam(\"idList\") List<long> idList) {\n return success(this.$!{serviceName}.removeByIds(idList));\n }\n}\n"},{"name":"dao.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Dao\")\n\n##保存文件(宏定义)\n#save(\"/dao\", \"Dao.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"dao\")\n\nimport java.util.List;\n\nimport com.baomidou.mybatisplus.core.mapper.BaseMapper;\nimport org.apache.ibatis.annotations.Param;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\n\n##表注释(宏定义)\n#tableComment(\"表数据库访问层\")\npublic interface $!{tableName} extends BaseMapper<$!tableinfo.name> {\n\n/**\n* 批量新增数据(MyBatis原生foreach方法)\n*\n* @param entities List<$!{tableinfo.name}> 实例对象列表\n* @return 影响行数\n*/\nint insertBatch(@Param(\"entities\") List<$!{tableinfo.name}> entities);\n\n/**\n* 批量新增或按主键更新数据(MyBatis原生foreach方法)\n*\n* @param entities List<$!{tableinfo.name}> 实例对象列表\n* @return 影响行数\n* @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参\n*/\nint insertOrUpdateBatch(@Param(\"entities\") List<$!{tableinfo.name}> entities);\n\n}\n"},{"name":"entity.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##保存文件(宏定义)\n#save(\"/entity\", \".java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"entity\")\n\n##自动导入包(全局变量)\n$!autoImport\nimport com.baomidou.mybatisplus.extension.activerecord.Model;\nimport java.io.Serializable;\n\n##表注释(宏定义)\n#tableComment(\"表实体类\")\n@SuppressWarnings(\"serial\")\npublic class $!{tableInfo.name} extends Model<$!{tableinfo.name}> {\n#foreach($column in $tableInfo.fullColumn)\n #if(${column.comment})//${column.comment}#end\n\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n#end\n\n#foreach($column in $tableInfo.fullColumn)\n#getSetMethod($column)\n#end\n\n#foreach($column in $tableInfo.pkColumn)\n /**\n * 获取主键值\n *\n * @return 主键值\n */\n @Override\n protected Serializable pkVal() {\n return this.$!column.name;\n }\n #break\n#end\n}\n"},{"name":"mapper.xml.vm","code":"##引入mybatis支持\n$!{mybatisSupport.vm}\n\n##设置保存名称与保存位置\n$!callback.setFileName($tool.append($!{tableInfo.name}, \"Dao.xml\"))\n$!callback.setSavePath($tool.append($modulePath, \"/src/main/resources/mapper\"))\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!doctype mapper PUBLIC \"-//mybatis.org//DTD Mapper 3.0//EN\" \"http://mybatis.org/dtd/mybatis-3-mapper.dtd\">\n<ul class="image_map">\n\n <resultmap type=\"$!{tableInfo.savePackageName}.entity.$!{tableInfo.name}\" id=\"$!{tableInfo.name}Map\">\n#foreach($column in $tableInfo.fullColumn)\n <result property=\"$!column.name\" column=\"$!column.obj.name\" jdbcType=\"$!column.ext.jdbcType\"/>\n#end\n </resultmap>\n\n \n <insert id=\"insertBatch\" keyProperty=\"$!pk.name\" useGeneratedKeys=\"true\">\n insert into $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)\n values\n <foreach collection=\"entities\" item=\"entity\" separator=\",\">\n (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)\n </foreach>\n </insert>\n \n <insert id=\"insertOrUpdateBatch\" keyProperty=\"$!pk.name\" useGeneratedKeys=\"true\">\n insert into $!{tableInfo.obj.parent.name}.$!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)\n values\n <foreach collection=\"entities\" item=\"entity\" separator=\",\">\n (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)\n </foreach>\n on duplicate key update\n #foreach($column in $tableInfo.otherColumn)$!column.obj.name = values($!column.obj.name) #if($velocityHasNext), #end#end\n </insert>\n\n</mapper>\n"},{"name":"service.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Service\")\n\n##保存文件(宏定义)\n#save(\"/service\", \"Service.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"service\")\n\nimport com.baomidou.mybatisplus.extension.service.IService;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\n\n##表注释(宏定义)\n#tableComment(\"表服务接口\")\npublic interface $!{tableName} extends IService<$!tableinfo.name> {\n\n}\n"},{"name":"serviceImpl.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"ServiceImpl\")\n\n##保存文件(宏定义)\n#save(\"/service/impl\", \"ServiceImpl.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"service.impl\")\n\nimport com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;\nimport $!{tableInfo.savePackageName}.dao.$!{tableInfo.name}Dao;\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.stereotype.Service;\n\n##表注释(宏定义)\n#tableComment(\"表服务实现类\")\n@Service(\"$!tool.firstLowerCase($tableInfo.name)Service\")\npublic class $!{tableName} extends ServiceImpl<$!{tableinfo.name}dao, $!{tableInfo.name}> implements $!{tableInfo.name}Service {\n\n}\n"}]},"MybatisPlus":{"name":"MybatisPlus","elementList":[{"name":"controller.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Controller\")\n\n##保存文件(宏定义)\n#save(\"/controller\", \"Controller.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"controller\")\n\n##定义服务名\n#set($serviceName = $!tool.append($!tool.firstLowerCase($!tableInfo.name), \"Service\"))\n\n##定义实体对象名\n#set($entityName = $!tool.firstLowerCase($!tableInfo.name))\n\nimport com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;\nimport com.baomidou.mybatisplus.extension.api.ApiController;\nimport com.baomidou.mybatisplus.extension.api.R;\nimport com.baomidou.mybatisplus.extension.plugins.pagination.Page;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.web.bind.annotation.*;\n\nimport javax.annotation.Resource;\nimport java.io.Serializable;\nimport java.util.List;\n\n##表注释(宏定义)\n#tableComment(\"表控制层\")\n@RestController\n@RequestMapping(\"$!tool.firstLowerCase($!tableInfo.name)\")\npublic class $!{tableName} extends ApiController {\n /**\n * 服务对象\n */\n @Resource\n private $!{tableInfo.name}Service $!{serviceName};\n\n /**\n * 分页查询所有数据\n *\n * @param page 分页对象\n * @param $!entityName 查询实体\n * @return 所有数据\n */\n @GetMapping\n public R selectAll(Page<$!tableinfo.name> page, $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.page(page, new QueryWrapper<strong>($!entityName)));\n }\n\n /**\n * 通过主键查询单条数据\n *\n * @param id 主键\n * @return 单条数据\n */\n @GetMapping(\"{id}\")\n public R selectOne(@PathVariable Serializable id) {\n return success(this.$!{serviceName}.getById(id));\n }\n\n /**\n * 新增数据\n *\n * @param $!entityName 实体对象\n * @return 新增结果\n */\n @PostMapping\n public R insert(@RequestBody $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.save($!entityName));\n }\n\n /**\n * 修改数据\n *\n * @param $!entityName 实体对象\n * @return 修改结果\n */\n @PutMapping\n public R update(@RequestBody $!tableInfo.name $!entityName) {\n return success(this.$!{serviceName}.updateById($!entityName));\n }\n\n /**\n * 删除数据\n *\n * @param idList 主键结合\n * @return 删除结果\n */\n @DeleteMapping\n public R delete(@RequestParam(\"idList\") List<long> idList) {\n return success(this.$!{serviceName}.removeByIds(idList));\n }\n}\n"},{"name":"dao.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Dao\")\n\n##保存文件(宏定义)\n#save(\"/dao\", \"Dao.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"dao\")\n\nimport com.baomidou.mybatisplus.core.mapper.BaseMapper;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\n\n##表注释(宏定义)\n#tableComment(\"表数据库访问层\")\npublic interface $!{tableName} extends BaseMapper<$!tableinfo.name> {\n\n}\n"},{"name":"entity.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##保存文件(宏定义)\n#save(\"/entity\", \".java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"entity\")\n\n##自动导入包(全局变量)\n$!{autoImport.vm}\nimport com.baomidou.mybatisplus.extension.activerecord.Model;\nimport java.io.Serializable;\n\n##表注释(宏定义)\n#tableComment(\"表实体类\")\n@SuppressWarnings(\"serial\")\npublic class $!{tableInfo.name} extends Model<$!{tableinfo.name}> {\n#foreach($column in $tableInfo.fullColumn)\n #if(${column.comment})//${column.comment}#end\n\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n#end\n\n#foreach($column in $tableInfo.fullColumn)\n#getSetMethod($column)\n#end\n\n#foreach($column in $tableInfo.pkColumn)\n /**\n * 获取主键值\n *\n * @return 主键值\n */\n @Override\n protected Serializable pkVal() {\n return this.$!column.name;\n }\n #break\n#end\n}\n"},{"name":"service.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"Service\")\n\n##保存文件(宏定义)\n#save(\"/service\", \"Service.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"service\")\n\nimport com.baomidou.mybatisplus.extension.service.IService;\nimport $!{tableInfo.savePackageName}.entity.$!tableInfo.name;\n\n##表注释(宏定义)\n#tableComment(\"表服务接口\")\npublic interface $!{tableName} extends IService<$!tableinfo.name> {\n\n}\n"},{"name":"serviceImpl.java.vm","code":"##导入宏定义\n$!{define.vm}\n\n##设置表后缀(宏定义)\n#setTableSuffix(\"ServiceImpl\")\n\n##保存文件(宏定义)\n#save(\"/service/impl\", \"ServiceImpl.java\")\n\n##包路径(宏定义)\n#setPackageSuffix(\"service.impl\")\n\nimport com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;\nimport $!{tableInfo.savePackageName}.dao.$!{tableInfo.name}Dao;\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.stereotype.Service;\n\n##表注释(宏定义)\n#tableComment(\"表服务实现类\")\n@Service(\"$!tool.firstLowerCase($tableInfo.name)Service\")\npublic class $!{tableName} extends ServiceImpl<$!{tableinfo.name}dao, $!{tableInfo.name}> implements $!{tableInfo.name}Service {\n\n}\n"}]},"Default":{"name":"Default","elementList":[{"name":"controller.java.vm","code":"##定义初始变量\n#set($tableName = $tool.append($tableInfo.name, \"Controller\"))\n##设置回调\n$!callback.setFileName($tool.append($tableName, \".java\"))\n$!callback.setSavePath($tool.append($tableInfo.savePath, \"/controller\"))\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n#if($tableInfo.savePackageName)package $!{tableInfo.savePackageName}.#{end}controller;\n\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.PageRequest;\nimport org.springframework.http.ResponseEntity;\nimport org.springframework.web.bind.annotation.*;\n\nimport javax.annotation.Resource;\n\n/**\n * $!{tableInfo.comment}($!{tableInfo.name})表控制层\n *\n * @author $!author\n * @since $!time.currTime()\n */\n@RestController\n@RequestMapping(\"$!tool.firstLowerCase($tableInfo.name)\")\npublic class $!{tableName} {\n /**\n * 服务对象\n */\n @Resource\n private $!{tableInfo.name}Service $!tool.firstLowerCase($tableInfo.name)Service;\n\n /**\n * 分页查询\n *\n * @param $!{tool.firstLowerCase($tableInfo.name)} 筛选条件\n * @param pageRequest 分页对象\n * @return 查询结果\n */\n @GetMapping\n public ResponseEntity<page<$!{tableinfo.name}>> queryByPage($!{tableInfo.name} $!{tool.firstLowerCase($tableInfo.name)}, PageRequest pageRequest) {\n return ResponseEntity.ok(this.$!{tool.firstLowerCase($tableInfo.name)}Service.queryByPage($!{tool.firstLowerCase($tableInfo.name)}, pageRequest));\n }\n\n /**\n * 通过主键查询单条数据\n *\n * @param id 主键\n * @return 单条数据\n */\n @GetMapping(\"{id}\")\n public ResponseEntity<$!{tableinfo.name}> queryById(@PathVariable(\"id\") $!pk.shortType id) {\n return ResponseEntity.ok(this.$!{tool.firstLowerCase($tableInfo.name)}Service.queryById(id));\n }\n\n /**\n * 新增数据\n *\n * @param $!{tool.firstLowerCase($tableInfo.name)} 实体\n * @return 新增结果\n */\n @PostMapping\n public ResponseEntity<$!{tableinfo.name}> add($!{tableInfo.name} $!{tool.firstLowerCase($tableInfo.name)}) {\n return ResponseEntity.ok(this.$!{tool.firstLowerCase($tableInfo.name)}Service.insert($!{tool.firstLowerCase($tableInfo.name)}));\n }\n\n /**\n * 编辑数据\n *\n * @param $!{tool.firstLowerCase($tableInfo.name)} 实体\n * @return 编辑结果\n */\n @PutMapping\n public ResponseEntity<$!{tableinfo.name}> edit($!{tableInfo.name} $!{tool.firstLowerCase($tableInfo.name)}) {\n return ResponseEntity.ok(this.$!{tool.firstLowerCase($tableInfo.name)}Service.update($!{tool.firstLowerCase($tableInfo.name)}));\n }\n\n /**\n * 删除数据\n *\n * @param id 主键\n * @return 删除是否成功\n */\n @DeleteMapping\n public ResponseEntity<boolean> deleteById($!pk.shortType id) {\n return ResponseEntity.ok(this.$!{tool.firstLowerCase($tableInfo.name)}Service.deleteById(id));\n }\n\n}\n"},{"name":"dao.java.vm","code":"##定义初始变量\n#set($tableName = $tool.append($tableInfo.name, \"Dao\"))\n##设置回调\n$!callback.setFileName($tool.append($tableName, \".java\"))\n$!callback.setSavePath($tool.append($tableInfo.savePath, \"/dao\"))\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n#if($tableInfo.savePackageName)package $!{tableInfo.savePackageName}.#{end}dao;\n\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport org.apache.ibatis.annotations.Param;\nimport org.springframework.data.domain.Pageable;\nimport java.util.List;\n\n/**\n * $!{tableInfo.comment}($!{tableInfo.name})表数据库访问层\n *\n * @author $!author\n * @since $!time.currTime()\n */\npublic interface $!{tableName} {\n\n /**\n * 通过ID查询单条数据\n *\n * @param $!pk.name 主键\n * @return 实例对象\n */\n $!{tableInfo.name} queryById($!pk.shortType $!pk.name);\n\n /**\n * 查询指定行数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 查询条件\n * @param pageable 分页对象\n * @return 对象列表\n */\n List<$!{tableinfo.name}> queryAllByLimit($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}), @Param(\"pageable\") Pageable pageable);\n\n /**\n * 统计总行数\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 查询条件\n * @return 总行数\n */\n long count($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));\n\n /**\n * 新增数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 影响行数\n */\n int insert($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));\n\n /**\n * 批量新增数据(MyBatis原生foreach方法)\n *\n * @param entities List<$!{tableinfo.name}> 实例对象列表\n * @return 影响行数\n */\n int insertBatch(@Param(\"entities\") List<$!{tableinfo.name}> entities);\n\n /**\n * 批量新增或按主键更新数据(MyBatis原生foreach方法)\n *\n * @param entities List<$!{tableinfo.name}> 实例对象列表\n * @return 影响行数\n * @throws org.springframework.jdbc.BadSqlGrammarException 入参是空List的时候会抛SQL语句错误的异常,请自行校验入参\n */\n int insertOrUpdateBatch(@Param(\"entities\") List<$!{tableinfo.name}> entities);\n\n /**\n * 修改数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 影响行数\n */\n int update($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));\n\n /**\n * 通过主键删除数据\n *\n * @param $!pk.name 主键\n * @return 影响行数\n */\n int deleteById($!pk.shortType $!pk.name);\n\n}\n"},{"name":"debug.json.vm","code":"// 禁止将生成结果写入到文件\n$!callback.setWriteFile(false)\n\n//调试表原始对象\n$!tool.debug($tableInfo.obj)\n\n//调试列原始对象\n$!tool.debug($tableInfo.fullColumn.get(0).obj)\n\n//调试列原始列类型\n$!tool.debug($tableInfo.fullColumn.get(0).obj.dataType)\n\n//获取原始列类型中的字段\nsqlType = $!tool.getField($tableInfo.fullColumn.get(0).obj.dataType, \"typeName\")\n\n//执行原始列类型中的方法\nsqlTypeLen = $!tableInfo.fullColumn.get(0).obj.dataType.getLength()\n"},{"name":"entity.java.vm","code":"##引入宏定义\n$!{define.vm}\n\n##使用宏定义设置回调(保存位置与文件后缀)\n#save(\"/entity\", \".java\")\n\n##使用宏定义设置包后缀\n#setPackageSuffix(\"entity\")\n\n##使用全局变量实现默认包导入\n$!{autoImport.vm}\nimport java.io.Serializable;\n\n##使用宏定义实现类注释信息\n#tableComment(\"实体类\")\npublic class $!{tableInfo.name} implements Serializable {\n private static final long serialVersionUID = $!tool.serial();\n#foreach($column in $tableInfo.fullColumn)\n #if(${column.comment})/**\n * ${column.comment}\n */#end\n\n private $!{tool.getClsNameByFullName($column.type)} $!{column.name};\n#end\n\n#foreach($column in $tableInfo.fullColumn)\n##使用宏定义实现get,set方法\n#getSetMethod($column)\n#end\n\n}\n"},{"name":"mapper.xml.vm","code":"##引入mybatis支持\n$!{mybatisSupport.vm}\n\n##设置保存名称与保存位置\n$!callback.setFileName($tool.append($!{tableInfo.name}, \"Dao.xml\"))\n$!callback.setSavePath($tool.append($modulePath, \"/src/main/resources/mapper\"))\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!doctype mapper PUBLIC \"-//mybatis.org//DTD Mapper 3.0//EN\" \"http://mybatis.org/dtd/mybatis-3-mapper.dtd\">\n<ul class="image_map">\n\n <resultmap type=\"$!{tableInfo.savePackageName}.entity.$!{tableInfo.name}\" id=\"$!{tableInfo.name}Map\">\n#foreach($column in $tableInfo.fullColumn)\n <result property=\"$!column.name\" column=\"$!column.obj.name\" jdbcType=\"$!column.ext.jdbcType\"/>\n#end\n </resultmap>\n\n \n <select id=\"queryById\" resultMap=\"$!{tableInfo.name}Map\">\n select\n #allSqlColumn()\n\n from $!tableInfo.obj.name\n where $!pk.obj.name = #{$!pk.name}\n </select>\n\n \n <select id=\"queryAllByLimit\" resultMap=\"$!{tableInfo.name}Map\">\n select\n #allSqlColumn()\n\n from $!tableInfo.obj.name\n <where>\n#foreach($column in $tableInfo.fullColumn)\n <if test=\"$!column.name != null#if($column.type.equals(\"java.lang.String\")) and $!column.name != ''#end\">\n and $!column.obj.name = #{$!column.name}\n </if>\n#end\n </where>\n limit #{pageable.offset}, #{pageable.pageSize}\n </select>\n\n \n <select id=\"count\" resultType=\"java.lang.Long\">\n select count(1)\n from $!tableInfo.obj.name\n <where>\n#foreach($column in $tableInfo.fullColumn)\n <if test=\"$!column.name != null#if($column.type.equals(\"java.lang.String\")) and $!column.name != ''#end\">\n and $!column.obj.name = #{$!column.name}\n </if>\n#end\n </where>\n </select>\n\n \n <insert id=\"insert\" keyProperty=\"$!pk.name\" useGeneratedKeys=\"true\">\n insert into $!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)\n values (#foreach($column in $tableInfo.otherColumn)#{$!{column.name}}#if($velocityHasNext), #end#end)\n </insert>\n\n <insert id=\"insertBatch\" keyProperty=\"$!pk.name\" useGeneratedKeys=\"true\">\n insert into $!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)\n values\n <foreach collection=\"entities\" item=\"entity\" separator=\",\">\n (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)\n </foreach>\n </insert>\n\n <insert id=\"insertOrUpdateBatch\" keyProperty=\"$!pk.name\" useGeneratedKeys=\"true\">\n insert into $!{tableInfo.obj.name}(#foreach($column in $tableInfo.otherColumn)$!column.obj.name#if($velocityHasNext), #end#end)\n values\n <foreach collection=\"entities\" item=\"entity\" separator=\",\">\n (#foreach($column in $tableInfo.otherColumn)#{entity.$!{column.name}}#if($velocityHasNext), #end#end)\n </foreach>\n on duplicate key update\n #foreach($column in $tableInfo.otherColumn)$!column.obj.name = values($!column.obj.name)#if($velocityHasNext),\n #end#end\n\n </insert>\n\n \n <update id=\"update\">\n update $!{tableInfo.obj.name}\n <set>\n#foreach($column in $tableInfo.otherColumn)\n <if test=\"$!column.name != null#if($column.type.equals(\"java.lang.String\")) and $!column.name != ''#end\">\n $!column.obj.name = #{$!column.name},\n </if>\n#end\n </set>\n where $!pk.obj.name = #{$!pk.name}\n </update>\n\n \n <delete id=\"deleteById\">\n delete from $!{tableInfo.obj.name} where $!pk.obj.name = #{$!pk.name}\n </delete>\n\n</mapper>\n"},{"name":"service.java.vm","code":"##定义初始变量\n#set($tableName = $tool.append($tableInfo.name, \"Service\"))\n##设置回调\n$!callback.setFileName($tool.append($tableName, \".java\"))\n$!callback.setSavePath($tool.append($tableInfo.savePath, \"/service\"))\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n#if($tableInfo.savePackageName)package $!{tableInfo.savePackageName}.#{end}service;\n\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.PageRequest;\n\n/**\n * $!{tableInfo.comment}($!{tableInfo.name})表服务接口\n *\n * @author $!author\n * @since $!time.currTime()\n */\npublic interface $!{tableName} {\n\n /**\n * 通过ID查询单条数据\n *\n * @param $!pk.name 主键\n * @return 实例对象\n */\n $!{tableInfo.name} queryById($!pk.shortType $!pk.name);\n\n /**\n * 分页查询\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 筛选条件\n * @param pageRequest 分页对象\n * @return 查询结果\n */\n Page<$!{tableinfo.name}> queryByPage($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}), PageRequest pageRequest);\n\n /**\n * 新增数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 实例对象\n */\n $!{tableInfo.name} insert($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));\n\n /**\n * 修改数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 实例对象\n */\n $!{tableInfo.name} update($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name}));\n\n /**\n * 通过主键删除数据\n *\n * @param $!pk.name 主键\n * @return 是否成功\n */\n boolean deleteById($!pk.shortType $!pk.name);\n\n}"},{"name":"serviceImpl.java.vm","code":"##定义初始变量\n#set($tableName = $tool.append($tableInfo.name, \"ServiceImpl\"))\n##设置回调\n$!callback.setFileName($tool.append($tableName, \".java\"))\n$!callback.setSavePath($tool.append($tableInfo.savePath, \"/service/impl\"))\n\n##拿到主键\n#if(!$tableInfo.pkColumn.isEmpty())\n #set($pk = $tableInfo.pkColumn.get(0))\n#end\n\n#if($tableInfo.savePackageName)package $!{tableInfo.savePackageName}.#{end}service.impl;\n\nimport $!{tableInfo.savePackageName}.entity.$!{tableInfo.name};\nimport $!{tableInfo.savePackageName}.dao.$!{tableInfo.name}Dao;\nimport $!{tableInfo.savePackageName}.service.$!{tableInfo.name}Service;\nimport org.springframework.stereotype.Service;\nimport org.springframework.data.domain.Page;\nimport org.springframework.data.domain.PageImpl;\nimport org.springframework.data.domain.PageRequest;\n\nimport javax.annotation.Resource;\n\n/**\n * $!{tableInfo.comment}($!{tableInfo.name})表服务实现类\n *\n * @author $!author\n * @since $!time.currTime()\n */\n@Service(\"$!tool.firstLowerCase($!{tableInfo.name})Service\")\npublic class $!{tableName} implements $!{tableInfo.name}Service {\n @Resource\n private $!{tableInfo.name}Dao $!tool.firstLowerCase($!{tableInfo.name})Dao;\n\n /**\n * 通过ID查询单条数据\n *\n * @param $!pk.name 主键\n * @return 实例对象\n */\n @Override\n public $!{tableInfo.name} queryById($!pk.shortType $!pk.name) {\n return this.$!{tool.firstLowerCase($!{tableInfo.name})}Dao.queryById($!pk.name);\n }\n\n /**\n * 分页查询\n *\n * @param $!{tool.firstLowerCase($tableInfo.name)} 筛选条件\n * @param pageRequest 分页对象\n * @return 查询结果\n */\n @Override\n public Page<$!{tableinfo.name}> queryByPage($!{tableInfo.name} $!{tool.firstLowerCase($tableInfo.name)}, PageRequest pageRequest) {\n long total = this.$!{tool.firstLowerCase($tableInfo.name)}Dao.count($!{tool.firstLowerCase($tableInfo.name)});\n return new PageImpl<strong>(this.$!{tool.firstLowerCase($tableInfo.name)}Dao.queryAllByLimit($!{tool.firstLowerCase($tableInfo.name)}, pageRequest), pageRequest, total);\n }\n\n /**\n * 新增数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 实例对象\n */\n @Override\n public $!{tableInfo.name} insert($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name})) {\n this.$!{tool.firstLowerCase($!{tableInfo.name})}Dao.insert($!tool.firstLowerCase($!{tableInfo.name}));\n return $!tool.firstLowerCase($!{tableInfo.name});\n }\n\n /**\n * 修改数据\n *\n * @param $!tool.firstLowerCase($!{tableInfo.name}) 实例对象\n * @return 实例对象\n */\n @Override\n public $!{tableInfo.name} update($!{tableInfo.name} $!tool.firstLowerCase($!{tableInfo.name})) {\n this.$!{tool.firstLowerCase($!{tableInfo.name})}Dao.update($!tool.firstLowerCase($!{tableInfo.name}));\n return this.queryById($!{tool.firstLowerCase($!{tableInfo.name})}.get$!tool.firstUpperCase($pk.name)());\n }\n\n /**\n * 通过主键删除数据\n *\n * @param $!pk.name 主键\n * @return 是否成功\n */\n @Override\n public boolean deleteById($!pk.shortType $!pk.name) {\n return this.$!{tool.firstLowerCase($!{tableInfo.name})}Dao.deleteById($!pk.name)> 0;\n }\n}"}]}},"columnConfig":{"Default":{"name":"Default","elementList":[{"title":"disable","type":"BOOLEAN","selectValue":""},{"title":"support","type":"SELECT","selectValue":"add,edit,query,del,ui"}]}},"globalConfig":{"Default":{"name":"Default","elementList":[{"name":"autoImport.vm","value":"##自动导入包(仅导入实体属性需要的包,通常用于实体类)\n#foreach($import in $importList)\nimport $!import;\n#end"},{"name":"define.vm","value":"##(Velocity宏定义)\n\n##定义设置表名后缀的宏定义,调用方式:#setTableSuffix(\"Test\")\n#macro(setTableSuffix $suffix)\n #set($tableName = $!tool.append($tableInfo.name, $suffix))\n#end\n\n##定义设置包名后缀的宏定义,调用方式:#setPackageSuffix(\"Test\")\n#macro(setPackageSuffix $suffix)\n#if($suffix!=\"\")package #end#if($tableInfo.savePackageName!=\"\")$!{tableInfo.savePackageName}.#{end}$!suffix;\n#end\n\n##定义直接保存路径与文件名简化的宏定义,调用方式:#save(\"/entity\", \".java\")\n#macro(save $path $fileName)\n $!callback.setSavePath($tool.append($tableInfo.savePath, $path))\n $!callback.setFileName($tool.append($tableInfo.name, $fileName))\n#end\n\n##定义表注释的宏定义,调用方式:#tableComment(\"注释信息\")\n#macro(tableComment $desc)\n/**\n * $!{tableInfo.comment}($!{tableInfo.name})$desc\n *\n * @author $!author\n * @since $!time.currTime()\n */\n#end\n\n##定义GET,SET方法的宏定义,调用方式:#getSetMethod($column)\n#macro(getSetMethod $column)\n\n public $!{tool.getClsNameByFullName($column.type)} get$!{tool.firstUpperCase($column.name)}() {\n return $!{column.name};\n }\n\n public void set$!{tool.firstUpperCase($column.name)}($!{tool.getClsNameByFullName($column.type)} $!{column.name}) {\n this.$!{column.name} = $!{column.name};\n }\n#end"},{"name":"init.vm","value":"##初始化区域\n\n##去掉表的t_前缀\n$!tableInfo.setName($tool.getClassName($tableInfo.obj.name.replaceFirst(\"book_\",\"\")))\n\n##参考阿里巴巴开发手册,POJO 类中布尔类型的变量,都不要加 is 前缀,否则部分框架解析会引起序列化错误\n#foreach($column in $tableInfo.fullColumn)\n#if($column.name.startsWith(\"is\") && $column.type.equals(\"java.lang.Boolean\"))\n $!column.setName($tool.firstLowerCase($column.name.substring(2)))\n#end\n#end\n\n##实现动态排除列\n#set($temp = $tool.newHashSet(\"testCreateTime\", \"otherColumn\"))\n#foreach($item in $temp)\n #set($newList = $tool.newArrayList())\n #foreach($column in $tableInfo.fullColumn)\n #if($column.name!=$item)\n ##带有反回值的方法调用时使用$tool.call来消除返回值\n $tool.call($newList.add($column))\n #end\n #end\n ##重新保存\n $tableInfo.setFullColumn($newList)\n#end\n\n##对importList进行篡改\n#set($temp = $tool.newHashSet())\n#foreach($column in $tableInfo.fullColumn)\n #if(!$column.type.startsWith(\"java.lang.\"))\n ##带有反回值的方法调用时使用$tool.call来消除返回值\n $tool.call($temp.add($column.type))\n #end\n#end\n##覆盖\n#set($importList = $temp)"},{"name":"mybatisSupport.vm","value":"##针对Mybatis 进行支持,主要用于生成xml文件\n#foreach($column in $tableInfo.fullColumn)\n ##储存列类型\n $tool.call($column.ext.put(\"sqlType\", $tool.getField($column.obj.dataType, \"typeName\")))\n #if($tool.newHashSet(\"java.lang.String\").contains($column.type))\n #set($jdbcType=\"VARCHAR\")\n #elseif($tool.newHashSet(\"java.lang.Boolean\", \"boolean\").contains($column.type))\n #set($jdbcType=\"BOOLEAN\")\n #elseif($tool.newHashSet(\"java.lang.Byte\", \"byte\").contains($column.type))\n #set($jdbcType=\"BYTE\")\n #elseif($tool.newHashSet(\"java.lang.Integer\", \"int\", \"java.lang.Short\", \"short\").contains($column.type))\n #set($jdbcType=\"INTEGER\")\n #elseif($tool.newHashSet(\"java.lang.Long\", \"long\").contains($column.type))\n #set($jdbcType=\"INTEGER\")\n #elseif($tool.newHashSet(\"java.lang.Float\", \"float\", \"java.lang.Double\", \"double\").contains($column.type))\n #set($jdbcType=\"NUMERIC\")\n #elseif($tool.newHashSet(\"java.util.Date\", \"java.sql.Timestamp\", \"java.time.Instant\", \"java.time.LocalDateTime\", \"java.time.OffsetDateTime\", \"\tjava.time.ZonedDateTime\").contains($column.type))\n #set($jdbcType=\"TIMESTAMP\")\n #elseif($tool.newHashSet(\"java.sql.Date\", \"java.time.LocalDate\").contains($column.type))\n #set($jdbcType=\"TIMESTAMP\")\n #else\n ##其他类型\n #set($jdbcType=\"VARCHAR\")\n #end\n $tool.call($column.ext.put(\"jdbcType\", $jdbcType))\n#end\n\n##定义宏,查询所有列\n#macro(allSqlColumn)#foreach($column in $tableInfo.fullColumn)$column.obj.name#if($velocityHasNext), #end#end#end\n"}]}}}
diff --git a/src/main/resources/description/templateDescription.html b/src/main/resources/description/templateDescription.html
index 59fecf07..40d5ffb4 100644
--- a/src/main/resources/description/templateDescription.html
+++ b/src/main/resources/description/templateDescription.html
@@ -14,6 +14,7 @@
 对象
 $tableInfo 表对象
 obj 表原始对象 com.intellij.database.model.DasTable
+ preName 表前缀 java.lang.String
 name 表名(转换后的首字母大写)java.lang.String
 comment 表注释 java.lang.String
 fullColumn 所有列 java.util.List&lt;ColumnInfo&gt;
@@ -65,6 +66,7 @@
 $generateService
 run(String, Map&lt;String,Object&gt;) 代码生成服务,参数1:模板名称,参数2:附加参数。
 $dasUtil Database提供的工具类,具体可方法请查看源码,适用于高端玩家
+ $dasUtil.
 $dbUtil Database提供的工具类,具体可方法请查看源码,适用于高端玩家
 </pre>
 </div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://github.com/makejavas/EasyCode/compare/master...universal.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://github.com/makejavas/EasyCode/compare/master...universal.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>		
</body>