修复module路径选择针对部分版本不生效问题。添加新的默认类型映射text

Author: makejavas

src/main/java/com/sjhy/plugin/tool/ConfigInfo.java

@@ -114,12 +114,13 @@ private void initDefault() {
         TypeMapperGroup typeMapperGroup = new TypeMapperGroup();
         List<TypeMapper> typeMapperList = new ArrayList<>();
         typeMapperList.add(new TypeMapper("varchar(\\(\\d+\\))?", "java.lang.String"));
+        typeMapperList.add(new TypeMapper("text", "java.lang.String"));
         typeMapperList.add(new TypeMapper("decimal(\\(\\d+\\))?", "java.lang.Double"));
         typeMapperList.add(new TypeMapper("integer", "java.lang.Integer"));
         typeMapperList.add(new TypeMapper("int(\\(\\d+\\))?", "java.lang.Integer"));
         typeMapperList.add(new TypeMapper("int4", "java.lang.Integer"));
         typeMapperList.add(new TypeMapper("int8", "java.lang.Long"));
-        typeMapperList.add(new TypeMapper("bigint", "java.lang.Long"));
+        typeMapperList.add(new TypeMapper("bigint(\\(\\d+\\))?", "java.lang.Long"));
         typeMapperList.add(new TypeMapper("datetime", "java.util.Date"));
         typeMapperList.add(new TypeMapper("timestamp", "java.util.Date"));
         typeMapperList.add(new TypeMapper("boolean", "java.lang.Boolean"));

src/main/java/com/sjhy/plugin/tool/VelocityUtils.java

@@ -119,9 +119,7 @@ private Map<String, Object> handlerMap() {
         map.put("packageName", cacheDataUtils.getPackageName());
         if (selectModule != null) {
             //module绝对路径
-            if (selectModule.getModuleFile()!=null) {
-                map.put("modulePath", selectModule.getModuleFile().getParent().getPath());
-            }
+            map.put("modulePath", new File(selectModule.getModuleFilePath()).getParent());
             map.put("moduleName", selectModule.getName());
         }
         // 项目路径

src/main/java/com/sjhy/plugin/ui/SelectSavePath.java

@@ -5,6 +5,7 @@
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.psi.PsiPackage;
 import com.sjhy.plugin.entity.TableInfo;
 import com.sjhy.plugin.entity.Template;
@@ -48,7 +49,7 @@ public class SelectSavePath extends JDialog {
     /**
      * 模型下拉框
      */
-    private JComboBox moduleComboBox;
+    private JComboBox<String> moduleComboBox;
     /**
      * 包字段
      */
@@ -128,16 +129,18 @@ public void windowClosing(WindowEvent e) {
      * @return 模板对象集合
      */
     private List<Template> getSelectTemplate() {
+        // 获取到已选择的复选框
         List<String> selectTemplateNameList = new ArrayList<>();
         checkBoxList.forEach(jCheckBox -> {
             if (jCheckBox.isSelected()) {
                 selectTemplateNameList.add(jCheckBox.getText());
             }
         });
-        List<Template> selectTemplateList = new ArrayList<>();
+        List<Template> selectTemplateList = new ArrayList<>(selectTemplateNameList.size());
         if (selectTemplateNameList.isEmpty()) {
             return selectTemplateList;
         }
+        // 将复选框转换成对应的模板对象
         templateGroup.getElementList().forEach(template -> {
             if (selectTemplateNameList.contains(template.getName())) {
                 selectTemplateList.add(template);
@@ -151,12 +154,13 @@ private List<Template> getSelectTemplate() {
      */
     private void onOK() {
         List<Template> selectTemplateList = getSelectTemplate();
+        // 如果选择的模板是空的
         if (selectTemplateList.isEmpty()) {
             JOptionPane.showMessageDialog(null, "Can't Select Template!");
             return;
         }
         String savePath = pathField.getText();
-        if (savePath.isEmpty()) {
+        if (StringUtils.isEmpty(savePath)) {
             JOptionPane.showMessageDialog(null, "Can't Select Save Path!");
             return;
         }
@@ -168,6 +172,7 @@ private void onOK() {
         cacheDataUtils.setUnifiedConfig(unifiedConfig.isSelected());
         // 生成代码
         VelocityUtils.getInstance().handler();
+        // 关闭窗口
         dispose();
     }
 
@@ -195,10 +200,15 @@ private void init() {
 
         //初始化Module选择
         for (Module module : cacheDataUtils.getModules()) {
-            //noinspection unchecked
             moduleComboBox.addItem(module.getName());
         }
 
+        //监听module选择事件
+        moduleComboBox.addActionListener(e -> {
+            // 刷新路径
+            refreshPath();
+        });
+
         //添加包选择事件
         packageChooseButton.addActionListener(e -> {
             PackageChooserDialog dialog = new PackageChooserDialog("Package Chooser", cacheDataUtils.getProject());
@@ -219,8 +229,8 @@ private void init() {
             //将当前选中的model设置为基础路径
             VirtualFile path = cacheDataUtils.getProject().getBaseDir();
             Module module = getSelectModule();
-            if (module!=null && module.getModuleFile()!=null) {
-                path = module.getModuleFile().getParent();
+            if (module!=null) {
+                path = VirtualFileManager.getInstance().findFileByUrl("file://" + new File(module.getModuleFilePath()).getParent());
             }
             VirtualFile virtualFile = FileChooser.chooseFile(FileChooserDescriptorFactory.createSingleFolderDescriptor(), cacheDataUtils.getProject(), path);
             if (virtualFile != null) {
@@ -264,8 +274,8 @@ private Module getSelectModule() {
     private String getBasePath() {
         Module module = getSelectModule();
         String baseDir = cacheDataUtils.getProject().getBasePath();
-        if (module!=null && module.getModuleFile()!=null) {
-            baseDir = module.getModuleFile().getParent().getPath();
+        if (module!=null) {
+            baseDir = new File(module.getModuleFilePath()).getParent();
         }
         // 针对Maven项目
         File file = new File(baseDir + "/src/main/java");