diff --git a/src/main/java/com/techsor/datacenter/sender/dao/DeviceDao.java b/src/main/java/com/techsor/datacenter/sender/dao/DeviceDao.java index 1fbcacb..383f958 100644 --- a/src/main/java/com/techsor/datacenter/sender/dao/DeviceDao.java +++ b/src/main/java/com/techsor/datacenter/sender/dao/DeviceDao.java @@ -80,11 +80,18 @@ public class DeviceDao { } case "basic_monitoring_asset":{ try{ - String sql="select basic_monitoring_asset.*,basic_asset_class_big.class_name as classBigName,basic_asset_class_medium.class_name as classMediumName,basic_asset_class_small.class_name as classSmallName from " + - "basic_monitoring_asset,basic_asset_class_big,basic_asset_class_medium,basic_asset_class_small where basic_monitoring_asset.equipment_id ="+id+" and basic_monitoring_asset.class_big_id = basic_asset_class_big.id" + - " and basic_monitoring_asset.class_medium_id = basic_asset_class_medium.id " + - " and basic_monitoring_asset.class_small_id = basic_asset_class_small.id "; - resultList=this.jdbcTemplate.query(sql,(rs,rowNum)->{ + String sql = + "SELECT " + + "a.*, " + + "b.class_name AS classBigName, " + + "c.class_name AS classMediumName, " + + "d.class_name AS classSmallName " + + "FROM basic_monitoring_asset a " + + "LEFT JOIN basic_asset_class_big b ON a.class_big_id = b.id " + + "LEFT JOIN basic_asset_class_medium c ON a.class_medium_id = c.id " + + "LEFT JOIN basic_asset_class_small d ON a.class_small_id = d.id " + + "WHERE a.equipment_id = ?"; + resultList=this.jdbcTemplate.query(sql,new Object[]{id},(rs,rowNum)->{ UdfCommonJsonInfo commonJsonInfo = new UdfCommonJsonInfo(); UdfAssetInfo udfAssetInfo=new UdfAssetInfo(); udfAssetInfo.setId(rs.getString("udf_equipment_id"));