|
@@ -88,13 +88,15 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
|
|
@Override
|
|
@Override
|
|
public void updateByDeviceNo(String deviceNo, String ip) {
|
|
public void updateByDeviceNo(String deviceNo, String ip) {
|
|
try{
|
|
try{
|
|
- DeviceInfo deviceInfo= deviceInfoDAO.findByDeviceNo(deviceNo);
|
|
|
|
- String oldIp = deviceInfo.getIpAddress();
|
|
|
|
- if (deviceInfo.getIsAutoUpdate() && !deviceInfo.getIpAddress().equals(ip)){
|
|
|
|
- deviceInfo.setIpAddress(ip);
|
|
|
|
- deviceInfoDAO.update(deviceInfo);
|
|
|
|
- log.warn(deviceNo+"的ip由原来的:"+oldIp+"自动更新为:"+ip);
|
|
|
|
- }
|
|
|
|
|
|
+ DeviceInfo deviceInfo= deviceInfoDAO.findByDeviceNo(deviceNo);
|
|
|
|
+ String oldIp = deviceInfo.getIpAddress();
|
|
|
|
+
|
|
|
|
+ if (deviceInfo.getIsAutoUpdate()!=null &&
|
|
|
|
+ deviceInfo.getIsAutoUpdate() && !deviceInfo.getIpAddress().equals(ip)){
|
|
|
|
+ deviceInfo.setIpAddress(ip);
|
|
|
|
+ deviceInfoDAO.update(deviceInfo);
|
|
|
|
+ log.warn(deviceNo+"的ip由原来的:"+oldIp+"自动更新为:"+ip);
|
|
|
|
+ }
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|
|
log.error(deviceNo +":" +e.getMessage());
|
|
log.error(deviceNo +":" +e.getMessage());
|
|
}
|
|
}
|