diff --git a/src/com/platform/service/thread/ThreadMoveData.java b/src/com/platform/service/thread/ThreadMoveData.java index 569a62b0..39407903 100644 --- a/src/com/platform/service/thread/ThreadMoveData.java +++ b/src/com/platform/service/thread/ThreadMoveData.java @@ -132,23 +132,27 @@ public class ThreadMoveData{ int difSize = (int) (srcSizeTemp-dstSize); Thread.sleep(10*difSize); //TODO 查看当前拷贝目录进程是否结束? - //TODO 进行MD5校验 + // 进行MD5校验 int resl = check.checkoutMD5Folder(dataMove.getDataPath(), dataMove.getDstPath()); - //TODO 校验成功--则删除数据库记录 + // 校验成功--则增加数据库记录 if(resl == 1){ - //校验成功--修改 数据库记录-- - dataMove.setCompleteStatus("2"); - dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); - dataInfoMoveTmpDao.update(dataMove); - //TODO 新增 一条数据-到-dataInfo - DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap( - DataInfoEntity.class, Bean2MapUtils.convertBean(dataMove)); - data.setDataPath(dataMove.getDstPath()); - data.setVolumeIp(dataMove.getDstVolumeIp()); - data.setVolumePath(dataMove.getDstVolumePath()); - data.setVolumeIp(dataMove.getVolumeIp()); - data.setId(0); - dataInfoDao.save(data); + // 判断 迁移数据的status是否改为 2 + DataInfoEntityMoveTmp movetmp = dataInfoMoveTmpDao.findById(dataMove.getId()); + if (null != movetmp && !"2".equals(movetmp.getCompleteStatus())) { + //校验成功--修改 数据库记录-- + dataMove.setCompleteStatus("2"); + dataMove.setLastTime(DateForm.date2StringBysecond(new Date())); + dataInfoMoveTmpDao.update(dataMove); + //TODO 新增 一条数据-到-dataInfo + DataInfoEntity data = (DataInfoEntity) Bean2MapUtils.convertMap( + DataInfoEntity.class, Bean2MapUtils.convertBean(dataMove)); + data.setDataPath(dataMove.getDstPath()); + data.setVolumeIp(dataMove.getDstVolumeIp()); + data.setVolumePath(dataMove.getDstVolumePath()); + data.setVolumeIp(dataMove.getVolumeIp()); + data.setId(0); + dataInfoDao.save(data); + } } else { // 3:表示 迁移失败