|
|
|
@ -137,7 +137,7 @@ public class ThreadMoveData{
|
|
|
|
|
moveE.setRate(taskOne.getProgress());
|
|
|
|
|
moveE.setLastTime(DateForm.date2StringBysecond(new Date()));
|
|
|
|
|
if (3 == taskOne.getStatus()) {
|
|
|
|
|
//成功
|
|
|
|
|
//成功---创建数据
|
|
|
|
|
makeDataInfo(moveE);
|
|
|
|
|
}else if(taskOne.getStatus() < 0){
|
|
|
|
|
//失败
|
|
|
|
@ -384,7 +384,9 @@ public class ThreadMoveData{
|
|
|
|
|
data.setExecResult(dataMove.getExecResult());
|
|
|
|
|
data.setId(0);
|
|
|
|
|
try {
|
|
|
|
|
if (dataInfoDao.countByDataPath(data) == 0) {
|
|
|
|
|
dataInfoDao.save(data);
|
|
|
|
|
}
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
log.error(e);
|
|
|
|
|
dataMove.setCompleteStatus("1");
|
|
|
|
@ -411,7 +413,8 @@ public class ThreadMoveData{
|
|
|
|
|
//去掉 最后 的 数字 +/ 符合
|
|
|
|
|
if (matcher2.find()) {
|
|
|
|
|
String removeStr = matcher2.group();
|
|
|
|
|
dstPath = dstPath.replace(removeStr, "");
|
|
|
|
|
removeStr.length();
|
|
|
|
|
dstPath = dstPath.substring(0, dstPath.length()-removeStr.length());
|
|
|
|
|
}
|
|
|
|
|
return dstPath;
|
|
|
|
|
}
|
|
|
|
|