root
/
thing_api
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

物关系导入功能 

2024年10月21日15:16:08
thing_master
lishuai 1 year ago
parent
5286fb7250
commit
4ab3b86bb0
1 changed files with 34 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      modules/thing/src/main/java/com/thing/thing/relation/detail/service/impl/IotThingRelationDetailServiceImpl.java

26
modules/thing/src/main/java/com/thing/thing/relation/detail/service/impl/IotThingRelationDetailServiceImpl.java
View File

@ -996,14 +996,14 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl<IotThingR
List<IotThingRelationDetailExcel> resList = list.stream().map(node -> {
IotThingRelationDetailExcel excel = new IotThingRelationDetailExcel();
excel.setFromName(node.get("fromName").asText());
excel.setFromCode(node.get("fromCode").isEmpty() ? "" : node.get("fromCode").asText());
excel.setFromCode(node.get("fromCode").isNull() ? "" : node.get("fromCode").asText());
excel.setToName(node.get("toName").asText());
excel.setToCode(node.get("toCode").asText());
excel.setConfig(node.get("config").isEmpty() ? "" : node.get("config").asText());
excel.setRemark(node.get("remark").isEmpty() ? "" : node.get("remark").asText());
excel.setConfig(node.get("config").isNull() ? "" : node.get("config").asText());
excel.setRemark(node.get("remark").isNull() ? "" : node.get("remark").asText());
excel.setSort(node.get("sort").asLong());
excel.setUrl(node.get("url").isEmpty() ? "" : node.get("url").asText());
excel.setTag(node.get("tag").isEmpty() ? "" : node.get("tag").asText());
excel.setUrl(node.get("url").isNull() ? "" : node.get("url").asText());
excel.setTag(node.get("tag").isNull() ? "" : node.get("tag").asText());
long rootThingId = node.get("rootThingId").asLong();
IotThingEntityInfoDTO entity = thingEntitiesService.findEntityById(rootThingId);
excel.setRootThingCode(entity.getCode());
@ -1033,16 +1033,20 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl<IotThingR
}
sheetDataList.forEach(excel -> {
//关系名称
if(!Objects.isNull(rootDTO)){
IotThingRelationDetailEntity entity = new IotThingRelationDetailEntity();
//说明是第一节点
if(StringUtils.equals(excel.getRootThingCode(),excel.getToCode()) && StringUtils.isBlank(excel.getFromCode())){
entity.setFromId(rootDTO.getId());
entity.setFromName(rootDTO.getName());
}else{
IotThingEntity fromEntity = entities.stream().filter(e -> e.getCode().equals(excel.getFromCode())).findFirst().get();
entity.setFromId(fromEntity.getId());
entity.setFromName(excel.getFromName());
entity.setFromCode(excel.getFromCode());
}
IotThingEntity toEntity = entities.stream().filter(e -> e.getCode().equals(excel.getToCode())).findFirst().get();
IotThingEntity rootEntity = entities.stream().filter(e -> e.getCode().equals(excel.getRootThingCode())).findFirst().get();
entity.setRootId(rootDTO.getId());
entity.setFromCode(excel.getFromCode());
entity.setFromCode(excel.getName());
entity.setFromId(fromEntity.getId());
entity.setToCode(excel.getToCode());
entity.setToName(excel.getToName());
entity.setToId(toEntity.getId());
@ -1061,8 +1065,6 @@ public class IotThingRelationDetailServiceImpl extends BaseServiceImpl<IotThingR
}
cache.updateAccurateKeyMap(CacheNameEnum.THING_DETAIL_RELATION,
entity.getRootId() + CacheInit.KEY + entity.getId() + CacheInit.KEY + entity.getRootThingId(), node);
}
});
}

Write Preview
Loading…
Cancel
Save