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 | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 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 99392cd..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
@@ -73,7 +73,7 @@
}
/**
- * 鏁版嵁濉厖锛�(calendarCode,factoryYear,month,date,week锛�
+ * 鏁版嵁濉厖锛屾棩鍘嗕唬鐮佷箣绫荤殑缁熻鐩稿叧瀛楁鍒濆鍖�(calendarCode,factoryYear,month,date,week锛�
*
* @param telemetryDataList
* @return
@@ -90,16 +90,15 @@
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());
pkData.setValue(map.get(keys[j]));
pkData.setTime(item.getTime());
- pkData.setName(keys[j]);//鍙傛暟鍚嶇О
+ pkData.setName(keys[j]);//鏁版嵁鐐瑰悕绉�
fillByCalendar(pkData);
-
result.add(pkData);
}
@@ -116,7 +115,7 @@
*
* @param pdata
*/
- void fillByCalendar(PackedTelemetryData pdata) {
+ public void fillByCalendar(PackedTelemetryData pdata) {
//鍘熸潵鍦═elemetryPropertyWrapper.packWorkstationCalendarInfo涓畬鎴�
//FIXME: 濉啓瀹為檯鐨勬暟鎹繕闇�瑕佸悗缁鐞�
@@ -127,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())) {
+ boolean isDefaultCalendar = true;
+ 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();
@@ -151,7 +147,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