2.2.0-海信动态推送地址

src/main/java/com/fdkankan/contro/dto/UploadSceneDTO.java

@@ -36,6 +36,8 @@ public class UploadSceneDTO {
 
     private String taskNo;
 
+    private String pushAddress;
+
     public String getkNo() {
         return kNo;
     }
@@ -52,4 +54,5 @@ public class UploadSceneDTO {
 
 
 
+
 }

src/main/java/com/fdkankan/contro/entity/SceneOrigBd.java

@@ -98,6 +98,9 @@ public class SceneOrigBd implements Serializable {
     @TableField("shoot_count")
     private Integer shootCount;
 
+    @TableField("push_address")
+    private String pushAddress;
+
 
 
 }

src/main/java/com/fdkankan/contro/entity/ScenePlus.java

@@ -154,4 +154,7 @@ public class ScenePlus implements Serializable {
 
     @TableField("start_build_time")
     private Date startBuildTime;
+
+    @TableField("push_address")
+    private String pushAddress;
 }

src/main/java/com/fdkankan/contro/service/impl/HaixinServiceImpl.java

@@ -71,6 +71,7 @@ public class HaixinServiceImpl implements IHaixinService {
         sceneOrigBd.setShootCount(dto.getShootCount());
         sceneOrigBd.setExpectedTime(this.getExpectedTime(dto.getShootCount()));
         sceneOrigBd.setTaskNo(dto.getTaskNo());
+        sceneOrigBd.setPushAddress(dto.getPushAddress());
         sceneOrigBdService.save(sceneOrigBd);
 
         //推送进度

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -1733,6 +1733,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
         scenePlus.setTaskId(jsonObject.getString("taskId"));
         scenePlus.setKNo(jsonObject.getString("kNo"));
+        scenePlus.setPushAddress(jsonObject.getString("pushAddress"));
         scenePlusService.updateById(scenePlus);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         boolean isObj = jsonObject.containsKey("exportMeshObj") && jsonObject.getIntValue("exportMeshObj") == 1;
@@ -2508,6 +2509,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 fdageData.put("taskId", sceneOrigBd.getTaskId());
                 fdageData.put("kNo", sceneOrigBd.getKNo());
                 fdageData.put("sceneOrigBdId", bdId);
+                fdageData.put("pushAddress", sceneOrigBd.getPushAddress());
             }
 
             //相机入库
@@ -2546,6 +2548,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             String idCard = null;
             String jyNo = null;
             String nickName = null;
+            String pushAddress = null;
             if(uploadType != null && uploadType.equals("single")){
                 String fileId = this.getFileId(snCode, uuid);
                 String subFolder = snCode.concat(File.separator).concat(fileId).concat(File.separator).concat(uuid);
@@ -2569,6 +2572,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 idCard = sceneOrigBd.getRyCid();
                 jyNo = sceneOrigBd.getRyNo();
                 nickName = sceneOrigBd.getRyName();
+                pushAddress = sceneOrigBd.getPushAddress();
             }
             //推送开始上传状态