新增PCS设备配置功能
This commit is contained in:
@ -86,7 +86,9 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
|
|||||||
DevicesSettingVo devicesSettingVo = new DevicesSettingVo();
|
DevicesSettingVo devicesSettingVo = new DevicesSettingVo();
|
||||||
BeanUtils.copyProperties(emsDevicesSetting, devicesSettingVo);
|
BeanUtils.copyProperties(emsDevicesSetting, devicesSettingVo);
|
||||||
EmsPcsSetting pcsSetting = emsPcsSettingMapper.selectEmsPcsSettingByDeviceId(id);
|
EmsPcsSetting pcsSetting = emsPcsSettingMapper.selectEmsPcsSettingByDeviceId(id);
|
||||||
|
if (pcsSetting != null) {
|
||||||
devicesSettingVo.setPcsSetting(pcsSetting);
|
devicesSettingVo.setPcsSetting(pcsSetting);
|
||||||
|
}
|
||||||
return devicesSettingVo;
|
return devicesSettingVo;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -102,11 +104,13 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
devicesSetting.setCreateTime(DateUtils.getNowDate());
|
devicesSetting.setCreateTime(DateUtils.getNowDate());
|
||||||
int id = emsDevicesMapper.insertEmsDevicesSetting(devicesSetting);
|
int result = emsDevicesMapper.insertEmsDevicesSetting(devicesSetting);
|
||||||
EmsPcsSetting pcsSetting = devicesSetting.getPcsSetting();
|
EmsPcsSetting pcsSetting = devicesSetting.getPcsSetting();
|
||||||
|
if (pcsSetting != null) {
|
||||||
pcsSetting.setDeviceSettingId(devicesSetting.getId());
|
pcsSetting.setDeviceSettingId(devicesSetting.getId());
|
||||||
emsPcsSettingMapper.insertEmsPcsSetting(pcsSetting);
|
emsPcsSettingMapper.insertEmsPcsSetting(pcsSetting);
|
||||||
return id;
|
}
|
||||||
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -136,7 +140,11 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
|
|||||||
return -2;
|
return -2;
|
||||||
}
|
}
|
||||||
devicesSetting.setUpdateTime(DateUtils.getNowDate());
|
devicesSetting.setUpdateTime(DateUtils.getNowDate());
|
||||||
emsPcsSettingMapper.updateEmsPcsSetting(devicesSetting.getPcsSetting());
|
EmsPcsSetting pcsSetting = devicesSetting.getPcsSetting();
|
||||||
|
if (pcsSetting != null) {
|
||||||
|
pcsSetting.setUpdateTime(DateUtils.getNowDate());
|
||||||
|
emsPcsSettingMapper.updateEmsPcsSetting(pcsSetting);
|
||||||
|
}
|
||||||
return emsDevicesMapper.updateEmsDevicesSetting(devicesSetting);
|
return emsDevicesMapper.updateEmsDevicesSetting(devicesSetting);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user