commit

src/main/java/com/jz/dmp/modules/dao/DmpRealtimeSyncInfoDao.java

@@ -6,6 +6,7 @@ import com.jz.dmp.modules.controller.DataIntegration.bean.RealTimeSyncListDto;
 import com.jz.dmp.modules.controller.DataIntegration.bean.RealTimeSyncListReq;
 import com.jz.dmp.modules.model.DmpRealtimeSyncInfo;
 import com.jz.dmp.modules.model.DmpRealtimeSyncSelectTable;
+import com.jz.dmp.modules.model.DmpRealtimeTaskHistory;
 import com.jz.dmp.modules.model.RealTimeSyncDataSourceModel;
 import org.apache.ibatis.annotations.Param;
 
@@ -185,4 +186,13 @@ public interface DmpRealtimeSyncInfoDao {
      * @author Bellamy
      */
     int deleteByrealTaskId(Map map) throws Exception;
+
+    /**
+     * 新增实时同步任务版本记录
+     *
+     * @return
+     * @author Bellamy
+     * @since 2021-02-02
+     */
+    int insertRealtimeHistory(DmpRealtimeTaskHistory taskHistory) throws Exception;
 }
\ No newline at end of file

src/main/java/com/jz/dmp/modules/service/impl/DmpRealtimeSyncInfoServiceImpl.java

@@ -26,6 +26,7 @@ import freemarker.template.TemplateNotFoundException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -306,19 +307,6 @@ public class DmpRealtimeSyncInfoServiceImpl implements DmpRealtimeSyncInfoServic
         DmpProjectSystemInfo dmpProjectSystemInfo = dmpProjectDao.queryProjectSystemInfo(projectId);
         params.put("connectorSecurityFlag", dmpProjectSystemInfo.getKerberosIsenable()); //安全验证开关,是否启用KERBEROS
 
-       /* //保存实时同步任务处理数
-        DmpRealtimeSyncHandleCount countModel = new DmpRealtimeSyncHandleCount();
-        countModel.setUuid(UUID.randomUUID().toString());
-        countModel.setToSubmit(1);
-        countModel.setCreTime(new Date());
-        //初始化当前任务记录数
-        List<Map<String, String>> tables = (List<Map<String, String>>) params.get("tables");
-        if (!CollectionUtils.isEmpty(tables)) {
-            countModel.setToSubmit(countModel.getToSubmit() + tables.size());
-        }
-        dmpRealtimeSyncHandleCountDao.insert(countModel);
-        logger.info("###################添加实时同步任务处理数结束{}" + countModel.toString() + "############");*/
-
         //connect1@http://172.18.104.130:9993/connectors
         if (StringUtils.isNotEmpty(connectorUrl)) {
             if (connectorUrl.contains("@")) {
@@ -431,6 +419,11 @@ public class DmpRealtimeSyncInfoServiceImpl implements DmpRealtimeSyncInfoServic
                 realtiemId = Long.valueOf(saveBody.getId());
                 logger.info("###################保存实时同步任务--结束 ################");
 
+                DmpRealtimeTaskHistory taskHistory = new DmpRealtimeTaskHistory();
+                BeanUtils.copyProperties(saveBody,taskHistory);
+                taskHistory.setRealtimeSyncId(saveBody.getId());
+                dmpRealtimeSyncInfoDao.insertRealtimeHistory(taskHistory);
+
                 Map blacklist = new HashMap();
                 blacklist.put("creTime", new Date());
                 blacklist.put("realtimeId", saveBody.getId());

src/main/resources/mapper/dmp/DmpRealtimeSyncInfoMapper.xml

@@ -449,6 +449,16 @@
          values(#{realtimeId},#{desensitizationField},#{arithmetic},#{pkName},#{srcTableName},#{targetTableName},#{creTime},#{crePerson})
     </insert>
 
+    <!--新增实时同步任务版本记录-->
+    <insert id="insertRealtimeHistory" parameterType="com.jz.dmp.modules.model.DmpRealtimeTaskHistory">
+        insert into dmp_realtime_task_history(realtime_sync_id,src_datasource_id, target_datasource_id, src_table_name, target_table_name, type, connector_job_id, connector_json_data, src_topic_name
+        , project_id, desensitization_field, arithmetic, pk_name, source_type_name, target_type_name, src_database_type, src_database_name, connector_url, target_database_type
+        , target_database_name, src_datasource_name, target_datasource_name, store_type, status, create_time, update_time, cre_person, upt_person, version)
+        values (#{realtimeSyncId},#{srcDatasourceId}, #{targetDatasourceId}, #{srcTableName}, #{targetTableName}, #{type}, #{connectorJobId}, #{connectorJsonData}, #{srcTopicName}, #{projectId}
+        , #{desensitizationField}, #{arithmetic}, #{pkName}, #{sourceTypeName}, #{targetTypeName}, #{srcDatabaseType}, #{srcDatabaseName}, #{connectorUrl}, #{targetDatabaseType}
+        , #{targetDatabaseName}, #{srcDatasourceName}, #{targetDatasourceName}, #{storeType}, #{status}, #{createTime}, #{updateTime}, #{crePerson}, #{uptPerson} ,#{version})
+    </insert>
+
     <!--修改实时任务黑名单表-->
     <update id="updateRealtimeBlackList" parameterType="java.util.Map">
         update dmp_realtime_sync_blacklist_table_info