2.0.0

src/main/java/com/fdkankan/scene/httpclient/LaserHttpClient.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.httpclient;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.dtflys.forest.annotation.*;
+import com.fdkankan.scene.vo.TraceEvidenceInfoListParamVo;
+import com.fdkankan.scene.vo.TraceEvidenceListParamVO;
+import com.fdkankan.web.response.Result;
+import com.fdkankan.web.response.ResultData;
+
+import java.util.List;
+
+//@Address(source = FdkkAddressSource.class)
+public interface LaserHttpClient {
+
+    @Post("${host}/laser/jm/getTiledMap/${num}")
+    Result<List<JSONObject>> getTiledMap(@Var("host") String host, @Var("num") String num);
+}

src/main/java/com/fdkankan/scene/httpclient/ManageHttpClient.java

@@ -23,7 +23,7 @@ public interface ManageHttpClient {
     @Post("${host}/service/manage/inner/traceEvidenceInfoList")
     ResultData traceEvidenceInfoList(@Var("host") String host, @Header("token") String token, @JSONBody TraceEvidenceInfoListParamVo param);
 
-    @Get("${host}/service/manage/inner/refreshTraceEvidenceInfoList/{kno}")
+    @Get("${host}/service/manage/inner/refreshTraceEvidenceInfoList/${kno}")
     ResultData refreshTraceEvidenceInfoList(@Var("host") String host, @Header("token") String token, @Var("kno") String kno);
 
     @Post("${host}/service/manage/inner/addMediaLibrary")

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -4,6 +4,7 @@ import com.fdkankan.common.constant.*;
 import com.fdkankan.common.util.FileSizeUtil;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.scene.entity.*;
+import com.fdkankan.scene.httpclient.LaserHttpClient;
 import com.fdkankan.scene.service.*;
 import com.fdkankan.scene.vo.SaveFiltersParamVO;
 
@@ -74,6 +75,7 @@ import com.fdkankan.scene.vo.SceneInfoParamVO;
 import com.fdkankan.scene.vo.SceneInfoVO;
 import com.fdkankan.scene.vo.SurveillanceVO;
 import com.fdkankan.scene.vo.UploadPanoramaVO;
+import com.fdkankan.web.response.Result;
 import com.fdkankan.web.response.ResultData;
 import com.google.common.collect.Lists;
 import com.google.errorprone.annotations.Var;
@@ -138,6 +140,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     private int maxCheckTimes;
     @Value("${ecs.checkFile.waitTime:1000}")
     private int waitTime;
+    @Value("${4dkk.laserService.basePath}")
+    private String laserHost;
 
     @Autowired
     private ISceneEditControlsService sceneEditControlsService;
@@ -183,6 +187,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     private RabbitMqProducer mqProducer;
     @Autowired
     private ISceneEvidenceService sceneEvidenceService;
+    @Resource
+    private LaserHttpClient laserHttpClient;
 
     @Transactional
     @Override
@@ -537,15 +543,31 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     @Override
     public SceneInfoVO getSceneInfo(@Var SceneInfoParamVO param, HttpServletRequest request) throws Exception{
         SceneInfoReqType sceneInfoReqType = SceneInfoReqType.get(param.getReqType());
+        SceneInfoVO vo = null;
         switch (sceneInfoReqType){
             //如果是编辑页面请求，查数据库
             case EDIT:
-                return this.getSceneInfo4Edit(param.getNum());
+                vo = this.getSceneInfo4Edit(param.getNum());
+                break;
             //如果是查看页面请求，查redis
             case VIEW:
-                return this.getSceneInfo4View(param, request);
+                vo = this.getSceneInfo4View(param, request);
+                break;
+            default:
+                vo = null;
         }
-        return null;
+
+        //如果是激光场景，请求激光系统获取激光场景特有属性，提供给许钟文使用
+        try {
+            if("laser".equals(vo.getSceneFrom())){
+                Result<List<JSONObject>> tiledMap = laserHttpClient.getTiledMap(laserHost, param.getNum());
+                vo.setTiledMap(tiledMap.getData());
+            }
+        }catch (Exception e){
+            log.warn("获取激光场景信息出错,num:{}", param.getNum(), e);
+        }
+
+        return vo;
     }
 
     /**

src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -286,5 +286,7 @@ public class SceneInfoVO {
      */
     private Integer evidence;
 
+    private List<JSONObject> tiledMap;
+
 
 }