Middleware/cn-data-platform
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

微调

Browse Source
This commit is contained in:
wr
2025-06-18 15:15:26 +08:00
parent 67bfba23eb
commit ae083f9c3f
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
migration-influxdb/migration-influxdb-insert-boot/src/main/resources/bootstrap.yml
View File

@@ -46,7 +46,7 @@ spring:
logging: logging:
config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
level: level:
root: debug root: error
mqtt: mqtt:

6
migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/service/impl/MigrationServiceImpl.java
View File

@@ -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; String format = null;
List<DataV> dataVS = dataV.listDataV(evaluateParam); List<DataV> dataVS = dataV.listDataV(evaluateParam);
if (CollUtil.isNotEmpty(dataVS)) { if (CollUtil.isNotEmpty(dataVS)) {
@@ -93,7 +95,6 @@ public class MigrationServiceImpl implements MigrationService {
migrationInsertFeignClient.insertDataInharmV(dataInharmV.listDataInharmV(evaluateParam)); migrationInsertFeignClient.insertDataInharmV(dataInharmV.listDataInharmV(evaluateParam));
migrationInsertFeignClient.insertDataPlt(dataPlt.listDataPlt(evaluateParam)); migrationInsertFeignClient.insertDataPlt(dataPlt.listDataPlt(evaluateParam));
migrationInsertFeignClient.batchInsertion(eventDetail.getRawData(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)) { if (!param.getIsManual() && StrUtil.isNotBlank(format)) {
TimeUtil.putLineTime(lineId, format); TimeUtil.putLineTime(lineId, format);
@@ -114,6 +115,8 @@ public class MigrationServiceImpl implements MigrationService {
evaluateParam.setStartTime(param.getStartTime()); evaluateParam.setStartTime(param.getStartTime());
evaluateParam.setEndTime(param.getEndTime()); evaluateParam.setEndTime(param.getEndTime());
System.out.println("当前总终端数量" + size + "当前第" + num[0] + "：-》" + lineId + " 文件时间 " + time + " | " + evaluateParam.getStartTime() + " " + evaluateParam.getEndTime() + "剩余" + (size - num[0]));
String format = null; String format = null;
if (!param.getIsManual()) { if (!param.getIsManual()) {
if (StrUtil.isNotBlank(time)) { if (StrUtil.isNotBlank(time)) {
@@ -127,7 +130,6 @@ public class MigrationServiceImpl implements MigrationService {
} }
migrationInsertFeignClient.insertPqsCommunicate(pqsCommunicates); 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)) { if (!param.getIsManual() && StrUtil.isNotBlank(format)) {
TimeUtil.putDevTime(lineId, format); TimeUtil.putDevTime(lineId, format);
} }

2
migration-influxdb/migration-influxdb-read-boot/src/main/java/com/njcn/migration/read/util/TimeUtil.java
View File

@@ -132,7 +132,5 @@ public class TimeUtil {
excelWriter.finish(); excelWriter.finish();
TimeUtil.putAllLineTime(excelDataV.stream().collect(Collectors.toMap(LineTimeDto::getLineId, LineTimeDto::getTimeData))); TimeUtil.putAllLineTime(excelDataV.stream().collect(Collectors.toMap(LineTimeDto::getLineId, LineTimeDto::getTimeData)));
TimeUtil.putAllDevTime(excelCommunicates.stream().collect(Collectors.toMap(DevTimeDto::getDevId, DevTimeDto::getTimeData))); TimeUtil.putAllDevTime(excelCommunicates.stream().collect(Collectors.toMap(DevTimeDto::getDevId, DevTimeDto::getTimeData)));
System.out.println(" line "+TimeUtil.getLineMap());
System.out.println(" dev "+TimeUtil.getDevMap());
} }
} }

2
migration-influxdb/migration-influxdb-read-boot/src/main/resources/bootstrap.yml
View File

@@ -46,7 +46,7 @@ spring:
logging: logging:
config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml config: http://@nacos.url@/nacos/v1/cs/configs?tenant=@nacos.namespace@&group=DEFAULT_GROUP&dataId=logback.xml
level: level:
root: debug root: error
mqtt: mqtt: