Merge remote-tracking branch 'origin/develop' into develop

dmp-business/dmp-rwd/src/main/resources/db/init/schema.sql

@@ -319,7 +319,6 @@ CREATE TABLE IF NOT EXISTS `dt_sync_data` (
    `local_id` varchar(200) DEFAULT NULL COMMENT '本地编码',
    `name` varchar(200) DEFAULT NULL COMMENT '名称',
    `code` varchar(200) DEFAULT NULL,
-   `obj_name` varchar(200) DEFAULT NULL,
    `creator` varchar(32) NULL DEFAULT NULL COMMENT '创建人',
    `creation_time` char(14) NULL DEFAULT NULL COMMENT '创建时间',
    `modifier` varchar(32) NULL DEFAULT NULL COMMENT '最后修改人',

dmp-business/dmp-rwd/src/main/resources/mapper/SyncDatMapper.xml

@@ -19,7 +19,6 @@
     <result column="local_id" jdbcType="VARCHAR" property="localId" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="code" jdbcType="VARCHAR" property="code" />
-    <result column="obj_name" jdbcType="VARCHAR" property="objName" />
     <result column="creator" jdbcType="VARCHAR" property="creator" />
     <result column="creation_time" jdbcType="CHAR" property="creationTime" />
     <result column="modifier" jdbcType="VARCHAR" property="modifier" />
@@ -29,21 +28,18 @@
   </resultMap>
   <sql id="Base_Column_List">
     id, table_name, target_id, object_type, `type`, project_id, sign, ops, ops_name, from_id, to_id,
-    error, class_code, local_name, local_id, `name`, code, obj_name, creator, creation_time,
+    error, class_code, local_name, local_id, `name`, code,  creator, creation_time,
     modifier, modified_time, `valid`, ts
   </sql>
 
   <insert id="save">
-    <selectKey keyProperty="id" resultType="java.lang.String" order="BEFORE">
-      select uuid()
-    </selectKey>
     insert into dt_sync_data
      (id,table_name,target_id, object_type, `type`,
       project_id, sign, ops, 
       ops_name, from_id, to_id, 
       error, class_code, local_name, 
       local_id, `name`, code,
-      obj_name, creator, creation_time, 
+      creator, creation_time,
       modifier, modified_time)
     VALUES
     <foreach collection="vos" item="vo" open="(" close=")" separator="),(">
@@ -52,14 +48,14 @@
       #{vo.opsName},#{vo.fromId},#{vo.toId},
       #{vo.error},#{vo.classCode},#{vo.localName},
       #{vo.localId},#{vo.name},#{vo.code},
-      #{vo.objName},#{vo.creator},#{vo.creationTime},
+      #{vo.creator},#{vo.creationTime},
       #{vo.modifier},#{vo.modifiedTime}
     </foreach>
     ON DUPLICATE KEY UPDATE
     type = VALUES(type), ops = VALUES(ops), ops_name = VALUES(ops_name),
     from_id = VALUES(from_id), to_id = VALUES(to_id), error = VALUES(error),
     class_code = VALUES(class_code), local_name = VALUES(local_name), local_id = VALUES(local_id),
-    `name` = VALUES(name), obj_name = VALUES(obj_name),code = VALUES(code),
+    `name` = VALUES(name),code = VALUES(code),
     modifier = VALUES(modifier), modified_time = VALUES(modified_time)
   </insert>
 

dmp-comp/dmp-digital-starter/src/main/java/com/persagy/dmp/rwd/migrate/entity/SyncData.java

@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName(value = "sync_data",autoResultMap = true)
+@TableName(value = "dt_sync_data",autoResultMap = true)
 @NoArgsConstructor
 @AllArgsConstructor
 public class SyncData extends AuditableEntity {
@@ -104,6 +104,4 @@ public class SyncData extends AuditableEntity {
 
     private String code;
 
-    private String objName;
-
 }