From e469716b7fbb3d077691e0209858dc81f1edd8db Mon Sep 17 00:00:00 2001
From: chenlw <874313221@qq.com>
Date: Mon, 10 Oct 2016 14:18:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=90=AF=E5=A4=9A=E4=B8=AA?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=97=B6=EF=BC=8C=E8=BF=81=E7=A7=BB=E6=88=90?=
 =?UTF-8?q?=E5=8A=9F=E5=90=8E=E6=96=B0=E5=BB=BA2=E4=B8=AAdatainfo=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/thread/ThreadMoveData.java        | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

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:表示 迁移失败