+ 优化了包名

! 修复了一些问题
cruldra · Dec 30, 2022 · a3d4675 · a3d4675
1 parent 01ddd1b
commit a3d4675
Show file tree

Hide file tree

Showing 13 changed files with 41 additions and 18 deletions.
diff --git a/src/org/cruldra/pdmviewer/PDMViewerApplication.java b/src/org/cruldra/pdmviewer/PDMViewerApplication.java
@@ -15,21 +15,23 @@
 import javax.swing.LayoutStyle;
 
 import kotlin.text.StringsKt;
+import org.cruldra.pdmviewer.models.PDM;
+import org.cruldra.pdmviewer.models.PDMColumn;
+import org.cruldra.pdmviewer.models.PDMTable;
+import org.cruldra.pdmviewer.parser.Parser;
 import org.cruldra.pdmviewer.utils.*;
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.io.OutputFormat;
 import org.dom4j.io.XMLWriter;
 
-import java.awt.Frame;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import javax.swing.JFileChooser;
 import javax.swing.event.TreeSelectionEvent;
-import javax.swing.event.TreeSelectionListener;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.table.DefaultTableModel;
 import javax.swing.table.TableModel;
@@ -175,7 +177,7 @@ private void generateInsertSelectiveBlockMenu(ActionEvent e) {
             trim1.addAttribute("suffixOverrides", ",");
             pdmt.getColumns().forEach(pdmColumn -> {
                 Element if1 = trim1.addElement("if");
-                if1.addAttribute("test", pdmColumn.getCode() + " != null");
+                if1.addAttribute("test", StrUtilsKt.toCamelCase(pdmColumn.getCode()) + " != null");
                 if1.addText(pdmColumn.getCode() + ",");
             });
 
@@ -185,8 +187,8 @@ private void generateInsertSelectiveBlockMenu(ActionEvent e) {
             trim2.addAttribute("suffixOverrides", ",");
             pdmt.getColumns().forEach(pdmColumn -> {
                 Element if2 = trim2.addElement("if");
-                if2.addAttribute("test", pdmColumn.getCode() + " != null");
-                if2.addText("#{" + pdmColumn.getCode() + ",jdbcType=" + StringsKt.substringBefore(pdmColumn.getDataType(), "(", pdmColumn.getDataType()) + "},");
+                if2.addAttribute("test", StrUtilsKt.toCamelCase(pdmColumn.getCode()) + " != null");
+                if2.addText("#{" + StrUtilsKt.toCamelCase(pdmColumn.getCode()) + ",jdbcType=" + PDMColumnExtensionsKt.getIbatisType(pdmColumn) + "},");
             });
 
             Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
@@ -214,10 +216,10 @@ private void generateUpdateByPrimaryKeySelectiveBlockMenu(ActionEvent e) {
             Element set = root.addElement("set");
             pdmt.getColumns().forEach(pdmColumn -> {
                 Element if1 = set.addElement("if");
-                if1.addAttribute("test", pdmColumn.getCode() + " != null");
-                if1.addText(pdmColumn.getCode() + " = #{" + StrUtilsKt.toCamelCase(pdmColumn.getCode()) + ",jdbcType=" + StringsKt.substringBefore(pdmColumn.getDataType(), "(", pdmColumn.getDataType()) + "},");
+                if1.addAttribute("test", StrUtilsKt.toCamelCase(pdmColumn.getCode()) + " != null");
+                if1.addText(pdmColumn.getCode() + " = #{" + StrUtilsKt.toCamelCase(pdmColumn.getCode()) + ",jdbcType=" + PDMColumnExtensionsKt.getIbatisType(pdmColumn) + "},");
             });
-            root.addText("\nwhere "+pkColumn.getCode()+" = #{"+pkColumn.getCode()+",jdbcType="+ StringsKt.substringBefore(pkColumn.getDataType() ,"(" ,pkColumn.getDataType()  ) +"}");
+            root.addText("\nwhere " + pkColumn.getCode() + " = #{" + pkColumn.getCode() + ",jdbcType=" + PDMColumnExtensionsKt.getIbatisType(pkColumn) + "}");
             Clipboard clipboard = Toolkit.getDefaultToolkit().getSystemClipboard();
             StringSelection selection = new StringSelection(formatXML(root));
             clipboard.setContents(selection, null);

diff --git a/src/org/cruldra/pdmviewer/utils/PDM.java → src/org/cruldra/pdmviewer/models/PDM.java b/src/org/cruldra/pdmviewer/utils/PDM.java → src/org/cruldra/pdmviewer/models/PDM.java
@@ -1,4 +1,4 @@
-package org.cruldra.pdmviewer.utils;
+package org.cruldra.pdmviewer.models;
 
 import java.util.ArrayList;
 

diff --git a/...rg/cruldra/pdmviewer/utils/PDMColumn.java → ...g/cruldra/pdmviewer/models/PDMColumn.java b/...rg/cruldra/pdmviewer/utils/PDMColumn.java → ...g/cruldra/pdmviewer/models/PDMColumn.java
@@ -1,4 +1,4 @@
-package org.cruldra.pdmviewer.utils;
+package org.cruldra.pdmviewer.models;
 
 public class PDMColumn {
 	private String id;

diff --git a/...org/cruldra/pdmviewer/utils/PDMIndex.java → ...rg/cruldra/pdmviewer/models/PDMIndex.java b/...org/cruldra/pdmviewer/utils/PDMIndex.java → ...rg/cruldra/pdmviewer/models/PDMIndex.java
@@ -1,4 +1,4 @@
-package org.cruldra.pdmviewer.utils;
+package org.cruldra.pdmviewer.models;
 
 import java.util.ArrayList;
 

diff --git a/src/org/cruldra/pdmviewer/utils/PDMKey.java → src/org/cruldra/pdmviewer/models/PDMKey.java b/src/org/cruldra/pdmviewer/utils/PDMKey.java → src/org/cruldra/pdmviewer/models/PDMKey.java
@@ -1,4 +1,4 @@
-package org.cruldra.pdmviewer.utils;
+package org.cruldra.pdmviewer.models;
 
 import java.util.ArrayList;
 

diff --git a/...a/pdmviewer/utils/PDMPhysicalDiagram.java → .../pdmviewer/models/PDMPhysicalDiagram.java b/...a/pdmviewer/utils/PDMPhysicalDiagram.java → .../pdmviewer/models/PDMPhysicalDiagram.java
@@ -1,4 +1,4 @@
-package org.cruldra.pdmviewer.utils;
+package org.cruldra.pdmviewer.models;
 
 import java.util.ArrayList;
 

diff --git a/...cruldra/pdmviewer/utils/PDMReference.java → ...ruldra/pdmviewer/models/PDMReference.java b/...cruldra/pdmviewer/utils/PDMReference.java → ...ruldra/pdmviewer/models/PDMReference.java
@@ -1,4 +1,4 @@
-package org.cruldra.pdmviewer.utils;
+package org.cruldra.pdmviewer.models;
 
 import java.util.ArrayList;
 

diff --git a/...dra/pdmviewer/utils/PDMReferenceJoin.java → ...ra/pdmviewer/models/PDMReferenceJoin.java b/...dra/pdmviewer/utils/PDMReferenceJoin.java → ...ra/pdmviewer/models/PDMReferenceJoin.java
@@ -1,4 +1,4 @@
-package org.cruldra.pdmviewer.utils;
+package org.cruldra.pdmviewer.models;
 
 public class PDMReferenceJoin {
 	private String Id;

diff --git a/...org/cruldra/pdmviewer/utils/PDMTable.java → ...rg/cruldra/pdmviewer/models/PDMTable.java b/...org/cruldra/pdmviewer/utils/PDMTable.java → ...rg/cruldra/pdmviewer/models/PDMTable.java
@@ -1,4 +1,4 @@
-package org.cruldra.pdmviewer.utils;
+package org.cruldra.pdmviewer.models;
 
 import java.util.ArrayList;
 

diff --git a/src/org/cruldra/pdmviewer/utils/PDMUser.java → ...org/cruldra/pdmviewer/models/PDMUser.java b/src/org/cruldra/pdmviewer/utils/PDMUser.java → ...org/cruldra/pdmviewer/models/PDMUser.java
@@ -1,4 +1,4 @@
-package org.cruldra.pdmviewer.utils;
+package org.cruldra.pdmviewer.models;
 
 import java.util.ArrayList;
 

diff --git a/src/org/cruldra/pdmviewer/parser/PDMParseException.kt b/src/org/cruldra/pdmviewer/parser/PDMParseException.kt
@@ -0,0 +1,6 @@
+package org.cruldra.pdmviewer.parser
+
+class PDMParseException(private val msg: String, override val cause: Throwable? = null) :
+    Exception(msg, cause) {
+
+}
diff --git a/src/org/cruldra/pdmviewer/utils/Parser.java → src/org/cruldra/pdmviewer/parser/Parser.java b/src/org/cruldra/pdmviewer/utils/Parser.java → src/org/cruldra/pdmviewer/parser/Parser.java
@@ -1,8 +1,9 @@
-package org.cruldra.pdmviewer.utils;
+package org.cruldra.pdmviewer.parser;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.cruldra.pdmviewer.models.*;
 import org.dom4j.Document;
 import org.dom4j.Element;
 import org.dom4j.Node;

diff --git a/src/org/cruldra/pdmviewer/utils/PDMColumnExtensions.kt b/src/org/cruldra/pdmviewer/utils/PDMColumnExtensions.kt
@@ -0,0 +1,14 @@
+package org.cruldra.pdmviewer.utils
+
+import org.cruldra.pdmviewer.models.PDMColumn
+import org.cruldra.pdmviewer.parser.PDMParseException
+import java.util.*
+
+fun PDMColumn.getIbatisType():String{
+    return  when(val shortName= this.dataType.substringBefore("(")){
+        "varchar" , "double"-> shortName.uppercase(Locale.getDefault())
+        "datetime" -> "TIMESTAMP"
+      "int" -> "INTEGER"
+      else -> throw  PDMParseException("ibatis没有匹配的数据类型 $shortName")
+  }
+}