From 11d4be720620abf502d35000e2ed40d30c4023bf Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 24 十一月 2025 16:33:34 +0800
Subject: [PATCH] 修复离线时间展示
---
collect/src/main/java/com/qianwen/mdc/collect/service/PackedDataService.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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 012bd36..d6c4986 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
@@ -47,8 +47,6 @@
private WorkstationCache workstationCache;
@Autowired
private TimeSliceCache timeSliceCache;
- @Autowired
- private WorkstationDatapointsService dpService;
static {
PROCESS_PARAM_MAP.put(1, "STATE");
@@ -128,16 +126,13 @@
//telemetryData.setCalendarCode(calendarCode);
} else {
//telemetryData.setCalendarCode("#default#");
- pdata.setCalendarCode("#default#");
+ pdata.setCalendarCode(CommonConstant.DEFAULT_CODE);
}
-
- //pdata.setShiftIndex(1);//涓存椂
- //pdata.setShiftTimeType(1);//涓存椂
// TelemetryPropertyWrapper涓璸ackWorkstationCalendarInfo
//------------start
boolean isDefaultCalendar = true;
- if (!"#default#".equals(pdata.getCalendarCode())) {
+ if (!CommonConstant.DEFAULT_CODE.equals(pdata.getCalendarCode())) {
CalendarShiftTimeSlicesDTO calendarShiftTimeSlicesDTO = timeSliceCache.getTimeSliceShift(pdata.getCalendarCode(), collectTime);//浠巖edis涓幏寰楁棩鍘嗙殑鏃堕棿鍒囩墖
if (ObjectUtil.isEmpty(calendarShiftTimeSlicesDTO)) {//濡傛灉娌℃湁鏃堕棿鍒囩墖锛屽垯浣跨敤TimeSliceCache.build(cacheBuildDTO);鏋勫缓
LocalDate targetDate = Instant.ofEpochMilli(pdata.getTime()).atZone(ZoneOffset.systemDefault()).toLocalDate();
--
Gitblit v1.9.3