Browse Source

Merge remote-tracking branch 'origin/dev_addcate_and_import' into dev_addcate_and_import

dev
yinzuomei 4 years ago
parent
commit
59310e0914
  1. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java
  2. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java

@ -128,7 +128,7 @@ public class IcNeighborHoodController {
formDTO.setOrgType(orgType); formDTO.setOrgType(orgType);
formDTO.setOrgId(orgId); formDTO.setOrgId(orgId);
formDTO.setUserId(tokenDTO.getUserId()); formDTO.setUserId(tokenDTO.getUserId());
return new Result().ok(icNeighborHoodService.neighborhoodImport(formDTO,file)); return icNeighborHoodService.neighborhoodImport(formDTO,file);
} }
} }

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@ -192,7 +192,7 @@ public class BuildingServiceImpl implements BuildingService {
buildingTreeLevelDTO.setId(item.getId()); buildingTreeLevelDTO.setId(item.getId());
buildingTreeLevelDTO.setPId(item.getGridId()); buildingTreeLevelDTO.setPId(item.getGridId());
buildingTreeLevelDTO.setLabel(item.getNeighborHoodName()); buildingTreeLevelDTO.setLabel(item.getNeighborHoodName());
buildingTreeLevelDTO.setLevel("neighbourHood"); buildingTreeLevelDTO.setLevel("neighborHood");
buildingTreeLevelDTO.setLongitude(item.getLongitude()); buildingTreeLevelDTO.setLongitude(item.getLongitude());
buildingTreeLevelDTO.setLatitude(item.getLatitude()); buildingTreeLevelDTO.setLatitude(item.getLatitude());
buildingTreeLevelDTO.setChildren(new ArrayList<>()); buildingTreeLevelDTO.setChildren(new ArrayList<>());

Loading…
Cancel
Save