From 16f093ea132a823e255f446c225ce6b63fdb9eeb Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期四, 24 十月 2024 10:15:46 +0800
Subject: [PATCH] appId映射修改
---
collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java
index 2e5d115..d4fde60 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java
@@ -92,7 +92,6 @@
String[] keys = map.keySet().toArray(new String[0]);
for (int j = 0; j < keys.length; j++) {
- //TODO: 杩欓噷锛屽師绯荤粺杩涜浜嗚繃婊ゃ�俉orkstationCollectDataServiceImpl.handlerWorkstationCollectData閲�
PackedTelemetryData pkData = new PackedTelemetryData();
pkData.setWorkstationId(tdata.getWorkstationId());
@@ -102,7 +101,6 @@
pkData.setName(keys[j]);//鏁版嵁鐐瑰悕绉�
fillByCalendar(pkData);
-
result.add(pkData);
}
@@ -138,7 +136,7 @@
// TelemetryPropertyWrapper涓璸ackWorkstationCalendarInfo
//------------start
- Boolean isDefaultCalendar = true;
+ boolean isDefaultCalendar = true;
if (!"#default#".equals(pdata.getCalendarCode())) {
CalendarShiftTimeSlicesDTO calendarShiftTimeSlicesDTO = timeSliceCache.getTimeSliceShift(pdata.getCalendarCode(), collectTime);//浠巖edis涓幏寰楁棩鍘嗙殑鏃堕棿鍒囩墖
if (ObjectUtil.isEmpty(calendarShiftTimeSlicesDTO)) {//濡傛灉娌℃湁鏃堕棿鍒囩墖锛屽垯浣跨敤TimeSliceCache.build(cacheBuildDTO);鏋勫缓
@@ -154,7 +152,7 @@
}
//鏃犳棩鍘嗗垏鐗囷紝浣跨敤閲囬泦鏃堕棿濉厖factoryYear锛宮onth锛宒ate锛寃eek鍑犱釜灞炴��
- if (isDefaultCalendar.booleanValue()) {
+ if (isDefaultCalendar) {
log.info("鏃犳棩鍘嗗垏鐗�");
LocalDate localDate = Instant.ofEpochMilli(pdata.getTime().longValue()).atZone(ZoneOffset.systemDefault()).toLocalDate();
pdata.setFactoryDate(Integer.valueOf(DatePattern.PURE_DATE_FORMAT.format(collectTime)))
--
Gitblit v1.9.3