[数据模型] 修复了神通上建模失败的情况

src/main/java/com/tykj/base/config/BeanFactory.java

@@ -22,9 +22,9 @@ public class BeanFactory {
         if ("com.mysql.cj.jdbc.Driver".equals(env) || "com.mysql.jdbc.Driver".equals(env)) {
             return new MysqlCreateTableUtil();
         }
-//        if ("com.oscar.Driver".equals(env)) {
-//            return new OscarCreateUtil();
-//        }
+        if ("com.oscar.Driver".equals(env)) {
+            return new OscarCreateUtil();
+        }
         return new MysqlCreateTableUtil();
     }
 }

src/main/java/com/tykj/model/create_util/BaseCreateUtil.java

@@ -24,7 +24,7 @@ public abstract class  BaseCreateUtil {
                 "<hibernate-mapping>\n" +
                 "    <class entity-name=\"" + tableVO.getModelName().toLowerCase().toUpperCase() + "\" table=\"" + tableVO.getModelName().toLowerCase().toUpperCase() + "\">\n";
 
-        xmlMapping += addGenerator();
+        xmlMapping += addGenerator(tableVO);
 
 
         for (ColumnVO columnVO : dataList) {
@@ -42,14 +42,14 @@ public abstract class  BaseCreateUtil {
 
 
         ;
-        xmlMapping += addDefaultTime();
+        xmlMapping += addDefaultTime(tableVO);
         xmlMapping += "   </class>\n" +
                 "</hibernate-mapping>";
         return xmlMapping;
     }
 
-    abstract String addGenerator();
+    abstract String addGenerator(TableVO tableVO);
 
-    abstract String addDefaultTime();
+    abstract String addDefaultTime(TableVO tableVO);
 
 }

src/main/java/com/tykj/model/create_util/MysqlCreateTableUtil.java

@@ -16,7 +16,7 @@ import java.util.List;
 public class MysqlCreateTableUtil extends BaseCreateUtil {
 
     @Override
-    String addGenerator() {
+    String addGenerator(TableVO tableVO) {
         String result = "";
         result += " <id name=\"ID\" type=\"java.lang.Integer\" length=\"11\" unsaved-value=\"null\"  >\n" +
                 "  <generator  class=\"increment\"  >\n" +
@@ -26,7 +26,7 @@ public class MysqlCreateTableUtil extends BaseCreateUtil {
     }
 
     @Override
-    String addDefaultTime() {
+    String addDefaultTime(TableVO tableVO) {
         String result = "";
         result+=" <property name =\"CREATE_TIME\" type =\"java.util.Date\" generated=\"always\"   insert=\"false\" update=\"false\" access=\"field\" >" +
                 "<column name=\"CREATE_TIME\" sql-type=\"timestamp\" not-null=\"true\" default=\"CURRENT_TIMESTAMP\" />\n"+

src/main/java/com/tykj/model/create_util/OscarCreateUtil.java

@@ -14,24 +14,23 @@ public class OscarCreateUtil extends BaseCreateUtil {
     }
 
     @Override
-    String addGenerator() {
-        return "\" <id name=\\\"ID\\\" type=\\\"java.lang.Integer\\\" length=\\\"11\\\" unsaved-value=\\\"null\\\"  >\\n\" +\n" +
-                "        \"  <generator  class=\\\"com.tykj.base.entity.XMQGenerator\\\"  >\\n\" +\n" +
-                "        \"<param name=\\\"sequence\\\">SEQUENCE_\" + tableVO.getModelName().toLowerCase().toUpperCase() + \"</param>\" +\n" +
-                "        \"</generator>\" +\n" +
-                "        \"        </id>\\n\";";
+    String addGenerator(TableVO tableVO) {
+
+        return  " <id name=\"ID\" type=\"java.lang.Integer\" length=\"11\" unsaved-value=\"null\"  >\n" +
+                "  <generator  class=\"com.tykj.base.entity.XMQGenerator\"  >\n" +
+                "<param name=\"sequence\">SEQUENCE_" + tableVO.getModelName().toLowerCase().toUpperCase() + "</param>" +
+                "</generator>" +
+                "        </id>\n";
     }
 
     @Override
-    String addDefaultTime() {
-        return "  <property name = \\\"CREATE_TIME\\\" type =\\\"java.util.Date\\\"  generated=\\\"always\\\"  >    \\n\" +\n" +
-                "            \"            <column name = \\\"CREATE_TIME\\\"  default = \\\"CURRENT_TIMESTAMP\\\" />    \\n\" +\n" +
-                "            \"        </property>  \\n\" +\n" +
-                "            \"       <property name = \\\"UPDATE_TIME\\\" type =\\\"java.util.Date\\\"  >    \\n\" +\n" +
-                "            \"            <column name = \\\"UPDATE_TIME\\\"  default = \\\"CURRENT_TIMESTAMP\\\" />    \\n\" +\n" +
-                "            \"        </property>  \";\n" +
-                "   + \"   </class>\\n\" +\n" +
-                "            \"</hibernate-mapping>\"";
+    String addDefaultTime(TableVO tableVO) {
+         return  "  <property name = \"CREATE_TIME\" type =\"java.util.Date\"  generated=\"always\"  >    \n" +
+                "            <column name = \"CREATE_TIME\"  default = \"CURRENT_TIMESTAMP\" />    \n" +
+                "        </property>  \n" +
+                "       <property name = \"UPDATE_TIME\" type =\"java.util.Date\"  >    \n" +
+                "            <column name = \"UPDATE_TIME\"  default = \"CURRENT_TIMESTAMP\" />    \n" +
+                "        </property>  ";
     }
 
 }

src/main/resources/application.yml

 spring:
   profiles:
-    active: mysql
+    active: oscar