|
@@ -6,6 +6,9 @@ import cn.hutool.core.collection.CollUtil;
|
|
|
import cn.hutool.core.lang.tree.Tree;
|
|
|
import cn.hutool.core.util.ObjUtil;
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
+import com.gis.common.constant.NavigationTypeEnum;
|
|
|
+import com.gis.common.httpclient.FdkkClient;
|
|
|
+import com.gis.common.httpclient.dto.GetSceneNumVersionDto;
|
|
|
import com.gis.common.util.Result;
|
|
|
import com.gis.domain.entity.*;
|
|
|
import com.gis.domain.vo.*;
|
|
@@ -13,6 +16,7 @@ import com.gis.service.*;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -45,6 +49,8 @@ public class WorkViewServiceImpl implements WorkViewService {
|
|
|
private WorkCustomMaskService workCustomMaskService;
|
|
|
@Autowired
|
|
|
private WorkNavigationService workNavigationService;
|
|
|
+ @Resource
|
|
|
+ FdkkClient fdkkClient;
|
|
|
|
|
|
@Override
|
|
|
public WorkViewVo getViewInfo(String workId) {
|
|
@@ -77,6 +83,16 @@ public class WorkViewServiceImpl implements WorkViewService {
|
|
|
List<WorkVisualAngle> workVisualAngles = workVisualAngleService.listByWorkId(workId);
|
|
|
List<WorkVisualAngleVo> workVisualAngleVos = BeanUtil.copyToList(workVisualAngles, WorkVisualAngleVo.class);
|
|
|
List<WorkNavigationEntity> workNavigationEntities = workNavigationService.selectScenes(workId);
|
|
|
+ workNavigationEntities.forEach(v->{
|
|
|
+ if(v.getType().equals(NavigationTypeEnum.FDKK.code())){
|
|
|
+ Result<GetSceneNumVersionDto> info = fdkkClient._getSceneNumVersion(v.getSceneCode());
|
|
|
+ if (info.getCode()==0){
|
|
|
+ v.setVersion(info.getData().getVersion());
|
|
|
+ workNavigationService.updateById(v);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+
|
|
|
Map<Long, String> iconMap = workNavigationEntities.stream().collect(Collectors.toMap(WorkNavigationEntity::getId, WorkNavigationEntity::getIcon));
|
|
|
if(CollUtil.isNotEmpty(iconMap)){
|
|
|
workVisualAngleVos.stream().forEach(v->v.setIcon(iconMap.get(v.getNavigationId())));
|