feat: add mybatis scan result icon and fix some bugs

banzhe · banzhe · commit 2187ae4486fc · 2023-01-02T21:54:56.000+08:00
diff --git a/src/main/java/io/github/linyimin/plugin/component/SqlParamGenerateComponent.java b/src/main/java/io/github/linyimin/plugin/component/SqlParamGenerateComponent.java
@@ -42,13 +42,16 @@ public static ProcessResult<MybatisSqlConfiguration> generate(PsiElement psiElem
 
         PsiMethod psiMethod = null;
 
+        String statementId = "";
+
         if (psiElement instanceof PsiIdentifier && psiElement.getParent() instanceof PsiMethod) {
 
             psiMethod = (PsiMethod) psiElement.getParent();
+            statementId = acquireMethodName(psiMethod);
 
         }
 
-        String statementId = "";
+
 
         if (psiElement instanceof XmlToken && psiElement.getParent() instanceof XmlTag) {
             List<PsiMethod> methods = MapperXmlProcessor.processMapperMethod(psiElement.getParent());
@@ -70,11 +73,10 @@ public static ProcessResult<MybatisSqlConfiguration> generate(PsiElement psiElem
             return ProcessResult.fail(String.format("method of %s is not exist.", statementId));
         }
 
-        String method = acquireMethodName(psiMethod);
         String params = generateMethodParam(psiMethod, parser);
 
         if (cache) {
-            sqlConfig.setMethod(method);
+            sqlConfig.setMethod(statementId);
             sqlConfig.setParams(params);
             sqlConfig.setUpdateSql(true);
             if (parser instanceof RandomPOJO2JSONParser) {
@@ -89,7 +91,7 @@ public static ProcessResult<MybatisSqlConfiguration> generate(PsiElement psiElem
 
         MybatisSqlConfiguration configuration = new MybatisSqlConfiguration();
         configuration.setPsiElement(psiElement);
-        configuration.setMethod(method);
+        configuration.setMethod(statementId);
         configuration.setParams(params);
 
         return ProcessResult.success(configuration);
diff --git a/src/main/java/io/github/linyimin/plugin/ui/MybatisSqlScannerPanel.java b/src/main/java/io/github/linyimin/plugin/ui/MybatisSqlScannerPanel.java
@@ -31,12 +31,9 @@
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
-import javax.swing.tree.DefaultTreeModel;
-import javax.swing.tree.TreePath;
 import java.awt.*;
 import java.util.List;
 import java.util.Set;
-import java.util.function.Consumer;
 
 /**
  * @author banzhe
@@ -115,6 +112,12 @@ private void initRadioButtonGroup() {
         buttonGroup.add(complianceWithSpecRadioButton);
         buttonGroup.add(doesNotMeetSpecRadioButton);
         buttonGroup.add(fullTableScanRadioButton);
+
+        this.allRadioButton.addMouseListener(new MouseCursorAdapter(this.allRadioButton));
+        this.complianceWithSpecRadioButton.addMouseListener(new MouseCursorAdapter(this.complianceWithSpecRadioButton));
+        this.doesNotMeetSpecRadioButton.addMouseListener(new MouseCursorAdapter(this.doesNotMeetSpecRadioButton));
+        this.fullTableScanRadioButton.addMouseListener(new MouseCursorAdapter(this.fullTableScanRadioButton));
+
     }
 
     private void initText() {
@@ -144,7 +147,17 @@ public void listen() {
         backgroundTaskQueue.run(new Task.Backgroundable(project, Constant.APPLICATION_NAME) {
             @Override
             public void run(@NotNull ProgressIndicator indicator) {
+                ApplicationManager.getApplication().invokeLater(() -> {
+                    scannerResultPanel.setLayout(new BorderLayout());
+                    scannerResultPanel.remove(scannerResultContentPanel);
+                    scannerResultPanel.add(infoPane.getInfoPane());
+                    infoPane.setText("Scan mybatis sql...");
+                });
                 createTree();
+                ApplicationManager.getApplication().invokeLater(() -> {
+                    scannerResultPanel.remove(infoPane.getInfoPane());
+                    scannerResultPanel.add(scannerResultContentPanel);
+                });
             }
         });
     }
diff --git a/src/main/java/io/github/linyimin/plugin/ui/MybatisSqlViewerToolWindow.java b/src/main/java/io/github/linyimin/plugin/ui/MybatisSqlViewerToolWindow.java
@@ -83,6 +83,9 @@ public MybatisSqlViewerToolWindow(Project project) {
         this.mybatisModePanel.setBorder(Constant.LINE_BORDER);
 
         this.mybatisModeCheckBox.addItemListener(e -> this.mybatisModeCheckBoxListener());
+        this.mybatisModeCheckBox.addMouseListener(new MouseCursorAdapter(this.mybatisModeCheckBox));
+
+        this.totalTabbedPanel.addMouseListener(new MouseCursorAdapter(this.totalTabbedPanel));
 
     }
 
diff --git a/src/main/java/io/github/linyimin/plugin/ui/ParamTabbedPane.java b/src/main/java/io/github/linyimin/plugin/ui/ParamTabbedPane.java
@@ -56,6 +56,8 @@ public void mouseClicked(MouseEvent event) {
             }
         });
 
+        this.paramTabbedPanel.addMouseListener(new MouseCursorAdapter(this.paramTabbedPanel));
+
     }
 
     public JTabbedPane getParamTabbedPanel() {
diff --git a/src/main/java/io/github/linyimin/plugin/ui/SpecifyTableTabbedPane.java b/src/main/java/io/github/linyimin/plugin/ui/SpecifyTableTabbedPane.java
@@ -124,6 +124,8 @@ public SpecifyTableTabbedPane(Project project, JTabbedPane parent) {
 
         addButtonListener();
         addButtonMouseCursorAdapter();
+
+        this.specifyTablePanel.addMouseListener(new MouseCursorAdapter(this.specifyTablePanel));
     }
 
     private void initMockTypeCombobox() {
diff --git a/src/main/java/io/github/linyimin/plugin/ui/SqlTabbedPane.java b/src/main/java/io/github/linyimin/plugin/ui/SqlTabbedPane.java
@@ -112,6 +112,8 @@ public void mouseClicked(MouseEvent event) {
                 sqlTabbedPanelListener(true);
             }
         });
+
+        this.sqlTabbedPanel.addMouseListener(new MouseCursorAdapter(this.sqlTabbedPanel));
     }
 
     private void initSqlStressPanel() {
diff --git a/src/main/java/io/github/linyimin/plugin/ui/TableTabbedPane.java b/src/main/java/io/github/linyimin/plugin/ui/TableTabbedPane.java
@@ -35,6 +35,7 @@ public class TableTabbedPane implements TabbedChangeListener {
     public TableTabbedPane(Project project) {
         this.project = project;
         this.backgroundTaskQueue = new BackgroundTaskQueue(project, Constant.APPLICATION_NAME);
+        this.tableTabbedPanel.addMouseListener(new MouseCursorAdapter(this.tableTabbedPanel));
     }
 
     public JTabbedPane getTableTabbedPanel() {
diff --git a/src/main/java/io/github/linyimin/plugin/ui/tree/NamespaceTreeNode.java b/src/main/java/io/github/linyimin/plugin/ui/tree/NamespaceTreeNode.java
@@ -1,6 +1,7 @@
 package io.github.linyimin.plugin.ui.tree;
 
 import com.intellij.ui.treeStructure.SimpleNode;
+import io.github.linyimin.plugin.utils.IconUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -16,6 +17,7 @@ public class NamespaceTreeNode extends BaseSimpleNode {
     public NamespaceTreeNode(SimpleNode aParent, String name) {
         // 父节点和name赋值
         super(aParent, name);
+        this.getTemplatePresentation().setIcon(IconUtils.GENERATE_ICON);
     }
 
     @Override
diff --git a/src/main/java/io/github/linyimin/plugin/ui/tree/RootTreeNode.java b/src/main/java/io/github/linyimin/plugin/ui/tree/RootTreeNode.java
@@ -26,7 +26,7 @@ public class RootTreeNode extends BaseSimpleNode {
 
     public RootTreeNode(String name) {
         super(null, name);
-        this.getTemplatePresentation().setIcon(IconUtils.GENERATE_ICON);
+        this.getTemplatePresentation().setIcon(IconUtils.MAPPER_ICON);
     }
 
     /**
diff --git a/src/main/java/io/github/linyimin/plugin/ui/tree/TreeListener.java b/src/main/java/io/github/linyimin/plugin/ui/tree/TreeListener.java
@@ -5,11 +5,13 @@
 import com.intellij.openapi.progress.BackgroundTaskQueue;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.Task;
+import com.intellij.openapi.util.Computable;
 import com.intellij.psi.PsiElement;
 import com.intellij.ui.treeStructure.SimpleNode;
 import com.intellij.ui.treeStructure.SimpleTree;
 import com.intellij.util.PsiNavigateUtil;
 import io.github.linyimin.plugin.ProcessResult;
+import io.github.linyimin.plugin.component.SqlParamGenerateComponent;
 import io.github.linyimin.plugin.configuration.model.MybatisSqlConfiguration;
 import io.github.linyimin.plugin.constant.Constant;
 import io.github.linyimin.plugin.sql.checker.Checker;
@@ -90,9 +92,15 @@ public void mouseReleased(MouseEvent e) {
     }
 
     public void updateSqlPanel(MybatisSqlConfiguration configuration) {
-        this.updateSql(configuration.getSql());
-        this.validateSql(configuration.getSql());
-        this.explainSql(configuration.getSql());
+        ProcessResult<String> sqlResult = ApplicationManager.getApplication().runReadAction((Computable<ProcessResult<String>>) () -> SqlParamGenerateComponent.generateSql(mybatisSqlScannerPanel.getProject(), configuration.getMethod(), configuration.getParams(), false));
+        if (sqlResult.isSuccess()) {
+            this.updateSql(sqlResult.getData());
+            this.validateSql(sqlResult.getData());
+        } else {
+            this.updateSql(sqlResult.getErrorMsg());
+            this.validateSql(Constant.INPUT_SQL_PROMPT);
+        }
+        this.explainSql(sqlResult);
     }
 
     private void updateSql(String sql) {
@@ -133,18 +141,26 @@ private void validateSql(String sql) {
         }
     }
 
-    private void explainSql(String sql) {
+    private void explainSql(ProcessResult<String> sqlResult) {
 
         ApplicationManager.getApplication().invokeLater(() -> {
             mybatisSqlScannerPanel.getIndexPanel().setLayout(new BorderLayout());
             mybatisSqlScannerPanel.getIndexPanel().remove(mybatisSqlScannerPanel.getIndexScrollPane());
             mybatisSqlScannerPanel.getIndexPanel().remove(mybatisSqlScannerPanel.getInfoPane().getInfoPane());
             mybatisSqlScannerPanel.getIndexPanel().add(mybatisSqlScannerPanel.getInfoPane().getInfoPane());
-            mybatisSqlScannerPanel.getInfoPane().setText("Loading explain result...");
+            if (sqlResult.isSuccess()) {
+                mybatisSqlScannerPanel.getInfoPane().setText("Loading explain result...");
+            } else {
+                mybatisSqlScannerPanel.getInfoPane().setText(Constant.INPUT_SQL_PROMPT);
+            }
         });
 
+        if (!sqlResult.isSuccess()) {
+            return;
+        }
+
         try {
-            String explainSql = String.format("explain %s", sql);
+            String explainSql = String.format("explain %s", sqlResult.getData());
             SelectResult executeResult = (SelectResult) SqlExecutor.executeSql(this.mybatisSqlScannerPanel.getProject(), explainSql, false);
 
             ApplicationManager.getApplication().invokeLater(() -> {
diff --git a/src/main/java/io/github/linyimin/plugin/utils/IconUtils.java b/src/main/java/io/github/linyimin/plugin/utils/IconUtils.java
@@ -14,4 +14,10 @@ public interface IconUtils {
     Icon XML_TO_JAVA_ICON = IconLoader.getIcon("/images/xml_to_java.svg", IconUtils.class);
     Icon GENERATE_ICON = IconLoader.getIcon("/images/mybatis-sql-viewer.svg", IconUtils.class);
 
+    Icon BLOCKED_ICON = IconLoader.getIcon("/images/blocked.svg", IconUtils.class);
+    Icon CRITICAL_ICON = IconLoader.getIcon("/images/critical.svg", IconUtils.class);
+    Icon MAJOR_ICON = IconLoader.getIcon("/images/major.svg", IconUtils.class);
+
+    Icon MAPPER_ICON = IconLoader.getIcon("/images/mapper.svg", IconUtils.class);
+
 }
diff --git a/src/main/resources/images/blocked.svg b/src/main/resources/images/blocked.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#DB5860" fill-rule="evenodd" d="M10.9979553,12 L10.9979553,13.9959717 L5.00152588,13.9959717 L5.00152588,12 L3.34823648,11.5857143 C2.64941213,10.5175037 2.29999995,8.79845611 2.29999995,6.42857145 C2.29999995,3.43067052 5.00188282,1 8.00000004,1 C10.9981173,1 13.6999998,3.43045914 13.6999998,6.42857145 C13.6999998,8.79524159 13.359542,10.5142892 12.6786264,11.5857143 L10.9979553,12 Z M4.66027832,9.83447266 C5.39842059,9.96462705 6.95184326,9.18496933 6.95184326,8.36180473 C6.95184326,7.53864013 6.64392226,7.04970987 5.90881348,6.90411377 C3.51068115,6.42913818 3.51068115,7.9670838 3.51068115,8.23522949 C3.51068115,9.13262939 3.92213605,9.70431826 4.66027832,9.83447266 Z M10.7396292,9.83708622 C11.4777715,9.70693182 11.8892264,9.13524296 11.8892264,8.23784306 C11.8892264,7.96969737 11.8892264,6.43175175 9.49109408,6.90672734 C8.7559853,7.05232344 8.4480643,7.5412537 8.4480643,8.3644183 C8.4480643,9.1875829 10.001487,9.96724062 10.7396292,9.83708622 Z"/>
+</svg>
diff --git a/src/main/resources/images/critical.svg b/src/main/resources/images/critical.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="#F4AF3D" fill-rule="evenodd" d="M8,2 L15,14 L1,14 L8,2 Z M9,13 L9,11 L7,11 L7,13 L9,13 Z M9,10 L9,6 L7,6 L7,10 L9,10 Z"/>
+</svg>
diff --git a/src/main/resources/images/major.svg b/src/main/resources/images/major.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <g fill="none" fill-rule="evenodd">
+    <path fill="#59A869" d="M7.99999998,14.9995723 C6.66032075,14.9808018 5.47566778,14.3457239 4.68690909,13.3846154 L2,13.3846154 L2,11.7692308 L3.85345455,11.7692308 C3.76181818,11.4224615 3.69745455,11.066 3.69745455,10.6923077 L3.69745455,10.1538462 L2,10.1538462 L2,8.53846154 L3.69745455,8.53846154 L3.69745455,7.46153846 C3.69745455,7.27738462 3.73018182,7.10184615 3.75309091,6.92307692 L2,6.92307692 L2,5.30769231 L4.30727273,5.30769231 C4.724,4.60446154 5.33272727,4.03261538 6.06690909,3.65461538 L4.53418182,2.14261538 L5.69163636,1 L7.89090909,3.17107692 C7.94872727,3.16892308 7.94218182,3.16030769 8,3.16030769 C8.02072727,3.16030769 8.09927261,3.16892315 8.11999989,3.17000008 L10.3083636,1 L11.4658182,2.14261538 L9.97672727,3.61261538 C10.7458182,3.98846154 11.3829091,4.57861538 11.8149091,5.30769231 L14,5.30769231 L14,6.92307692 L12.3690909,6.92307692 C12.392,7.10184615 12.4247273,7.27738462 12.4247273,7.46153846 L12.4247273,8 L9.79999971,8 L9.79999971,7 L6.19999981,7 L6.19999981,8.5 L8,8.5 L8,10 L6.19999981,10 L6.19999981,11.5 L8,11.5 L8,14.9995753 Z"/>
+    <g fill="#6E6E6E" transform="rotate(180 8 8)">
+      <rect width="2.032" height="6.095" x="3.031" y="-.101" transform="rotate(45 4.047 2.947)"/>
+      <polygon points="0 .905 6.095 7 0 7"/>
+    </g>
+  </g>
+</svg>
diff --git a/src/main/resources/images/mapper.svg b/src/main/resources/images/mapper.svg

Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,9 @@ public MybatisSqlViewerToolWindow(Project project) {`
`83`	`83`	`this.mybatisModePanel.setBorder(Constant.LINE_BORDER);`
`84`	`84`
`85`	`85`	`this.mybatisModeCheckBox.addItemListener(e -> this.mybatisModeCheckBoxListener());`
	`86`	`+ this.mybatisModeCheckBox.addMouseListener(new MouseCursorAdapter(this.mybatisModeCheckBox));`
	`87`	`+`
	`88`	`+ this.totalTabbedPanel.addMouseListener(new MouseCursorAdapter(this.totalTabbedPanel));`
`86`	`89`
`87`	`90`	`}`
`88`	`91`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,8 @@ public void mouseClicked(MouseEvent event) {`
`56`	`56`	`}`
`57`	`57`	`});`
`58`	`58`
	`59`	`+ this.paramTabbedPanel.addMouseListener(new MouseCursorAdapter(this.paramTabbedPanel));`
	`60`	`+`
`59`	`61`	`}`
`60`	`62`
`61`	`63`	`public JTabbedPane getParamTabbedPanel() {`
Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,8 @@ public SpecifyTableTabbedPane(Project project, JTabbedPane parent) {`
`124`	`124`
`125`	`125`	`addButtonListener();`
`126`	`126`	`addButtonMouseCursorAdapter();`
	`127`	`+`
	`128`	`+ this.specifyTablePanel.addMouseListener(new MouseCursorAdapter(this.specifyTablePanel));`
`127`	`129`	`}`
`128`	`130`
`129`	`131`	`private void initMockTypeCombobox() {`
Original file line number	Diff line number	Diff line change
`@@ -112,6 +112,8 @@ public void mouseClicked(MouseEvent event) {`
`112`	`112`	`sqlTabbedPanelListener(true);`
`113`	`113`	`}`
`114`	`114`	`});`
	`115`	`+`
	`116`	`+ this.sqlTabbedPanel.addMouseListener(new MouseCursorAdapter(this.sqlTabbedPanel));`
`115`	`117`	`}`
`116`	`118`
`117`	`119`	`private void initSqlStressPanel() {`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ public class TableTabbedPane implements TabbedChangeListener {`
`35`	`35`	`public TableTabbedPane(Project project) {`
`36`	`36`	`this.project = project;`
`37`	`37`	`this.backgroundTaskQueue = new BackgroundTaskQueue(project, Constant.APPLICATION_NAME);`
	`38`	`+ this.tableTabbedPanel.addMouseListener(new MouseCursorAdapter(this.tableTabbedPanel));`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`public JTabbedPane getTableTabbedPanel() {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public class RootTreeNode extends BaseSimpleNode {`
`26`	`26`
`27`	`27`	`public RootTreeNode(String name) {`
`28`	`28`	`super(null, name);`
`29`		`- this.getTemplatePresentation().setIcon(IconUtils.GENERATE_ICON);`
	`29`	`+ this.getTemplatePresentation().setIcon(IconUtils.MAPPER_ICON);`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`/**`