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

代码调整

Browse Source
This commit is contained in:
hongawen
2024-12-05 11:42:56 +08:00
parent 8a5fec58d1
commit 99d8e89bec
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/enums/SupervisionResponseEnum.java
View File

@@ -17,6 +17,7 @@ public enum SupervisionResponseEnum {
*/ */
SUPERVISION_COMMON_ERROR("A00550","监督管理模块异常"), SUPERVISION_COMMON_ERROR("A00550","监督管理模块异常"),
IMPORT_SENSITIVE_USER_ERROR("A00550","导入敏感及重要用户失败"), IMPORT_SENSITIVE_USER_ERROR("A00550","导入敏感及重要用户失败"),
IMPORT_SENSITIVE_USER_DATA_ERROR("A00550","敏感及重要用户数据为空"),
IMPORT_SENSITIVE_REPORT_ERROR("A00550","导入干扰源用户失败"), IMPORT_SENSITIVE_REPORT_ERROR("A00550","导入干扰源用户失败"),
SUPERVISION_SERVICE_NOT_FOUND("A00550","业务实现类丢失，清查看类路径配置"), SUPERVISION_SERVICE_NOT_FOUND("A00550","业务实现类丢失，清查看类路径配置"),
DATA_NOT_EXISTS("A00550","数据不存在"), DATA_NOT_EXISTS("A00550","数据不存在"),

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/dto/SensitiveUserSExcel.java
View File

@@ -58,7 +58,7 @@ public class SensitiveUserSExcel implements Serializable {
@Excel(name = "工程预期投产日期(yyyy-MM-dd)", width = 30) @Excel(name = "工程预期投产日期(yyyy-MM-dd)", width = 30)
//@NotBlank(message = "工程预期投产日期不能为空") @NotBlank(message = "工程预期投产日期不能为空")
private String expectedProductionDate; private String expectedProductionDate;
@Excel(name = "电压等级", width = 30) @Excel(name = "电压等级", width = 30)

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

@@ -779,15 +779,19 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
params.setNeedVerify(true); params.setNeedVerify(true);
params.setStartSheetIndex(0); params.setStartSheetIndex(0);
params.setSheetNum(1); params.setSheetNum(1);
List<SensitiveUserSExcel> sensitiveUserExcels = new ArrayList<>(); List<SensitiveUserSExcel> sensitiveUserExcels;
try { try {
ExcelImportResult<SensitiveUserSExcel> sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcelMore(file.getInputStream(), SensitiveUserSExcel.class, params); List<SensitiveUserSExcel> sensitiveUserExcelExcelImportResult = ExcelImportUtil.importExcel(file.getInputStream(), SensitiveUserSExcel.class, params);
//如果存在非法数据，将不合格的数据导出 sensitiveUserExcels = sensitiveUserExcelExcelImportResult.stream().filter(x -> StringUtils.isNotBlank(x.getCity())).collect(Collectors.toList());
if (sensitiveUserExcelExcelImportResult.isVerifyFail()) { if(CollectionUtil.isEmpty(sensitiveUserExcels)){
PoiUtil.exportFileByWorkbook(sensitiveUserExcelExcelImportResult.getFailWorkbook(), "非法用户数据.xlsx", response); throw new BusinessException(SupervisionResponseEnum.IMPORT_DEV_DATA_ERROR);
} else {
sensitiveUserExcels = sensitiveUserExcelExcelImportResult.getList();
} }
//如果存在非法数据，将不合格的数据导出
// if (sensitiveUserExcelExcelImportResult.isVerifyFail()) {
// PoiUtil.exportFileByWorkbook(sensitiveUserExcelExcelImportResult.getFailWorkbook(), "非法用户数据.xlsx", response);
// } else {
// sensitiveUserExcels = sensitiveUserExcelExcelImportResult.getList();
// }
} catch (Exception e) { } catch (Exception e) {
throw new BusinessException(SupervisionResponseEnum.IMPORT_SENSITIVE_USER_ERROR); throw new BusinessException(SupervisionResponseEnum.IMPORT_SENSITIVE_USER_ERROR);
} }
@@ -807,7 +811,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
List<DictData> supplyCondition = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SUPPLY_CONDITION.getCode()).getData(); List<DictData> supplyCondition = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.SUPPLY_CONDITION.getCode()).getData();
//解决填报部门问题 //解决填报部门问题
List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getUserIndex(), WebUtil.filterDeptType()).getData(); List<DeptDTO> data = deptFeignClient.getDeptDescendantIndexes(RequestUtil.getDeptIndex(), WebUtil.filterDeptType()).getData();
//执行批量导入敏感及重要用户，入库过程中会进行数据校验 //执行批量导入敏感及重要用户，入库过程中会进行数据校验