[数据模型] 修复扫描时多出id字段bug

src/main/java/com/tykj/workflowcore/model_layer/utils/ClassTypeLength.java

@@ -23,7 +23,7 @@ public class ClassTypeLength {
         } else if (Double.equals(genericType)) {
             length = 10;
         } else {
-            length = 0;
+            length =1;
         }
         return length;
     }

src/main/java/com/tykj/workflowcore/model_layer/utils/CreateTableUtil.java

@@ -59,12 +59,13 @@ public class CreateTableUtil {
                 "    <class entity-name=\"" + tableVO.getModelName() + "\" table=\"" + tableVO.getModelName() + "\">\n";
 
         xmlMapping += " <id name=\"id\" type=\"java.lang.Integer\" length=\"11\" unsaved-value=\"null\"  >\n" +
-                "            <generator class=\"identity\" />\n" +
                 "        </id>";
+
+
         for (ColumnVO columnVO : dataList) {
 
             xmlMapping +=
-                    " <property type=\"" + columnVO.getFieldType() + "\" name=\"" + columnVO.getFieldName() + "\" length=\"" + columnVO.getFieldLength() +
+                    "\n <property type=\"" + columnVO.getFieldType() + "\" name=\"" + columnVO.getFieldName() + "\" length=\"" + columnVO.getFieldLength() +
                             "\" column=\"" + columnVO.getFieldName() + "\"/>\n";
 
         }
@@ -74,6 +75,37 @@ public class CreateTableUtil {
     }
 
 
+    public static String createTable(String entityName,ColumnVO primaryColumn,List<ColumnVO> dataList) {
+        //   1sql-type="text" string 转为text文本，2长度超过会自动转换
+//        List<ColumnVO> dataList = tableVO.getDataList();
+        String xmlMapping = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                "<!DOCTYPE hibernate-mapping PUBLIC\n" +
+                "        \"-//Hibernate/Hibernate Mapping DTD 3.0//EN\"\n" +
+                "        \"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd\">\n" +
+                "<hibernate-mapping>\n" +
+                "    <class entity-name=\"" + entityName + "\" table=\"" + entityName + "\">\n";
+
+        xmlMapping += " <id name=\""+primaryColumn.getFieldName()+"\" type=\""+primaryColumn.getFieldType()+"\" unsaved-value=\"null\"  >\n" +
+                "        </id>";
+
+
+        for (ColumnVO columnVO : dataList) {
+
+            xmlMapping +=
+                    "\n <property type=\"" + columnVO.getFieldType() + "\" name=\"" + columnVO.getFieldName() +
+                            "\" column=\"" + columnVO.getFieldName() + "\"/>\n";
+
+
+//            xmlMapping +=
+//                    "\n <property type=\"" + columnVO.getFieldType() + "\" name=\"" + columnVO.getFieldName() + "\" length=\"" + columnVO.getFieldLength() +
+//                            "\" column=\"" + columnVO.getFieldName() + "\"/>\n";
+        }
+        xmlMapping += "   </class>\n" +
+                "</hibernate-mapping>";
+        return xmlMapping;
+    }
+
+
 
 
     public static String getClassName(String aClass) {

src/main/test/java/com/tykj/workflowcore/WorkflowCoreApplicationTests.java

@@ -517,17 +517,13 @@ class WorkflowCoreApplicationTests {
 
     @Test
     public void complex() {
-
-
         ArrayList<QueryCondition> queryConditions = Lists.newArrayList(
-                new QueryCondition("id", "=", "1")
+                new QueryCondition("testId", "=", "1")
 //                new QueryCondition("type", "=", "'1'")
         );
-        List<Map<String, Object>> list = modelService.complexQuery("nw_history", queryConditions);
+        List<Map<String, Object>> list = modelService.complexQuery("TestScan", queryConditions);
         for (Map<String, Object> map : list) {
             System.out.println(map);
         }
-
     }
-
 }