1.7.0 fix tour.xml

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/entity/WorkEntity.java

@@ -62,4 +62,9 @@ public class WorkEntity extends BaseStrEntity implements Serializable {
 
     @ApiModelProperty(value = "四维看看场景码")
     private String num;
+
+    @ApiModelProperty(value = "相机编码")
+    private String snCode;
+
+
 }

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/listener/SceneListener.java

@@ -93,14 +93,14 @@ public class SceneListener {
             }
             if (ObjectUtil.isNotEmpty(param.getSceneCode())&&param.getStatus()==0){
                 //初始化创建work表数据
-                workService.entityAdd(param.getPhoneNum(),param.getSceneCode(),param.getStatus(),param.getSceneName());
+                workService.entityAdd(param.getPhoneNum(),param.getSceneCode(),param.getStatus(),param.getSceneName(),param.getSnCode());
                 channel.basicAck(deliveryTag, false);
             }else if (ObjectUtil.isNotEmpty(param.getSceneCode())&&param.getStatus()==1){
                 //计算完成处理
                 WorkEntity workEntity=workService.findByNum(param.getSceneCode());
                 //处理业务
                 //1，下载场景的全景图 默认 。scene_view_data/panorama/目录下的全景图图片
-                String ossPath =  "scene_view_data/"+param.getSceneCode()+"/panorama/";
+                String ossPath =  "scene_view_data/"+param.getSceneCode()+"/panorama";
                 List<String> list=aliyunOssUtil.getFileFolder("4dkankan",ossPath);
 //            workEntity.setIcon(someDataJson.getString("icon"));
 //            workEntity.setShare(someDataJson.getString("share"));

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/WorkService.java

@@ -9,6 +9,6 @@ import com.gis.entity.WorkEntity;
  */
 public interface WorkService extends IBaseService<WorkEntity, String>{
 
-    WorkEntity entityAdd(String phoneNum, String sceneCode, int status, String sceneName);
+    WorkEntity entityAdd(String phoneNum, String sceneCode, int status, String sceneName, String snCode);
     WorkEntity findByNum(String num);
 }

720yun_fd_consumer/gis_consumer/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -39,7 +39,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
     }
 
     @Override
-    public WorkEntity entityAdd(String phoneNum, String sceneCode, int status, String sceneName) {
+    public WorkEntity entityAdd(String phoneNum, String sceneCode, int status, String sceneName, String snCode) {
 
         WorkEntity entity = new WorkEntity();
         entity.setId(SnowFlakeUUidUtils.getUuid("WK"));
@@ -52,6 +52,7 @@ public class WorkServiceImpl extends IBaseStrServiceImpl<WorkEntity, String> imp
         entity.setNum(sceneCode);
         entity.setType("pro");
         entity.setName(sceneName);
+        entity.setSnCode(snCode);
         this.save(entity);
 
         String id = entity.getId();

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/WorkEntity.java

@@ -62,4 +62,7 @@ public class WorkEntity extends BaseStrEntity implements Serializable {
 
     @ApiModelProperty(value = "四维看看场景码")
     private String num;
+
+    @ApiModelProperty(value = "相机编码")
+    private String snCode;
 }