diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java index 9bb7eea22..884110d7e 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventRelevantAnalysisServiceImpl.java @@ -51,6 +51,7 @@ import net.sf.json.JSONObject; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.sql.Timestamp; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -471,7 +472,7 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl advanceEventDetailVOList = BeanUtil.copyToList(rmpEventDetailPOList, AdvanceEventDetailVO.class); advanceEventDetailVOList = advanceEventDetailVOList.stream().peek(item -> { - item.setFeatureAmplitude(item.getFeatureAmplitude()*100); + item.setFeatureAmplitude(roundHalfUp(item.getFeatureAmplitude()*100)); if (map.containsKey(item.getLineId())) { AreaLineInfoVO areaLineInfoVO = map.get(item.getLineId()); @@ -491,7 +492,17 @@ public class EventRelevantAnalysisServiceImpl extends ServiceImpl queryEventsAssPage(BaseParam baseParam) { List timeV = PubUtils.checkLocalDate(baseParam.getSearchBeginTime(), baseParam.getSearchEndTime()); diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/TransientParam.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/TransientParam.java index 15f910aef..1266f87b9 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/TransientParam.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/TransientParam.java @@ -36,10 +36,10 @@ public class TransientParam extends DeviceInfoParam.BusinessParam { private BigDecimal eventValueMin; @ApiModelProperty("持续时间最大值") - private Integer persistMax; + private Double persistMax; @ApiModelProperty("持续时间最小值") - private Integer persistMin; + private Double persistMin; @ApiModelProperty("严重度最大值") private BigDecimal severityMax; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java index dbd3950ff..68bccb8d8 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/TransientServiceImpl.java @@ -526,6 +526,7 @@ public class TransientServiceImpl implements TransientService { log.info("cfg-----"+cfgPath); log.info("cfg-----"+datPath); + //判断文件是否存在 File file = new File(cfgPath); if(!file.exists()){ @@ -540,6 +541,8 @@ public class TransientServiceImpl implements TransientService { log.info("cfg-----"+cfgPath); log.info("cfg-----"+datPath); cfgStream = waveFileComponent.getFileInputStreamByFilePath(cfgPath); + datStream = waveFileComponent.getFileInputStreamByFilePath(datPath); + } else { cfgPath = OssPath.WAVE_DIR + ip + StrUtil.SLASH + waveName + GeneralConstant.CFG; boolean result1 = minIoUtils.checkFileIsExist(minIossProperties.getBucket(), cfgPath); diff --git a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java index 1f60a23da..f48b8f7cc 100644 --- a/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java +++ b/pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/leaflet/WarningLeafletVO.java @@ -121,6 +121,9 @@ public class WarningLeafletVO extends BaseEntity implements Serializable{ @ApiModelProperty("预告警单下载路径") private String filePath; + @ApiModelProperty("实际路径") + private String absFilePath; + @ApiModelProperty("技术监督报告") private String supervisionReport; diff --git a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java index b36324432..47118288c 100644 --- a/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java +++ b/pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/leaflet/impl/WarningLeafletServiceImpl.java @@ -163,7 +163,9 @@ public class WarningLeafletServiceImpl extends ServiceImpl 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