diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java index f950e1a..6412617 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java @@ -487,6 +487,7 @@ public class DataCleanServiceImpl implements IDataCleanService { } } if (CollUtil.isNotEmpty(resultData)) { + bak.setState(1); //存储文件 InputStream reportStream = IoUtil.toStream(new Gson().toJson(resultData), CharsetUtil.UTF_8); String fileName = fileStorageUtil.uploadStreamSpecifyName( @@ -695,7 +696,12 @@ public class DataCleanServiceImpl implements IDataCleanService { dataCleanJsonDTO.setPhasic(k); dataCleanJsonDTO.setValueType(k2); dataCleanJsonDTO.setTime(v2.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toList())); - dataCleanJsonDTO.setValue(v2.stream().map(PqDataVerify::getAbnormalValue).collect(Collectors.toList())); + dataCleanJsonDTO.setValue(v2.stream() + .map(pq -> { + Double value = pq.getAbnormalValue(); + return value != null ? Math.round(value * 100) / 100.0 : null; + }) + .collect(Collectors.toList())); list1.add(dataCleanJsonDTO); }); dto.setList(list1); @@ -721,7 +727,12 @@ public class DataCleanServiceImpl implements IDataCleanService { dto1.setPhasic(k2); dto1.setValueType(k3); dto1.setTime(v3.stream().map(dt -> dt.getTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_TIME_PATTERN))).collect(Collectors.toList())); - dto1.setValue(v3.stream().map(PqDataVerify::getAbnormalValue).collect(Collectors.toList())); + dto1.setValue(v3.stream() + .map(pq -> { + Double value = pq.getAbnormalValue(); + return value != null ? Math.round(value * 100) / 100.0 : null; + }) + .collect(Collectors.toList())); dataCleanJsonDTOList.add(dto1); }); dto.setList(dataCleanJsonDTOList); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/PqDataVerifyBak.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/PqDataVerifyBak.java index b18a43a..a07d31c 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/PqDataVerifyBak.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/PqDataVerifyBak.java @@ -40,6 +40,13 @@ public class PqDataVerifyBak implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8") private LocalDate time; + /** + * 监测点状态 + * 判断所有指标 0:无异常 1:异常 + */ + @TableField(value = "state") + private Integer state = 0; + /** * 频率指标 */