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

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

@@ -1,6 +1,7 @@
 package com.fdkankan.contro.dto;
 
 import cn.hutool.crypto.digest.MD5;
+import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -45,6 +46,12 @@ public class UploadSceneDTO {
     //地区名称
     private String districtName;
 
+    //警员单位编码
+    private String ryOrgCode;
+
+    //警员单位名称
+    private String ryOrgName;
+
     public String getkNo() {
         return kNo;
     }

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

@@ -109,6 +109,14 @@ public class SceneOrigBd implements Serializable {
     @TableField("district_name")
     private String districtName;
 
+    //警员单位编码
+    @TableField("ry_org_code")
+    private String ryOrgCode;
+
+    //警员单位名称
+    @TableField("ry_org_name")
+    private String ryOrgName;
+
 
 
 }

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

@@ -78,6 +78,8 @@ public class HaixinServiceImpl implements IHaixinService {
         sceneOrigBd.setPushAddress(dto.getPushAddress());
         sceneOrigBd.setDistrictCode(dto.getDistrictCode());
         sceneOrigBd.setDistrictName(dto.getDistrictName());
+        sceneOrigBd.setRyOrgCode(dto.getRyOrgCode());
+        sceneOrigBd.setRyOrgName(dto.getRyOrgName());
         sceneOrigBdService.save(sceneOrigBd);
 
         //推送进度

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

@@ -1813,6 +1813,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             String nickName = null;
             String districtCode = null;
             String districtName = null;
+            String ryOrgCode = null;
+            String ryOrgName = 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);
@@ -1838,6 +1840,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 nickName = sceneOrigBd.getRyName();
                 districtCode = sceneOrigBd.getDistrictCode();
                 districtName = sceneOrigBd.getDistrictName();
+                ryOrgCode = sceneOrigBd.getRyOrgCode();
+                ryOrgName = sceneOrigBd.getRyOrgName();
             }
 
             //调注册用户接口
@@ -1851,6 +1855,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             params.put("nickName", nickName);
             params.put("districtCode", districtCode);
             params.put("districtName", districtName);
+            params.put("ryOrgCode", ryOrgCode);
+            params.put("ryOrgName", ryOrgName);
             String url = fdServiceUrl.concat(ApiConstant.URL_ADD_UCENTER_USER);
             ResultData post1 = myClient.post(url, params);
             log.info("---------registerUser result:{}-----------", post1);