@ -439,11 +439,13 @@ public class CommonServiceImpl implements CommonService {
DESUtil . decrypt ( apikeyInfo . getAuroraPassword ( ) , Constants . DES_SALT ) ) ) {
DESUtil . decrypt ( apikeyInfo . getAuroraPassword ( ) , Constants . DES_SALT ) ) ) {
for ( ApiDeviceInfoVO apiDeviceInfoVO : deviceInfos ) {
for ( ApiDeviceInfoVO apiDeviceInfoVO : deviceInfos ) {
String sql = " select rawData, receive_ts from rawData_realtime where deviceId = '" + apiDeviceInfoVO . getDeviceId ( ) + "' limit 1" ;
String sql = "select rawData, receive_ts from rawData_realtime where deviceId = ? limit 1" ;
logger . info ( "queryAssetInfo aurora sql:" + sql ) ;
logger . info ( "queryAssetInfo aurora sql:" + sql ) ;
try ( PreparedStatement preparedStatement = conn . prepareStatement ( sql ) ) {
try ( PreparedStatement preparedStatement = conn . prepareStatement ( sql ) ) {
ResultSet retult = preparedStatement . executeQuery ( sql ) ;
preparedStatement . setString ( 1 , apiDeviceInfoVO . getDeviceId ( ) ) ;
ResultSet retult = preparedStatement . executeQuery ( ) ;
while ( retult . next ( ) ) {
while ( retult . next ( ) ) {
String rawData = retult . getString ( "rawData" ) ;
String rawData = retult . getString ( "rawData" ) ;
@ -970,11 +972,13 @@ public class CommonServiceImpl implements CommonService {
for ( ApiAlarmDeviceInfoVO apiAlarmDeviceInfoVO : deviceInfoVOs ) {
for ( ApiAlarmDeviceInfoVO apiAlarmDeviceInfoVO : deviceInfoVOs ) {
// String sql = " select rawData, receive_ts, alertTitle, alertLevel,alertLevelName,alertTypeName from "+formatRawDataWithDate()+" where deviceId = '" + apiAlarmDeviceInfoVO.getDeviceId() + "' order by receive_ts desc limit 1" ;
// String sql = " select rawData, receive_ts, alertTitle, alertLevel,alertLevelName,alertTypeName from "+formatRawDataWithDate()+" where deviceId = '" + apiAlarmDeviceInfoVO.getDeviceId() + "' order by receive_ts desc limit 1" ;
// String sql = " select rawData, receive_ts, alertTitle, alertLevel, alertTypeName from "+formatRawDataWithDate()+" where deviceId = '" + apiAlarmDeviceInfoVO.getDeviceId() + "' order by receive_ts desc limit 1" ;
// String sql = " select rawData, receive_ts, alertTitle, alertLevel, alertTypeName from "+formatRawDataWithDate()+" where deviceId = '" + apiAlarmDeviceInfoVO.getDeviceId() + "' order by receive_ts desc limit 1" ;
String sql = " select rawData, receive_ts, alertTitle, alertLevel,alertLevelName, alertTypeName from alertData where deviceId = '" + apiAlarmDeviceInfoVO . getDeviceId ( ) + "' order by receive_ts desc limit 1" ;
String sql = "select rawData, receive_ts, alertTitle, alertLevel, alertLevelName, alertTypeName from alertData where deviceId = ? order by receive_ts desc limit 1" ;
logger . info ( "queryAlarmDevice aurora sql:" + sql ) ;
logger . info ( "queryAlarmDevice aurora sql:" + sql ) ;
try ( PreparedStatement preparedStatement = conn . prepareStatement ( sql ) ) {
preparedStatement . setString ( 1 , apiAlarmDeviceInfoVO . getDeviceId ( ) ) ;
try ( PreparedStatement preparedStatement = conn . prepareStatement ( sql ) ) {
ResultSet retult = preparedStatement . executeQuery ( ) ;
ResultSet retult = preparedStatement . executeQuery ( sql ) ;
while ( retult . next ( ) ) {
while ( retult . next ( ) ) {
String rawData = retult . getString ( "rawData" ) ;
String rawData = retult . getString ( "rawData" ) ;
@ -2069,11 +2073,13 @@ public class CommonServiceImpl implements CommonService {
for ( ApiCancelAlarmDeviceInfoVO apiCancelAlarmDeviceInfoVO : deviceInfoVOs ) {
for ( ApiCancelAlarmDeviceInfoVO apiCancelAlarmDeviceInfoVO : deviceInfoVOs ) {
// String sql = " select rawData, receive_ts, alertTitle, alertLevel,alertLevelName,alertTypeName from "+formatRawDataWithDate()+" where deviceId = '" + apiAlarmDeviceInfoVO.getDeviceId() + "' order by receive_ts desc limit 1" ;
// String sql = " select rawData, receive_ts, alertTitle, alertLevel,alertLevelName,alertTypeName from "+formatRawDataWithDate()+" where deviceId = '" + apiAlarmDeviceInfoVO.getDeviceId() + "' order by receive_ts desc limit 1" ;
// String sql = " select rawData, receive_ts, alertTitle, alertLevel, alertTypeName from "+formatRawDataWithDate()+" where deviceId = '" + apiAlarmDeviceInfoVO.getDeviceId() + "' order by receive_ts desc limit 1" ;
// String sql = " select rawData, receive_ts, alertTitle, alertLevel, alertTypeName from "+formatRawDataWithDate()+" where deviceId = '" + apiAlarmDeviceInfoVO.getDeviceId() + "' order by receive_ts desc limit 1" ;
String sql = " select rawData, receive_ts, alertCancelTitle, alertLevel,alertLevelName, alertTypeName from rawData_realtime where deviceId = '" + apiCancelAlarmDeviceInfoVO . getDeviceId ( ) + "' limit 1" ;
String sql = "select rawData, receive_ts, alertCancelTitle, alertLevel, alertLevelName, alertTypeName from rawData_realtime where deviceId = ? limit 1" ;
logger . info ( "queryAlarmDevice aurora sql:" + sql ) ;
logger . info ( "queryAlarmDevice aurora sql: " + sql ) ;
try ( PreparedStatement preparedStatement = conn . prepareStatement ( sql ) ) {
preparedStatement . setString ( 1 , apiCancelAlarmDeviceInfoVO . getDeviceId ( ) ) ;
try ( PreparedStatement preparedStatement = conn . prepareStatement ( sql ) ) {
ResultSet retult = preparedStatement . executeQuery ( ) ;
ResultSet retult = preparedStatement . executeQuery ( sql ) ;
while ( retult . next ( ) ) {
while ( retult . next ( ) ) {
String rawData = retult . getString ( "rawData" ) ;
String rawData = retult . getString ( "rawData" ) ;