فهرست منبع

adm 数据迁移 新增sql脚本 方式

lvxianyun 3 سال پیش
والد
کامیت
7c08b58268

+ 5 - 5
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/constant/MigrationConstant.java

@@ -24,7 +24,7 @@ public class MigrationConstant {
     public final static String DEF_CLASS_DELETE = "/dmp-rwd/rwd/def/class/deleteBatch?";
     public final static String DEF_CLASS_UPDATE = "/dmp-rwd/rwd/def/class/updateBatch?";
     /**   对象实例表 sql脚本 开头  ***/
-    public final static String DEF_CLASS_SQL_PRE = "REPLACE INTO `dt_define_type`(`id`, `code`, `name`, `alias_code`, `alias_name`, `obj_type`, `group_code`, `project_id`, `major_code`, `system_code`, `equipment_code`, `parent_code`, `version`, `source_from`, `creator`, `creation_time`, `modifier`, `modified_time`, `valid`, `ts`)  VALUES \n ";
+    public final static String DEF_CLASS_SQL_PRE = "REPLACE INTO `dt_define_type`(`id`, `code`, `name`, `alias_code`, `alias_name`, `obj_type`, `group_code`, `project_id`, `major_code`, `system_code`, `equipment_code`, `parent_code`, `version`, `source_from`, `creator`, `creation_time`, `modifier`, `modified_time`, `valid`)  VALUES \n ";
 
 
     /**   信息点 接口 ***/
@@ -33,14 +33,14 @@ public class MigrationConstant {
     public final static String DEF_FUNCID_DELETE = "/dmp-rwd/rwd/def/funcid/deleteBatch?";
     public final static String DEF_FUNCID_UPDATE = "/dmp-rwd/rwd/def/funcid/updateBatch?";
     /**   对象实例表 sql脚本 开头  ***/
-    public final static String DEF_FUNCID_SQL_PRE = "REPLACE INTO `dt_define_info`(`id`, `code`, `name`, `alias_code`, `alias_name`, `class_code`, `group_code`, `project_id`, `category`, `first_tag`, `second_tag`, `priority`, `input_mode`, `unit`, `data_type`, `is_multiple`, `is_region`, `formater`, `data_source`, `remark`, `sub_flag`, `weak_point`, `show_order`, `version`, `source_from`, `creator`, `creation_time`, `modifier`, `modified_time`, `valid`, `ts`) VALUES\n";
+    public final static String DEF_FUNCID_SQL_PRE = "REPLACE INTO `dt_define_info`(`id`, `code`, `name`, `alias_code`, `alias_name`, `class_code`, `group_code`, `project_id`, `category`, `first_tag`, `second_tag`, `priority`, `input_mode`, `unit`, `data_type`, `is_multiple`, `is_region`, `formater`, `data_source`, `remark`, `sub_flag`, `weak_point`, `show_order`, `version`, `source_from`, `creator`, `creation_time`, `modifier`, `modified_time`, `valid`) VALUES\n";
 
     /**   图类型表 接口 需要提供批量 ***/
     public final static String DEF_GRAPH = "/dmp-rwd/rwd/def/graph/query?";
     public final static String DEF_GRAPH_INSERT = "/dmp-rwd/rwd/def/graph/create?";
     public final static String DEF_GRAPH_DELETE = "/dmp-rwd/rwd/def/graph/delete?";
     public final static String DEF_GRAPH_UPDATE = "/dmp-rwd/rwd/def/graph/update?";
-    public final static String DEF_GRAPH_UPDATE_SQL_PRE ="REPLACE INTO `dt_define_graph` ( `id`, `code`,`name`, `first_category`, `second_category`,`second_category_mes`, `remark`, `object_types`,`creator`, `creation_time` , `modifier`,`modified_time`,`valid`, `ts`) VALUES \n ";
+    public final static String DEF_GRAPH_UPDATE_SQL_PRE ="REPLACE INTO `dt_define_graph` ( `id`, `code`,`name`, `first_category`, `second_category`,`second_category_mes`, `remark`, `object_types`,`creator`, `creation_time` , `modifier`,`modified_time`,`valid` ) VALUES \n ";
 
     /**   边类型表 接口  ***/
     public final static String DEF_REL = "/dmp-rwd/rwd/def/rel/query?";
@@ -55,7 +55,7 @@ public class MigrationConstant {
     public final static String DT_OBJECT_DELETE = "/dmp-rwd/rwd/instance/object/delete?";
     public final static String DT_OBJECT_UPDATE = "/dmp-rwd/rwd/instance/object/update?";
     /**   对象实例表 sql脚本 开头  ***/
-    public final static String DT_OBJECT_SQL_PRE = "REPLACE INTO `dt_object`(`id`, `name`, `local_id`, `local_name`, `group_code`, `project_id`, `obj_type`, `class_code`, `grouping`, `infos`, `virtual_codes`, `create_app`, `update_app`, `creator`, `creation_time`, `modifier`, `modified_time`, `valid`, `ts`) VALUES \n";
+    public final static String DT_OBJECT_SQL_PRE = "REPLACE INTO `dt_object`(`id`, `name`, `local_id`, `local_name`, `group_code`, `project_id`, `obj_type`, `class_code`, `grouping`, `infos`, `virtual_codes`, `create_app`, `update_app`, `creator`, `creation_time`, `modifier`, `modified_time`, `valid`) VALUES \n";
 
 
     /**   关系实例表 接口  ***/
@@ -64,5 +64,5 @@ public class MigrationConstant {
     public final static String DT_RELATION_DELETE = "/dmp-rwd/rwd/instance/relation/delete?";
     public final static String DT_RELATION_UPDATE = "/dmp-rwd/rwd/instance/relation/update?";
     /**   对象实例表 sql脚本 开头  ***/
-    public final static String DT_RELATION_SQL_PRE = "REPLACE INTO `dt_relation`(`id`, `group_code`, `project_id`, `graph_id`, `graph_code`, `rel_code`, `rel_value`, `obj_from`, `obj_to`, `create_app`, `update_app`, `creator`, `creation_time`, `modifier`, `modified_time`, `valid`, `ts`) VALUES \n";
+    public final static String DT_RELATION_SQL_PRE = "REPLACE INTO `dt_relation`(`id`, `group_code`, `project_id`, `graph_id`, `graph_code`, `rel_code`, `rel_value`, `obj_from`, `obj_to`, `create_app`, `update_app`, `creator`, `creation_time`, `modifier`, `modified_time`, `valid` ) VALUES \n";
 }

+ 5 - 6
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/DefineInfoMigration.java

@@ -164,8 +164,8 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
                 sqls.append("'").append(infoDefine.getUnit()).append("',");
             }
             sqls.append("'").append(infoDefine.getDataType()).append("',");
-            sqls.append(infoDefine.getIsMultiple()).append(",");
-            sqls.append(infoDefine.getIsRegion()).append(",");
+            sqls.append(infoDefine.getIsMultiple()?1:0).append(",");
+            sqls.append(infoDefine.getIsRegion()?1:0).append(",");
             if (infoDefine.getFormater() == null) {
                 sqls.append(infoDefine.getFormater()).append(",");
             } else {
@@ -181,8 +181,8 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
             } else {
                 sqls.append("'").append(infoDefine.getRemark()).append("',");
             }
-            sqls.append("'").append(infoDefine.getSubFlag()).append("',");
-            sqls.append(infoDefine.getWeakPoint()).append(",");
+            sqls.append(infoDefine.getSubFlag()?1:0).append(",");
+            sqls.append(infoDefine.getWeakPoint()?1:0).append(",");
             sqls.append(infoDefine.getShowOrder()).append(",");
             sqls.append("'").append(infoDefine.getVersion()).append("',");
             sqls.append(infoDefine.getSourceFrom()).append(",");
@@ -199,8 +199,7 @@ public class DefineInfoMigration extends MigrationAbstractServiceImpl<ObjectInfo
             } else {
                 sqls.append("'").append(infoDefine.getModifiedTime()).append(",");
             }
-            sqls.append(infoDefine.getValid()).append(",");
-            sqls.append(infoDefine.getTs());
+            sqls.append(infoDefine.getValid());
             sqls.append("),");
         });
         String sql = sqls.toString();

+ 3 - 3
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/DefineTypeMigration.java

@@ -148,6 +148,7 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
         sqls.append(MigrationConstant.DEF_CLASS_SQL_PRE);
         admDefineList.forEach(typeDefine ->{
             sqls.append("(");
+            sqls.append("'").append(typeDefine.getId()).append("',");
             sqls.append("'").append(typeDefine.getCode()).append("',");
             sqls.append("'").append(typeDefine.getName()).append("',");
             sqls.append("'").append(typeDefine.getAliasCode()).append("',");
@@ -179,7 +180,7 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
             if (typeDefine.getModifier() == null) {
                 sqls.append(typeDefine.getModifier()).append(",");
             } else {
-                sqls.append("'").append(typeDefine.getModifier()).append(",");
+                sqls.append("'").append(typeDefine.getModifier()).append("',");
             }
 
             if (typeDefine.getModifiedTime() == null) {
@@ -188,8 +189,7 @@ public class DefineTypeMigration extends MigrationAbstractServiceImpl<ObjectType
                 sqls.append("'").append(typeDefine.getModifiedTime()).append("',");
             }
 
-            sqls.append(typeDefine.getValid()).append(",");
-            sqls.append(typeDefine.getTs());
+            sqls.append(typeDefine.getValid());
             sqls.append("),");
         });
         String sql = sqls.toString();

+ 2 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/ObjectDigitalMigration.java

@@ -120,6 +120,7 @@ public class ObjectDigitalMigration extends MigrationAbstractServiceImpl<ObjectD
         String sql = sqls.toString();
         sql = sql.substring(0, sql.lastIndexOf(","));
         sql += ";";
+        sql = sql.replaceAll("\"","\\\\\"");
         return sql;
     }
 
@@ -169,8 +170,7 @@ public class ObjectDigitalMigration extends MigrationAbstractServiceImpl<ObjectD
             sqls.append("'").append(objectDigital.getCreationTime()).append("',");
             sqls.append("'").append(objectDigital.getModifier()).append("',");
             sqls.append("'").append(objectDigital.getModifiedTime()).append("',");
-            sqls.append(objectDigital.getValid()).append(",");
-            sqls.append(objectDigital.getTs());
+            sqls.append(objectDigital.getValid());
             sqls.append("),");
         });
         return sqls;

+ 6 - 2
adm-business/adm-middleware/src/main/java/com/persagy/proxy/migration/service/Impl/ObjectRelationMigration.java

@@ -171,6 +171,11 @@ public class ObjectRelationMigration extends MigrationAbstractServiceImpl<Object
             sqls.append("'").append(relation.getId()).append("',");
             sqls.append("'").append(relation.getGroupCode()).append("',");
             sqls.append("'").append(relation.getProjectId()).append("',");
+            if (relation.getGraphId() == null) {
+                sqls.append(relation.getGraphId()).append(",");
+            } else {
+                sqls.append("'").append(relation.getGraphId()).append("',");
+            }
             sqls.append("'").append(relation.getGraphCode()).append("',");
             sqls.append("'").append(relation.getRelCode()).append("',");;
             if (relation.getRelValue() == null) {
@@ -194,8 +199,7 @@ public class ObjectRelationMigration extends MigrationAbstractServiceImpl<Object
             sqls.append("'").append(relation.getCreationTime()).append("',");
             sqls.append("'").append(relation.getModifier()).append("',");
             sqls.append("'").append(relation.getModifiedTime()).append("',");
-            sqls.append(relation.getValid()).append(",");
-            sqls.append("'").append(relation.getTs()).append("'");
+            sqls.append(relation.getValid());
             sqls.append("),");
         });
         return sqls;