Merge branch 'project-jmga-2.2.0-dynamic-push' into project-jmga-dev

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

@@ -36,8 +36,15 @@ public class UploadSceneDTO {
 
     private String taskNo;
 
+    //回推地址，示例：http://1.119.159.10:58080
     private String pushAddress;
 
+    //地区编码
+    private String districtCode;
+
+    //地区名称
+    private String districtName;
+
     public String getkNo() {
         return kNo;
     }

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

@@ -101,6 +101,14 @@ public class SceneOrigBd implements Serializable {
     @TableField("push_address")
     private String pushAddress;
 
+    //地区编码
+    @TableField("district_code")
+    private String districtCode;
+
+    //地区名称
+    @TableField("district_name")
+    private String districtName;
+
 
 
 }

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

@@ -157,4 +157,13 @@ public class ScenePlus implements Serializable {
 
     @TableField("push_address")
     private String pushAddress;
+
+    //地区编码
+    @TableField("district_code")
+    private String districtCode;
+
+    //地区名称
+    @TableField("district_name")
+    private String districtName;
+
 }

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

@@ -1,6 +1,7 @@
 package com.fdkankan.contro.service.impl;
 
 import cn.hutool.core.io.FileUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.util.CmdUtils;
@@ -71,7 +72,12 @@ public class HaixinServiceImpl implements IHaixinService {
         sceneOrigBd.setShootCount(dto.getShootCount());
         sceneOrigBd.setExpectedTime(this.getExpectedTime(dto.getShootCount()));
         sceneOrigBd.setTaskNo(dto.getTaskNo());
+        if(StrUtil.isNotEmpty(dto.getPushAddress()) && dto.getPushAddress().endsWith(File.separator)){
+            dto.setPushAddress(dto.getPushAddress().substring(0, dto.getPushAddress().length() - 1));
+        }
         sceneOrigBd.setPushAddress(dto.getPushAddress());
+        sceneOrigBd.setDistrictCode(dto.getDistrictCode());
+        sceneOrigBd.setDistrictName(dto.getDistrictName());
         sceneOrigBdService.save(sceneOrigBd);
 
         //推送进度
@@ -195,6 +201,9 @@ public class HaixinServiceImpl implements IHaixinService {
         }
 
         String url = haixinHost.concat(API_SYNC_RENDER_STATUS);
+        if(StrUtil.isNotEmpty(sceneOrigBd.getPushAddress())){
+            url = sceneOrigBd.getPushAddress().concat(API_SYNC_RENDER_STATUS);
+        }
         Map<String, Object> params = new HashMap<>();
         params.put("taskNo",sceneOrigBd.getTaskNo());
         params.put("projectId", sceneOrigBd.getTaskId());

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

@@ -1734,6 +1734,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         scenePlus.setTaskId(jsonObject.getString("taskId"));
         scenePlus.setKNo(jsonObject.getString("kNo"));
         scenePlus.setPushAddress(jsonObject.getString("pushAddress"));
+        scenePlus.setDistrictCode(jsonObject.getString("districtCode"));
+        scenePlus.setDistrictName(jsonObject.getString("districtName"));
         scenePlusService.updateById(scenePlus);
         ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
         boolean isObj = jsonObject.containsKey("exportMeshObj") && jsonObject.getIntValue("exportMeshObj") == 1;
@@ -2510,6 +2512,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 fdageData.put("kNo", sceneOrigBd.getKNo());
                 fdageData.put("sceneOrigBdId", bdId);
                 fdageData.put("pushAddress", sceneOrigBd.getPushAddress());
+                fdageData.put("districtCode", sceneOrigBd.getDistrictCode());
+                fdageData.put("districtName", sceneOrigBd.getDistrictName());
             }
 
             //相机入库
@@ -2548,7 +2552,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             String idCard = null;
             String jyNo = null;
             String nickName = null;
-            String pushAddress = null;
+            String districtCode = null;
+            String districtName = 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);
@@ -2572,7 +2577,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 idCard = sceneOrigBd.getRyCid();
                 jyNo = sceneOrigBd.getRyNo();
                 nickName = sceneOrigBd.getRyName();
-                pushAddress = sceneOrigBd.getPushAddress();
+                districtCode = sceneOrigBd.getDistrictCode();
+                districtName = sceneOrigBd.getDistrictName();
             }
             //推送开始上传状态
 
@@ -2585,6 +2591,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             params.put("idCard", idCard);
             params.put("jyNo", jyNo);
             params.put("nickName", nickName);
+            params.put("districtCode", districtCode);
+            params.put("districtName", districtName);
             String url = fdServiceUrl.concat(ApiConstant.URL_ADD_UCENTER_USER);
             ResultData post1 = myClient.post(url, params);
             log.info("---------registerUser result:{}-----------", post1);