Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
wr
2026-01-04 14:54:04 +08:00
parent fe029fcb95 9143466ce7
commit 184b2b8fad
6 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java
View File

@@ -121,6 +121,9 @@ public class WarningLeafletVO extends BaseEntity implements Serializable{
@ApiModelProperty("预告警单下载路径")
private String filePath;
@ApiModelProperty("实际路径")
private String absFilePath;
@ApiModelProperty("技术监督报告")
private String supervisionReport;

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java
View File

@@ -163,7 +163,9 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
x.setDutyOrgName(deptMap.get(x.getDutyOrgId()));
}
if (!Objects.isNull(x.getFilePath())) {
x.setAbsFilePath(x.getFilePath());
x.setFilePath(fileStorageUtil.getFileUrl(x.getFilePath()));
}
});
}
@@ -393,6 +395,8 @@ public class WarningLeafletServiceImpl extends ServiceImpl<WarningLeafletMapper,
record.setDutyOrgName(deptMap.get(record.getDutyOrgId()));
}
if (!Objects.isNull(record.getFilePath())) {
record.setAbsFilePath(record.getFilePath());
record.setFilePath(fileStorageUtil.getFileUrl(record.getFilePath()));
}
}

12
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
View File

@@ -1032,11 +1032,11 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
ExcelImportResult<SensitiveReportExcel> sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SensitiveReportExcel.class, params);
log.info("Excel 解析完成，原始数据行数：{}", sensitiveUserExcelExcelImportResult.getList().size());
//如果存在非法数据，将不合格的数据导出
if (sensitiveUserExcelExcelImportResult.isVerifyFail()) {
log.warn("存在校验失败的数据");
PoiUtil.exportFileByWorkbook(sensitiveUserExcelExcelImportResult.getFailWorkbook(), "非法用户数据.xlsx", response);
return; // 校验失败直接返回
} else {
// if (sensitiveUserExcelExcelImportResult.isVerifyFail()) {
// log.warn("存在校验失败的数据");
// PoiUtil.exportFileByWorkbook(sensitiveUserExcelExcelImportResult.getFailWorkbook(), "非法用户数据.xlsx", response);
// return; // 校验失败直接返回
// } else {
// 过滤掉空行数据（projectName 为空的行）
sensitiveUserExcels = sensitiveUserExcelExcelImportResult.getList().stream()
.filter(x -> StringUtils.isNotBlank(x.getProjectName()))
@@ -1046,7 +1046,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
if (CollectionUtil.isEmpty(sensitiveUserExcels)) {
throw new BusinessException(SupervisionResponseEnum.IMPORT_DEV_DATA_ERROR);
}
}
// }
} catch (Exception e) {
log.error("导入失败，文件：{}", file.getOriginalFilename(), e);
throw new BusinessException(SupervisionResponseEnum.IMPORT_SENSITIVE_REPORT_ERROR);