From 608f20e0d5d8f95d9bbb917e95e2913682deb77d Mon Sep 17 00:00:00 2001
From: PC <PC@PC1RHZ4L>
Date: 星期日, 31 三月 2024 10:00:00 +0800
Subject: [PATCH] Merge branch 'master' of http://wangzq@www.beijingsoft.cn:9090/r/smart.git
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
index 7b1064e..b7f5149 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/SuperNewCollectServiceImpl.java
@@ -42,13 +42,13 @@
@Override // org.springblade.modules.mdc.service.ISuperNewCollectService
public void insertData(Set<String> workstationIds) {
- List<NewParamSaveDTO> data = (List) workstationIds.stream().map(workstationId -> {
+ List<NewParamSaveDTO> data = workstationIds.stream().map(workstationId -> {
Map<String, Object> realTimeData = WorkstationCache.getWorkstationAllCollect(workstationId);
if (Func.isNotEmpty(realTimeData)) {
int size = realTimeData.size();
long time = DateUtil.now().getTime();
Map<String, String> valuesMap = new HashMap<>(size);
- realTimeData.forEach(n, telemetry -> {
+ realTimeData.forEach((n, telemetry) -> {
if (!n.toUpperCase().contains(CollectConstant.ALARM)) {
TelemetryDataResponseDTO dto = (TelemetryDataResponseDTO) telemetry;
String v = dto.getV();
@@ -66,8 +66,11 @@
return Func.notNull(v0);
}).collect(Collectors.toList());
List<List<NewParamSaveDTO>> groupList = CommonUtil.groupList(data, 10);
+
+ groupList.forEach(this.collectJsonMapper::insertValueJson);
+ /*
SuperCollectJsonMapper superCollectJsonMapper = this.collectJsonMapper;
superCollectJsonMapper.getClass();
- groupList.forEach(this::insertValueJson);
+ groupList.forEach(this::insertValueJson);*/
}
}
--
Gitblit v1.9.3