浏览代码

add offline queue5

xiewj 2 月之前
父节点
当前提交
9183fea2c2

+ 3 - 1
720yun_fd_base/gis_common/src/main/java/com/gis/common/httpclient/FdkkClient.java

@@ -6,6 +6,7 @@ import com.dtflys.forest.annotation.Get;
 import com.dtflys.forest.annotation.Header;
 import com.dtflys.forest.annotation.Var;
 import com.dtflys.forest.extensions.DownloadFile;
+import com.gis.common.httpclient.dto.GetSceneNumVersionDto;
 import com.gis.common.util.Result;
 
 import java.io.File;
@@ -24,5 +25,6 @@ public interface FdkkClient {
     JSONObject getCameraListByPhone(@Var("phone") String phone, @Var("sceneSource") Integer sceneSource);
     @Get(value = "/api/laser/getSnCodeByPhone?sceneSource={sceneSource}")
     JSONObject getCameraListByToken(@Header("token") String token, @Var("sceneSource") String sceneSource);
-
+    @Get(value = "/api/_inner/_getSceneNumVersion?num={num}")
+    Result<GetSceneNumVersionDto> _getSceneNumVersion(@Var("num") String num);
 }

+ 15 - 0
720yun_fd_base/gis_common/src/main/java/com/gis/common/httpclient/dto/GetSceneNumVersionDto.java

@@ -0,0 +1,15 @@
+package com.gis.common.httpclient.dto;
+
+import lombok.Data;
+
+/**
+ * Created by Xiewj on  2024年4月18日14:09:13
+ */
+@Data
+public class GetSceneNumVersionDto {
+
+    private String num;
+    private String version;
+
+
+}

+ 16 - 0
720yun_fd_base/gis_service/src/main/java/com/gis/service/impl/WorkViewServiceImpl.java

@@ -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())));