|
|
|
@ -218,7 +218,11 @@ public class MoveDataServiceImpl implements IMoveDataService {
|
|
|
|
|
//是正则迁移时:
|
|
|
|
|
if ("1".equals(dataMove.getCompleteStatus())) {
|
|
|
|
|
if(1 != removeservice.abortcopyFolder(dataMove.getDataPath(), makeDstPath(dataMove.getDstPath()))){
|
|
|
|
|
removeservice.deleteFolder(dataMove.getDstPath());
|
|
|
|
|
try{
|
|
|
|
|
removeservice.deleteFolder(dataMove.getDstPath());
|
|
|
|
|
}catch(Exception e){
|
|
|
|
|
log.error(e);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
result = dataInfoMoveTmpDao.remove(dataMove.getId());
|
|
|
|
@ -254,7 +258,8 @@ public class MoveDataServiceImpl implements IMoveDataService {
|
|
|
|
|
//去掉 最后 的 数字 +/ 符合
|
|
|
|
|
if (matcher2.find()) {
|
|
|
|
|
String removeStr = matcher2.group();
|
|
|
|
|
dstPath = dstPath.replace(removeStr, "");
|
|
|
|
|
removeStr.length();
|
|
|
|
|
dstPath = dstPath.substring(0, dstPath.length()-removeStr.length());
|
|
|
|
|
}
|
|
|
|
|
return dstPath;
|
|
|
|
|
}
|
|
|
|
|