fix:修改gc问题

liutao_branch
HuangHuiKang 2 months ago
parent 44b13a750d
commit 0eb8ae4ac1

@ -1685,18 +1685,17 @@ public class TDengineService {
return Collections.emptyList(); return Collections.emptyList();
} }
List<Object> params = new ArrayList<>(); // 优化:分组查询每个设备的最新记录
List<DeviceOperationRecordDO> allResults = new ArrayList<>();
for (Long deviceId : deviceIds) {
StringBuilder sql = new StringBuilder( StringBuilder sql = new StringBuilder(
"SELECT * FROM besure_server.iot_device_operation_record " + "SELECT * FROM besure_server.iot_device_operation_record " +
"WHERE deleted = 0 AND device_id IN (" "WHERE deleted = 0 AND device_id = ? "
); );
for (int i = 0; i < deviceIds.size(); i++) { List<Object> params = new ArrayList<>();
if (i > 0) sql.append(", "); params.add(deviceId);
sql.append("?");
params.add(deviceIds.get(i));
}
sql.append(") ");
if (CollectionUtils.isNotEmpty(ruleCodes)) { if (CollectionUtils.isNotEmpty(ruleCodes)) {
sql.append("AND rule IN ("); sql.append("AND rule IN (");
@ -1708,13 +1707,14 @@ public class TDengineService {
sql.append(") "); sql.append(") ");
} }
sql.append("ORDER BY create_time DESC"); sql.append("ORDER BY create_time DESC LIMIT 1"); // 每个设备只取最新1条
try { try {
return jdbcTemplate.query(sql.toString(), params.toArray(), (rs, rowNum) -> { List<DeviceOperationRecordDO> deviceResults = jdbcTemplate.query(
sql.toString(),
params.toArray(),
(rs, rowNum) -> {
DeviceOperationRecordDO d = new DeviceOperationRecordDO(); DeviceOperationRecordDO d = new DeviceOperationRecordDO();
// d.setTs(rs.getTimestamp("ts") != null ? rs.getTimestamp("ts").toLocalDateTime() : null);
// d.setId(rs.getLong("id"));
d.setDeviceId(rs.getLong("device_id")); d.setDeviceId(rs.getLong("device_id"));
d.setModelId(rs.getLong("model_id")); d.setModelId(rs.getLong("model_id"));
d.setRule(rs.getString("rule")); d.setRule(rs.getString("rule"));
@ -1729,10 +1729,15 @@ public class TDengineService {
return d; return d;
}); });
allResults.addAll(deviceResults);
} catch (Exception e) { } catch (Exception e) {
log.error("查询失败", e); log.error("查询设备{}的最新记录失败", deviceId, e);
return Collections.emptyList();
} }
}
return allResults;
} }
/** /**

Loading…
Cancel
Save