diff --git a/migration-influxdb/migration-influxdb-insert-boot/src/main/resources/bootstrap.yml b/migration-influxdb/migration-influxdb-insert-boot/src/main/resources/bootstrap.yml index 31db9bf..bc41aeb 100644 --- a/migration-influxdb/migration-influxdb-insert-boot/src/main/resources/bootstrap.yml +++ b/migration-influxdb/migration-influxdb-insert-boot/src/main/resources/bootstrap.yml @@ -46,7 +46,7 @@ spring: logging: config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: - root: debug + root: error mqtt: diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java index 517e117..38c1e7f 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java @@ -71,6 +71,8 @@ public class MigrationServiceImpl implements MigrationService { } } + System.out.println("当前总监测点数量" + size + "当前第" + num[0] + ":-》" + lineId + " 文件时间 " + time + " | " + evaluateParam.getStartTime() + " " + evaluateParam.getEndTime() + "剩余" + (size - num[0])); + String format = null; List dataVS = dataV.listDataV(evaluateParam); if (CollUtil.isNotEmpty(dataVS)) { @@ -93,7 +95,6 @@ public class MigrationServiceImpl implements MigrationService { migrationInsertFeignClient.insertDataInharmV(dataInharmV.listDataInharmV(evaluateParam)); migrationInsertFeignClient.insertDataPlt(dataPlt.listDataPlt(evaluateParam)); migrationInsertFeignClient.batchInsertion(eventDetail.getRawData(evaluateParam)); - System.out.println("定时任务_当前总监测点数量" + size + "当前第" + num[0] + ":-》" + lineId + " 文件时间 " + time + " |最新数据时间" + format + "| " + evaluateParam.getStartTime() + " " + evaluateParam.getEndTime() + "剩余" + (size - num[0])); if (!param.getIsManual() && StrUtil.isNotBlank(format)) { TimeUtil.putLineTime(lineId, format); @@ -114,6 +115,8 @@ public class MigrationServiceImpl implements MigrationService { evaluateParam.setStartTime(param.getStartTime()); evaluateParam.setEndTime(param.getEndTime()); + System.out.println("当前总终端数量" + size + "当前第" + num[0] + ":-》" + lineId + " 文件时间 " + time + " | " + evaluateParam.getStartTime() + " " + evaluateParam.getEndTime() + "剩余" + (size - num[0])); + String format = null; if (!param.getIsManual()) { if (StrUtil.isNotBlank(time)) { @@ -127,7 +130,6 @@ public class MigrationServiceImpl implements MigrationService { } migrationInsertFeignClient.insertPqsCommunicate(pqsCommunicates); } - System.out.println("当前总终端数量" + size + "当前第" + num[0] + ":-》" + lineId + " 文件时间 " + time + " |最新数据时间" + format + "| " + evaluateParam.getStartTime() + " " + evaluateParam.getEndTime() + "剩余" + (size - num[0])); if (!param.getIsManual() && StrUtil.isNotBlank(format)) { TimeUtil.putDevTime(lineId, format); } diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java index 9b6d929..f9d89aa 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java @@ -132,7 +132,5 @@ public class TimeUtil { excelWriter.finish(); TimeUtil.putAllLineTime(excelDataV.stream().collect(Collectors.toMap(LineTimeDto::getLineId, LineTimeDto::getTimeData))); TimeUtil.putAllDevTime(excelCommunicates.stream().collect(Collectors.toMap(DevTimeDto::getDevId, DevTimeDto::getTimeData))); - System.out.println(" line "+TimeUtil.getLineMap()); - System.out.println(" dev "+TimeUtil.getDevMap()); } } diff --git a/migration-influxdb/migration-influxdb-read-boot/src/main/resources/bootstrap.yml b/migration-influxdb/migration-influxdb-read-boot/src/main/resources/bootstrap.yml index 65d3396..2aa0d11 100644 --- a/migration-influxdb/migration-influxdb-read-boot/src/main/resources/bootstrap.yml +++ b/migration-influxdb/migration-influxdb-read-boot/src/main/resources/bootstrap.yml @@ -46,7 +46,7 @@ spring: logging: config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml level: - root: debug + root: error mqtt: