|
@@ -138,7 +138,7 @@ public class CaseDownService {
|
|
@Async
|
|
@Async
|
|
public void downOffline(Integer caseId,String zipPath){
|
|
public void downOffline(Integer caseId,String zipPath){
|
|
String timeKey = DateUtils.dateStr();
|
|
String timeKey = DateUtils.dateStr();
|
|
- String caseOffPath = FilePath.OFFLINE_PACKAGE_PATH+timeKey + caseId;
|
|
|
|
|
|
+ String caseOffPath = zipPath+File.separator+"offline_"+caseId+"_"+timeKey ;
|
|
try {
|
|
try {
|
|
String redisKey = String.format(downProcessKey, caseId);
|
|
String redisKey = String.format(downProcessKey, caseId);
|
|
if( redisUtil.hasKey(redisKey)){
|
|
if( redisUtil.hasKey(redisKey)){
|
|
@@ -157,8 +157,7 @@ public class CaseDownService {
|
|
createDataJson(caseId,caseOffPath);
|
|
createDataJson(caseId,caseOffPath);
|
|
setRedisProcess(caseId,50);
|
|
setRedisProcess(caseId,50);
|
|
//打包zip
|
|
//打包zip
|
|
- FileUtil.copyContent(new File(caseOffPath),new File(zipPath),true);
|
|
|
|
- caseOfflineService.saveByCase(caseId,zipPath);
|
|
|
|
|
|
+ caseOfflineService.saveByCase(caseId,caseOffPath);
|
|
setRedisProcess(caseId,100,zipPath);
|
|
setRedisProcess(caseId,100,zipPath);
|
|
|
|
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
@@ -166,8 +165,6 @@ public class CaseDownService {
|
|
setRedisProcess(caseId,0,null,1003);
|
|
setRedisProcess(caseId,0,null,1003);
|
|
}finally {
|
|
}finally {
|
|
try {
|
|
try {
|
|
- Thread.sleep(2000L);
|
|
|
|
- FileUtil.del(caseOffPath);
|
|
|
|
setRedisProcess(caseId,0,null,1003);
|
|
setRedisProcess(caseId,0,null,1003);
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
log.info("down-offline-del-error:{}",caseId,e);
|
|
log.info("down-offline-del-error:{}",caseId,e);
|