xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +55296 -1120
374 changed files with 55296 additions and 1120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 93ed334c0e - Show all commits

20
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsDeviceSettingServiceImpl.java
View File

@ -86,7 +86,9 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
DevicesSettingVo devicesSettingVo = new DevicesSettingVo();
BeanUtils.copyProperties(emsDevicesSetting, devicesSettingVo);
EmsPcsSetting pcsSetting = emsPcsSettingMapper.selectEmsPcsSettingByDeviceId(id);
devicesSettingVo.setPcsSetting(pcsSetting);
if (pcsSetting != null) {
devicesSettingVo.setPcsSetting(pcsSetting);
}
return devicesSettingVo;
}
@ -102,11 +104,13 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
return -1;
}
devicesSetting.setCreateTime(DateUtils.getNowDate());
int id = emsDevicesMapper.insertEmsDevicesSetting(devicesSetting);
int result = emsDevicesMapper.insertEmsDevicesSetting(devicesSetting);
EmsPcsSetting pcsSetting = devicesSetting.getPcsSetting();
pcsSetting.setDeviceSettingId(devicesSetting.getId());
emsPcsSettingMapper.insertEmsPcsSetting(pcsSetting);
return id;
if (pcsSetting != null) {
pcsSetting.setDeviceSettingId(devicesSetting.getId());
emsPcsSettingMapper.insertEmsPcsSetting(pcsSetting);
}
return result;
}
/**
@ -136,7 +140,11 @@ public class EmsDeviceSettingServiceImpl implements IEmsDeviceSettingService
return -2;
}
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);
}