Skip to content

S
sample-form-platform
Commit deab7a36 authored by 赵啸非's avatar 赵啸非
Browse files
Options

修改设备同步接口

parent 807cd9ec
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
sample-form-manager/src/main/java/com/mortals/xhx/daemon/task/SyncSiteDeviceTaskImpl.java
View file @ deab7a36
...@@ -109,6 +109,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService { ...@@ -109,6 +109,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
DeviceEntity deviceEntity = new DeviceEntity(); DeviceEntity deviceEntity = new DeviceEntity();
deviceEntity.initAttrValue(); deviceEntity.initAttrValue();
BeanUtils.copyProperties(newDevice, deviceEntity, BeanUtil.getNullPropertyNames(newDevice)); BeanUtils.copyProperties(newDevice, deviceEntity, BeanUtil.getNullPropertyNames(newDevice));
deviceEntity.setDeviceId(newDevice.getId());
return deviceEntity; return deviceEntity;
}).collect(Collectors.toList()); }).collect(Collectors.toList());
...@@ -123,7 +124,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService { ...@@ -123,7 +124,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
List<DeviceEntity> updateDeviceLsit = newDeviceList.stream().map(item -> { List<DeviceEntity> updateDeviceLsit = newDeviceList.stream().map(item -> {
if (oldDeviceMap.containsKey(item.getDeviceCode())) { if (oldDeviceMap.containsKey(item.getDeviceCode())) {
item.setId(oldDeviceMap.get(item.getDeviceCode()).getId()); item.setId(oldDeviceMap.get(item.getDeviceCode()).getId());
item.setDeviceId(item.getId()); // item.setDeviceId(item.getId());
item.setProductCode(oldDeviceMap.get(item.getDeviceCode()).getProductCode()); item.setProductCode(oldDeviceMap.get(item.getDeviceCode()).getProductCode());
item.setProductName(oldDeviceMap.get(item.getDeviceCode()).getProductName()); item.setProductName(oldDeviceMap.get(item.getDeviceCode()).getProductName());
item.setUpdateTime(new Date()); item.setUpdateTime(new Date());
...@@ -135,7 +136,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService { ...@@ -135,7 +136,7 @@ public class SyncSiteDeviceTaskImpl implements ITaskExcuteService {
List<DeviceEntity> saveDeviceList = newDeviceList.stream().map(item -> { List<DeviceEntity> saveDeviceList = newDeviceList.stream().map(item -> {
//log.info("deviceCode:{},oldDeviceMap:{}",item.getDeviceCode(),oldDeviceMap.containsKey(item.getDeviceCode())); //log.info("deviceCode:{},oldDeviceMap:{}",item.getDeviceCode(),oldDeviceMap.containsKey(item.getDeviceCode()));
if (!oldDeviceMap.containsKey(item.getDeviceCode())) { if (!oldDeviceMap.containsKey(item.getDeviceCode())) {
item.setDeviceId(item.getId()); // item.setDeviceId(item.getId());
item.setCreateUserId(1L); item.setCreateUserId(1L);
item.setProductName("样表机"); item.setProductName("样表机");
item.setCreateUserName("系统管理员"); item.setCreateUserName("系统管理员");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment