fix:修改gc问题

liutao_branch
HuangHuiKang 4 days ago
parent 44b13a750d
commit 0eb8ae4ac1

@ -1685,54 +1685,59 @@ public class TDengineService {
return Collections.emptyList();
}
List<Object> params = new ArrayList<>();
StringBuilder sql = new StringBuilder(
"SELECT * FROM besure_server.iot_device_operation_record " +
"WHERE deleted = 0 AND device_id IN ("
);
// 优化:分组查询每个设备的最新记录
List<DeviceOperationRecordDO> allResults = new ArrayList<>();
for (int i = 0; i < deviceIds.size(); i++) {
if (i > 0) sql.append(", ");
sql.append("?");
params.add(deviceIds.get(i));
}
sql.append(") ");
for (Long deviceId : deviceIds) {
StringBuilder sql = new StringBuilder(
"SELECT * FROM besure_server.iot_device_operation_record " +
"WHERE deleted = 0 AND device_id = ? "
);
if (CollectionUtils.isNotEmpty(ruleCodes)) {
sql.append("AND rule IN (");
for (int i = 0; i < ruleCodes.size(); i++) {
if (i > 0) sql.append(", ");
sql.append("?");
params.add(ruleCodes.get(i));
List<Object> params = new ArrayList<>();
params.add(deviceId);
if (CollectionUtils.isNotEmpty(ruleCodes)) {
sql.append("AND rule IN (");
for (int i = 0; i < ruleCodes.size(); i++) {
if (i > 0) sql.append(", ");
sql.append("?");
params.add(ruleCodes.get(i));
}
sql.append(") ");
}
sql.append(") ");
}
sql.append("ORDER BY create_time DESC");
sql.append("ORDER BY create_time DESC LIMIT 1"); // 每个设备只取最新1条
try {
return jdbcTemplate.query(sql.toString(), params.toArray(), (rs, rowNum) -> {
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.setModelId(rs.getLong("model_id"));
d.setRule(rs.getString("rule"));
d.setAddressValue(rs.getString("address_value"));
d.setCreator(rs.getString("creator"));
d.setCreateTime(rs.getTimestamp("create_time") != null ? rs.getTimestamp("create_time").toLocalDateTime() : null);
d.setUpdater(rs.getString("updater"));
d.setUpdateTime(rs.getTimestamp("update_time") != null ? rs.getTimestamp("update_time").toLocalDateTime() : null);
d.setDeleted(rs.getBoolean("deleted"));
d.setTenantId(String.valueOf(rs.getLong("tenant_id")));
d.setRuleId(rs.getLong("rule_id"));
return d;
});
try {
List<DeviceOperationRecordDO> deviceResults = jdbcTemplate.query(
sql.toString(),
params.toArray(),
(rs, rowNum) -> {
DeviceOperationRecordDO d = new DeviceOperationRecordDO();
d.setDeviceId(rs.getLong("device_id"));
d.setModelId(rs.getLong("model_id"));
d.setRule(rs.getString("rule"));
d.setAddressValue(rs.getString("address_value"));
d.setCreator(rs.getString("creator"));
d.setCreateTime(rs.getTimestamp("create_time") != null ? rs.getTimestamp("create_time").toLocalDateTime() : null);
d.setUpdater(rs.getString("updater"));
d.setUpdateTime(rs.getTimestamp("update_time") != null ? rs.getTimestamp("update_time").toLocalDateTime() : null);
d.setDeleted(rs.getBoolean("deleted"));
d.setTenantId(String.valueOf(rs.getLong("tenant_id")));
d.setRuleId(rs.getLong("rule_id"));
return d;
});
allResults.addAll(deviceResults);
} catch (Exception e) {
log.error("查询设备{}的最新记录失败", deviceId, e);
}
} catch (Exception e) {
log.error("查询失败", e);
return Collections.emptyList();
}
return allResults;
}
/**

Loading…
Cancel
Save