diff --git a/das/src/main/java/com/das/modules/data/service/TDEngineService.java b/das/src/main/java/com/das/modules/data/service/TDEngineService.java index 761716f6..991849fb 100644 --- a/das/src/main/java/com/das/modules/data/service/TDEngineService.java +++ b/das/src/main/java/com/das/modules/data/service/TDEngineService.java @@ -4,17 +4,13 @@ import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.StrUtil; import com.das.common.utils.PageDataInfo; import com.das.modules.data.domain.DeviceEventInfo; -import com.das.modules.data.service.impl.DataServiceImpl; import com.das.modules.equipment.domain.vo.IotModelFieldVo; import com.das.modules.node.domain.bo.CalculateRTData; import com.das.modules.node.domain.bo.RTData; -import com.das.modules.node.domain.vo.DeviceEventVo; -import com.das.modules.node.service.impl.NodeMessageServiceImpl; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import jakarta.annotation.PreDestroy; import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Async; import org.springframework.scheduling.annotation.EnableAsync; @@ -82,7 +78,7 @@ public class TDEngineService { for (String key : keySet) { sb.append(", "); sb.append(key); - sb.append(" " + fieldNameTypeMap.get(key)); + sb.append(" ").append(fieldNameTypeMap.get(key)); } sb.append(") TAGS (`deviceid` BIGINT);"); try { @@ -133,12 +129,12 @@ public class TDEngineService { sb.append(stableType).append(iotModelCode); sb.append(" ADD COLUMN "); sb.append(key); - sb.append(" " + fieldNameTypeMap.get(key)); + sb.append(" ").append(fieldNameTypeMap.get(key)); sb.append(";"); try { pstmt.executeUpdate(sb.toString()); } catch (Exception e) { - log.error("新增超级表列失败:{},失败原因{}", sb.toString(), e); + log.error("新增超级表列失败:{},失败原因{}", sb, e); } } @@ -159,13 +155,12 @@ public class TDEngineService { sb.append("ALTER STABLE "); sb.append(stableName); sb.append(" DROP COLUMN "); - ; sb.append(fieldCode); sb.append(";"); try { pstmt.executeUpdate(sb.toString()); } catch (Exception e) { - log.error("删除超级表列失败:{},失败原因{}", sb.toString(), e); + log.error("删除超级表列失败:{},失败原因{}", sb, e); } } catch (Exception ignored) { @@ -187,7 +182,7 @@ public class TDEngineService { try { pstmt.executeUpdate(sb.toString()); } catch (Exception e) { - log.error("删除超级表失败:{},失败原因{}", sb.toString(), e); + log.error("删除超级表失败:{},失败原因{}", sb, e); } } catch (Exception ignored) { @@ -215,11 +210,10 @@ public class TDEngineService { for (String key : map.keySet()) { sb.append(", "); sb.append(key); - sb.append(" " + map.get(key)); + sb.append(" ").append(map.get(key)); } sb.append(") TAGS (`deviceid` BIGINT);"); try { - System.out.println(sb.toString()); pstmt.executeUpdate(sb.toString()); } catch (SQLException ex) { log.error("save yx error", ex); @@ -238,11 +232,10 @@ public class TDEngineService { for (String key : map.keySet()) { sb.append(", "); sb.append(key); - sb.append(" " + map.get(key)); + sb.append(" ").append(map.get(key)); } sb.append(") TAGS (`deviceid` BIGINT);"); try { - System.out.println(sb.toString()); pstmt.executeUpdate(sb.toString()); } catch (SQLException ex) { log.error("save yx error", ex); @@ -422,39 +415,6 @@ public class TDEngineService { } } - @Async - public void updateStataValues(List values, String iotModelCode) { - StringBuilder sb = new StringBuilder(1024 * 1024); - try (Connection conn = hikariDataSource.getConnection(); - Statement pstmt = conn.createStatement()) { - ListUtil.page(values, batchSize, (list) -> { - sb.setLength(0); - sb.append("insert into "); - for (RTData dv : list) { - sb.append("d"); - sb.append(dv.getDeviceId()); - sb.append(" using "); - sb.append(iotModelCode); - sb.append(" tags ("); - sb.append(dv.getDeviceId()); - sb.append(") values ("); - sb.append(dv.getDataTime()); - dv.getValues().forEach((key, value) -> - sb.append(",").append(value) - ); - sb.append(")"); - } - try { - pstmt.executeUpdate(sb.toString()); - } catch (SQLException ex) { - log.error("save yc error", ex); - } - }); - } catch (SQLException ex) { - log.error(ex.getMessage()); - } - } - public Map>> fetchHighHistoryCurve(Long irn, Date startTime, Date endTime, String interval, List fieldList) { SimpleDateFormat SIMPLE_DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @@ -740,7 +700,6 @@ public class TDEngineService { } private Integer getEventCount(Integer eventLevel, Long startTime, Long endTime, List deviceCodeList) { - List result = new ArrayList<>(); StringBuffer sb = new StringBuffer(2048); sb.append("select count(t.*) as total from event_info t where "); sb.append(String.format(" t.event_time >= %d and t.event_time < %d", startTime, endTime)); @@ -791,7 +750,7 @@ public class TDEngineService { Statement pstmt = conn.createStatement()) { pstmt.executeUpdate(sb.toString()); } catch (Exception e) { - log.error("新增超级表列失败:{},失败原因{}", sb.toString(), e); + log.error("新增超级表列失败:{},失败原因{}", sb, e); } }