|
@@ -75,7 +75,6 @@ public class WorkViewServiceImpl implements WorkViewService {
|
|
|
List<WorkCustomButtonEntity> workCustomButtonList = workCustomButtonService.listByWorkId(workId);
|
|
|
List<WorkCustomButtonVo> workCustomButtonVos = BeanUtil.copyToList(workCustomButtonList, WorkCustomButtonVo.class);
|
|
|
|
|
|
- List<Tree<Long>> navigationTrees = workNavigationSettingService.queryNavigation(workId, null);
|
|
|
|
|
|
WorkSceneVo initialScene = workNavigationSettingService.getInitialScene(workId);
|
|
|
|
|
@@ -84,7 +83,7 @@ public class WorkViewServiceImpl implements WorkViewService {
|
|
|
List<WorkVisualAngleVo> workVisualAngleVos = BeanUtil.copyToList(workVisualAngles, WorkVisualAngleVo.class);
|
|
|
List<WorkNavigationEntity> workNavigationEntities = workNavigationService.selectScenes(workId);
|
|
|
workNavigationEntities.forEach(v->{
|
|
|
- if(v.getType().equals(NavigationTypeEnum.FDKK.code())){
|
|
|
+ if(v.getType().equals(NavigationTypeEnum.FDKK.code())&&ObjUtil.isEmpty(v.getVersion())){
|
|
|
Result<GetSceneNumVersionDto> info = fdkkClient._getSceneNumVersion(v.getSceneCode());
|
|
|
if (info.getCode()==0){
|
|
|
v.setVersion(info.getData().getVersion());
|
|
@@ -92,6 +91,7 @@ public class WorkViewServiceImpl implements WorkViewService {
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
+ List<Tree<Long>> navigationTrees = workNavigationSettingService.queryNavigation(workId, null);
|
|
|
|
|
|
Map<Long, String> iconMap = workNavigationEntities.stream().collect(Collectors.toMap(WorkNavigationEntity::getId, WorkNavigationEntity::getIcon));
|
|
|
if(CollUtil.isNotEmpty(iconMap)){
|