1111

src/main/java/com/fdkankan/contro/controller/SceneOrigBdController.java

@@ -21,7 +21,7 @@ import javax.validation.Valid;
  * @since 2025-05-07
  */
 @RestController
-@RequestMapping("/contro/sceneOrigBd")
+@RequestMapping("/api/scene/bd")
 public class SceneOrigBdController {
 
     @Autowired

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

@@ -1,5 +1,6 @@
 package com.fdkankan.contro.dto;
 
+import cn.hutool.crypto.digest.MD5;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -16,7 +17,7 @@ public class UploadSceneDTO {
     @NotBlank(message = "项目号不能为空")
     private String taskId;
 
-    @NotBlank(message = "案件号不能为空")
+//    @NotBlank(message = "案件号不能为空")
     private String kNo;
 
     private String ryId;
@@ -25,6 +26,24 @@ public class UploadSceneDTO {
 
     private String password;
 
+    private String ryPhone;
+
+    private String ryCid;
+
+    public String getkNo() {
+        return kNo;
+    }
+
+    public String setkNo(String kNo) {
+        return this.kNo = kNo;
+    }
+
+    public static void main(String[] args) {
+        String s = MD5.create().digestHex("Aa123456789");
+        System.out.println(s);
+    }
+
+
 
 
 }

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

@@ -80,5 +80,11 @@ public class SceneOrigBd implements Serializable {
     @TableField("password")
     private String password;
 
+    @TableField("ry_phone")
+    private String ryPhone;
+
+    @TableField("ry_cid")
+    private String ryCid;
+
 
 }

src/main/java/com/fdkankan/contro/mq/service/impl/BuildSceneServiceImpl.java

@@ -146,6 +146,7 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
     private ILinkPanService linkPanService;
     @Autowired
     private IJmgaService jmgaService;
+    @Autowired
     private IHaixinService haixinService;
 
 

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

@@ -53,10 +53,12 @@ public class HaixinServiceImpl implements IHaixinService {
         SceneOrigBd sceneOrigBd = new SceneOrigBd();
         sceneOrigBd.setFileUrl(dto.getFileUrl());
         sceneOrigBd.setTaskId(dto.getTaskId());
-        sceneOrigBd.setKNo(dto.getKNo());
+        sceneOrigBd.setKNo(dto.getkNo());
         sceneOrigBd.setRyId(dto.getRyId());
         sceneOrigBd.setRyNo(dto.getRyNo());
         sceneOrigBd.setPassword(dto.getPassword());
+        sceneOrigBd.setRyPhone(dto.getRyPhone());
+        sceneOrigBd.setRyCid(dto.getRyCid());
         sceneOrigBdService.save(sceneOrigBd);
         return ResultData.ok();
     }

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

@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.common.constant.CommonSuccessStatus;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.SceneStatus;
-import com.fdkankan.common.util.CmdUtils;
 import com.fdkankan.common.util.SnowflakeIdGenerator;
 import com.fdkankan.contro.entity.SceneFileBuild;
 import com.fdkankan.contro.entity.SceneOrigBd;
@@ -78,10 +77,11 @@ public class MjServiceImpl implements MjService {
                 }
 
                 httpClient.downloadFile(fileUrl, zipDir, zipName);
-                String unzipCmd = "unzip -o -O GBK " + zipDir + zipName + " -d " + zipDir;
+//                String unzipCmd = "unzip -O GBK " + zipDir + zipName + " -d " + zipDir;
 
-                CmdUtils.callLine(unzipCmd);
+//                CmdUtils.callLine(unzipCmd);
 
+                ZipUtil.unzip(new File(zipDir + zipName), new File(zipDir));
                 //解压后删除压缩包
                 FileUtil.del(zipDir + zipName);
 

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

@@ -2394,8 +2394,11 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             //调注册用户接口
             Map<String, Object> params = new HashMap<>();
             params.put("ryId", sceneOrigBd.getRyId());
-            params.put("ryNo", sceneOrigBd.getRyNo());
-            params.put("password", AesUtil.encryptCBC(sceneOrigBd.getPassword(), userPasswordKey, userPasswordIv, AesUtil.ALMODE_CBC_NOPADDING));
+            params.put("ryNo", sceneOrigBd.getRyId());
+            params.put("password", sceneOrigBd.getPassword());
+            params.put("phone", sceneOrigBd.getRyPhone());
+            params.put("idCard", sceneOrigBd.getRyCid());
+            params.put("jyNo", sceneOrigBd.getRyNo());
             String url = fdServiceUrl.concat(URL_ADD_UCENTER_USER);
             ResultData post1 = myClient.post(url, params);
             log.info("---------registerUser result:{}-----------", post1);

src/main/resources/bootstrap-test.yml

@@ -2,7 +2,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 192.168.0.127:8848
+        server-addr: 192.168.0.125:28848
         file-extension: yaml
         namespace: test
         extension-configs: