From 9faa74e1912022dc6e54c3e93426946876b5d83a Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 25 十月 2024 10:49:13 +0800
Subject: [PATCH] 修改redistemplate的hashkey serializer，更方便客户端查看redis的数据
---
collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateFixPointService.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateFixPointService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateFixPointService.java
index 396eb93..9301b0c 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateFixPointService.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateFixPointService.java
@@ -53,12 +53,12 @@
/**
* 鍔犲叆鍥哄畾鐐�,鍘焪orkStationStateFixPoint
* @param dateTime 鎵撳浐瀹氱偣鐨勬棩鏈�
- * @param includeWorkstationIds
+ * @param includeWorkstationIds 鎸囧畾鎵撳浐瀹氱偣鐨勫伐浣峣d锛屽叏閮芥墦鐐逛紶null
*/
public void deviceStateFixPoint(DateTime dateTime, List<String> includeWorkstationIds) {
List<DeviceState> result;
- Map<Long, WorkstationDTO> workStations = workstationCache.getWorkStations();
+ Map<Long, WorkstationDTO> workStations = workstationCache.getWorkstations();
if (ObjectUtil.isEmpty(workStations)) {
return;
}
@@ -202,22 +202,20 @@
tablet.addValue("rps", i, state.getRps());
tablet.addValue("is_fix_point", i, state.getIsFixPoint());
tablet.addValue("is_sync", i, state.getIsSync());
- tablet.addValue("is_plan", i, state.getIsPlan());
+ tablet.addValue("is_plan", i, state.getIsPlan()==null ? -1 : state.getIsPlan());
tablet.addValue("feedback_point_type", i, state.getFeedbackPointType());
- tablet.addValue("feedback_id", i, state.getFeedbackId());
+ tablet.addValue("feedback_id", i, state.getFeedbackId() == null?0:state.getFeedbackId());
tablet.addValue("is_deleted", i, state.getIsDeleted());
- tablet.addValue("employee_id", i, state.getEmployeeId());
+ tablet.addValue("employee_id", i, state.getEmployeeId() == null?0:state.getEmployeeId());
}
try {
this.iotdbConfig.getSessionPool().insertAlignedTablet(tablet);
} catch (Exception e) {
- log.error("淇濆瓨鍥哄畾鐐规暟鎹紓甯�",e);
+ log.error("淇濆瓨state鍥哄畾鐐规暟鎹紓甯�",e);
}
}
-
-
}
private List<DeviceState> getDefaultShift24HourPointDTOS(Long workStationId, String calendarCode, CalendarShiftInfoDTO shift) {
--
Gitblit v1.9.3