diff --git a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java index 32d8de26..cb92a34d 100644 --- a/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java +++ b/das/src/main/java/com/das/modules/node/service/impl/SysNodeServiceImpl.java @@ -237,6 +237,7 @@ public class SysNodeServiceImpl implements SysNodeService { List addList = new ArrayList<>(); + List updateList = new ArrayList<>(); //过滤已经存在的记录 Set PassedMappingIds = new HashSet<>(); @@ -264,6 +265,13 @@ public class SysNodeServiceImpl implements SysNodeService { if(mappingVoMap.containsKey(key)){ SysTabMappingVo item = mappingVoMap.get(key); PassedMappingIds.add(item.getId()); + + SysTabMapping mapping = sysImptabmappingMapper.selectById(item.getId()); + mapping.setMeasPointName(iotModelVo.getAttributeName()); + mapping.setHighSpeed(iotModelVo.getHighSpeed()); + mapping.setPorder(iotModelVo.getPorder()); + updateList.add(mapping); + }else{ SysTabMapping mapping = new SysTabMapping(); mapping.setId(SequenceUtils.generateId()); @@ -297,6 +305,11 @@ public class SysNodeServiceImpl implements SysNodeService { if(mappingVoMap.containsKey(key)){ SysTabMappingVo item = mappingVoMap.get(key); PassedMappingIds.add(item.getId()); + + SysTabMapping mapping = sysImptabmappingMapper.selectById(item.getId()); + mapping.setMeasPointName(iotServiceVo.getServiceName()); + mapping.setPorder(iotServiceVo.getPorder()); + updateList.add(mapping); }else{ SysTabMapping mapping = new SysTabMapping(); mapping.setId(SequenceUtils.generateId()); @@ -317,6 +330,9 @@ public class SysNodeServiceImpl implements SysNodeService { if (!CollectionUtils.isEmpty(addList)) { sysImptabmappingMapper.insertOrUpdateBatch(addList); } + if (!CollectionUtils.isEmpty(updateList)) { + sysImptabmappingMapper.insertOrUpdateBatch(updateList); + } //删除为匹配的历史配置 for(SysTabMappingVo item : mappingVoMap.values()){