Browse Source

修改bug

master
xia 3 years ago
parent
commit
a375953a95
  1. 4
      storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceSpecParamImpl.java

4
storeroom/src/main/java/com/storeroom/modules/device/service/impl/DeviceSpecParamImpl.java

@ -77,10 +77,14 @@ public class DeviceSpecParamImpl implements DeviceSpecParamService {
String deviceId = deviceInfo.getDeviceId(); String deviceId = deviceInfo.getDeviceId();
DeviceSpecParam deviceSpecParam = deviceSpecParamRepository.findFirstByDeviceInfoId(deviceId); DeviceSpecParam deviceSpecParam = deviceSpecParamRepository.findFirstByDeviceInfoId(deviceId);
if(null == deviceSpecParam){ if(null == deviceSpecParam){
deviceSpecParam = new DeviceSpecParam();
deviceSpecParam.setId(NanoIdUtils.randomNanoId()); deviceSpecParam.setId(NanoIdUtils.randomNanoId());
deviceSpecParam.setDeviceInfoId(deviceId); deviceSpecParam.setDeviceInfoId(deviceId);
deviceSpecParam.setMacAddress(mac); deviceSpecParam.setMacAddress(mac);
deviceSpecParam = deviceSpecParamRepository.save(deviceSpecParam); deviceSpecParam = deviceSpecParamRepository.save(deviceSpecParam);
}else{
deviceSpecParam.setMacAddress(mac);
deviceSpecParam = deviceSpecParamRepository.saveAndFlush(deviceSpecParam);
} }
deviceInfo.setDeviceSpecParamId(deviceSpecParam); deviceInfo.setDeviceSpecParamId(deviceSpecParam);
deviceInfoRepository.saveAndFlush(deviceInfo); deviceInfoRepository.saveAndFlush(deviceInfo);

Loading…
Cancel
Save