diff --git a/algorithm/algorithm-boot/pom.xml b/algorithm/algorithm-boot/pom.xml index 657e8dc..e8bada2 100644 --- a/algorithm/algorithm-boot/pom.xml +++ b/algorithm/algorithm-boot/pom.xml @@ -104,6 +104,21 @@ pq-device-api ${project.version} + + com.njcn + common-event + ${project.version} + + + com.njcn + event-api + ${project.version} + + + com.njcn + supervision-api + ${project.version} + diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/SpecialAnalysisServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/SpecialAnalysisServiceImpl.java index 1c20fd0..d6c1f14 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/SpecialAnalysisServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/SpecialAnalysisServiceImpl.java @@ -242,11 +242,11 @@ public class SpecialAnalysisServiceImpl implements ISpecialAnalysisService { minTime.set(dto, "[]"); } else { List mins = min[i].stream().distinct().collect(Collectors.toList()); - minTime.set(dto, JSON.toJSONString(mins)); List limitTime = dataLimitRateDetailFeignClient.getLimitRateDetailTime(lineId, calculatedParam.getDataDate()).getData(); if (CollUtil.isNotEmpty(limitTime)) { - List collect = mins.stream().filter(x -> limitTime.contains(x)).collect(Collectors.toList()); + List collect = mins.stream().filter(x -> limitTime.contains(x)).sorted().collect(Collectors.toList()); if (CollUtil.isNotEmpty(collect)) { + minTime.set(dto, JSON.toJSONString(collect)); isOrNot.set(dto, 1); } } diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java index aab8e3d..5fe9127 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmRateVImpl.java @@ -9,7 +9,6 @@ import com.njcn.dataProcess.dao.relation.mapper.RStatDataHarmRateVRelationMapper import com.njcn.dataProcess.dto.DataHarmrateVDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataHarmrateV; -import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataHarmRateVDto; @@ -215,7 +214,7 @@ public class InfluxdbDataHarmRateVImpl extends MppServiceImpl list = dataHarmRateVMapper.selectByQueryWrapper(influxQueryWrapper); Map> lineMap = list.stream().collect(Collectors.groupingBy(DataHarmrateV::getLineId)); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java index 94a1770..763a04f 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java @@ -9,7 +9,6 @@ import com.njcn.dataProcess.dao.relation.mapper.RStatDataIRelationMapper; import com.njcn.dataProcess.dto.DataIDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataI; -import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataIDto; import com.njcn.dataProcess.pojo.po.RStatDataID; @@ -214,7 +213,7 @@ public class InfluxdbDataIImpl extends MppServiceImpl list = dataIMapper.selectByQueryWrapper(influxQueryWrapper); Map> lineMap = list.stream().collect(Collectors.groupingBy(DataI::getLineId)); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java index b33ea97..c9192fe 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataInharmVImpl.java @@ -10,7 +10,6 @@ import com.njcn.dataProcess.dto.DataInharmVDTO; import com.njcn.dataProcess.param.LineCountEvaluateParam; import com.njcn.dataProcess.po.influx.DataI; import com.njcn.dataProcess.po.influx.DataInharmV; -import com.njcn.dataProcess.po.influx.DataV; import com.njcn.dataProcess.pojo.dto.CommonMinuteDto; import com.njcn.dataProcess.pojo.dto.DataHarmDto; import com.njcn.dataProcess.pojo.dto.DataInHarmVDto; @@ -198,10 +197,10 @@ public class InfluxdbDataInharmVImpl extends MppServiceImpl list = dataInharmVMapper.selectByQueryWrapper(influxQueryWrapper); Map> lineMap = list.stream().collect(Collectors.groupingBy(DataInharmV::getLineId)); diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java index 1e2f3a5..180d47c 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataVImpl.java @@ -120,23 +120,6 @@ public class InfluxdbDataVImpl extends MppServiceImpl getRawData(LineCountEvaluateParam lineParam) { - - Runtime runtime = Runtime.getRuntime(); - // 获取 JVM 最大可用内存（以字节为单位） - long maxMemory = runtime.maxMemory(); - // 获取 JVM 当前已分配的内存（以字节为单位） - long totalMemory = runtime.totalMemory(); - // 获取 JVM 当前空闲内存（以字节为单位） - long freeMemory = runtime.freeMemory(); - // 计算已使用的内存 - long usedMemory = totalMemory - freeMemory; - - System.out.println("最大可用内存: " + maxMemory / (1024 * 1024) + " MB"); - System.out.println("当前已分配的内存: " + totalMemory / (1024 * 1024) + " MB"); - System.out.println("当前空闲内存: " + freeMemory / (1024 * 1024) + " MB"); - System.out.println("已使用的内存: " + usedMemory / (1024 * 1024) + " MB"); - System.out.println("dataprocess第一次分析结束-----------------------------------------"); - List result = new ArrayList<>(); List list = getMinuteDataV(lineParam); list.forEach(item -> { @@ -437,21 +420,6 @@ public class InfluxdbDataVImpl extends MppServiceImpl result, InfluxQueryWrapper influxQueryWrapper, LineCountEvaluateParam lineParam) { List list = dataVMapper.selectByQueryWrapper(influxQueryWrapper); - Runtime runtime = Runtime.getRuntime(); - // 获取 JVM 最大可用内存（以字节为单位） - long maxMemory = runtime.maxMemory(); - // 获取 JVM 当前已分配的内存（以字节为单位） - long totalMemory = runtime.totalMemory(); - // 获取 JVM 当前空闲内存（以字节为单位） - long freeMemory = runtime.freeMemory(); - // 计算已使用的内存 - long usedMemory = totalMemory - freeMemory; - - System.out.println("最大可用内存: " + maxMemory / (1024 * 1024) + " MB"); - System.out.println("当前已分配的内存: " + totalMemory / (1024 * 1024) + " MB"); - System.out.println("当前空闲内存: " + freeMemory / (1024 * 1024) + " MB"); - System.out.println("已使用的内存: " + usedMemory / (1024 * 1024) + " MB"); - System.out.println("dataprocess第二次分析结束-----------------------------------------"); if (CollUtil.isNotEmpty(list)) { Map> lineMap = list.stream().collect(Collectors.groupingBy(DataV::getLineId));