|
@@ -157,7 +157,7 @@ public class AnnualInspectionController {
|
|
|
return RestResponse.fail(ValuePool.INSPECTION_EXIST_SAME + message);
|
|
|
}
|
|
|
|
|
|
- AnnualInspection previousConfirm = annualInspectionService.findPreviousConfirm(entity.getLiftId(), entity.getMtCompanyId());
|
|
|
+ AnnualInspection previousConfirm = annualInspectionService.previousConfirm(entity.getLiftId(), entity.getMtCompanyId());
|
|
|
if(Objects.nonNull(previousConfirm) && Objects.nonNull(previousConfirm.getPlanDate())){
|
|
|
LocalDate deadline = previousConfirm.getPlanDate().plusDays(DateUtils.daysOfYear());
|
|
|
Validate.notTrue(deadline.isBefore(entity.getPlanDate()), ValuePool.inspectionSetPlanDateIllegal(previousConfirm.getPlanDate(), deadline));
|
|
@@ -467,13 +467,15 @@ public class AnnualInspectionController {
|
|
|
Validate.notNull(inspections, ValuePool.INSPECTION_NOT_EXIST);
|
|
|
|
|
|
//压缩文件夹
|
|
|
- File zipFile;
|
|
|
+ File zipFile = null;
|
|
|
+ File baseDir = null;
|
|
|
try {
|
|
|
//获取根目录
|
|
|
String generateCode = DateUtils.generateCode();
|
|
|
String dir = StrUtil.join(File.separator, ValuePool.SYSTEM_USER_DIR, "inspection", generateCode);
|
|
|
String zip = dir + ".zip";
|
|
|
zipFile = new File(zip);
|
|
|
+ baseDir = new File(dir);
|
|
|
log.info("dir: {}", dir);
|
|
|
log.info("zip: {}", zip);
|
|
|
|
|
@@ -515,10 +517,10 @@ public class AnnualInspectionController {
|
|
|
log.info("生成zipfile: {}", zip);
|
|
|
ZipUtil.zip(dir, zip);
|
|
|
} catch (Exception e) {
|
|
|
-// FileUtil.del(zipFile);
|
|
|
-// FileUtil.del(baseDir);
|
|
|
- log.error("生成文件失败", e);
|
|
|
- throw Validate.validateException("生成文件失败");
|
|
|
+ FileUtil.del(zipFile);
|
|
|
+ FileUtil.del(baseDir);
|
|
|
+ log.error("生成年检文件失败", e);
|
|
|
+ throw Validate.validateException("生成年检文件失败");
|
|
|
}
|
|
|
//下载压缩文件
|
|
|
if (FileUtil.exist(zipFile)) {
|
|
@@ -535,12 +537,12 @@ public class AnnualInspectionController {
|
|
|
os.write(buffer, 0, i);
|
|
|
}
|
|
|
} catch (Exception e) {
|
|
|
- log.error("下载文件失败", e);
|
|
|
- throw Validate.validateException("下载文件失败");
|
|
|
+ log.error("下载年检文件失败", e);
|
|
|
+ throw Validate.validateException("下载年检文件失败");
|
|
|
}finally {
|
|
|
//删除临时根目录和zip文件
|
|
|
-// FileUtil.del(zipFile);
|
|
|
-// FileUtil.del(baseDir);
|
|
|
+ FileUtil.del(zipFile);
|
|
|
+ FileUtil.del(baseDir);
|
|
|
}
|
|
|
}
|
|
|
}
|