房屋首次登记分页查询远程

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/controller/third/OfferDataController.java

@@ -86,7 +86,7 @@ public class OfferDataController extends BaseController {
 
 
     /**
-     * 接收推送的登簿状体数据
+     * 接收推送的登簿数据
      *
      * @param body
      * @return

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/vo/HouseFirstParamVo.java

@@ -62,6 +62,14 @@ public class HouseFirstParamVo {
 
     private String ftmjDw;         // 分摊面积单位
 
+    /**
+     * 空间地块矢量图数据（EWKT格式）
+     * 必选: 是
+     * 业务类型: 业务
+     */
+    private List<String> geoms;
+
+
     /**
      * 附件材料信息（zip或文档结构待定）
      * 必选: 是

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/third/impl/OfferDataServiceImpl.java

@@ -26,15 +26,11 @@ import lombok.extern.slf4j.Slf4j;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+
 import java.util.stream.Collectors;
 
 
@@ -173,7 +169,7 @@ public class OfferDataServiceImpl implements OfferDataService {
         log.info("登簿数据校验通过开始入库: {}" , JSON.toJSONString(body));
 
         String id="";
-        String tbztFlag;
+        String tbztFlag="0";
         // 入库：以 yfbdcdyh 或 ywh 及 ywlx 判重，已存在则按主键覆盖更新，避免重复插入
         ThirdRecordStatusParamVo existing = thirdRecordStatusMapper.selectByYfbdcdyhAndYwhAndYwlx(yfbdcdyh, ywh, ywlx);
         if (existing != null) {
@@ -183,9 +179,8 @@ public class OfferDataServiceImpl implements OfferDataService {
         } else {
             id = IdUtils.fastSimpleUUID();
             body.setId(id);
-            body.setTbzt("0");
+            body.setTbzt(tbztFlag);
             thirdRecordStatusMapper.insert(body);
-            tbztFlag = "0";
         }
         log.info("登簿数据入库成功: {}" , id);
         if("0".equals(tbztFlag)) {

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/service/third/impl/TakeDataServiceImpl.java

@@ -3,9 +3,7 @@ package com.siwei.apply.service.third.impl;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.siwei.apply.domain.*;
-import com.siwei.apply.domain.res.GyjsydjfwscdjSinglRes;
-import com.siwei.apply.domain.res.GyjsydscdjRes;
-import com.siwei.apply.domain.res.GyjsydscdjSinglRes;
+
 import com.siwei.apply.domain.vo.*;
 import com.siwei.apply.enums.AloneWorkFlowEnum;
 
@@ -18,7 +16,6 @@ import com.siwei.apply.service.third.TakeDataService;
 import com.siwei.apply.utils.HttpClientUtil;
 import com.siwei.apply.utils.ServiceUtil;
 import com.siwei.common.core.exception.ServiceException;
-import com.siwei.common.core.utils.DateUtils;
 import com.siwei.common.core.utils.StringUtils;
 import com.siwei.common.core.utils.bean.BeanUtils;
 import com.siwei.spatial.api.RemoteSpatialFilesDbService;
@@ -271,7 +268,7 @@ public class TakeDataServiceImpl implements TakeDataService {
                 if (Objects.isNull(immobileCodeRes)) {
                     throw new ServiceException("检查预赋不动产单元号是否正确");
                 }
-                //todo 这里需要确认是否返回
+                //todo 这里需要确认是否返回ywh字段
                 if(StringUtils.isBlank(body.getYwbh())){
                     body.setYwbh("20260602500601");
                 }
@@ -279,7 +276,7 @@ public class TakeDataServiceImpl implements TakeDataService {
                 String needUpdateNodeId = "";
                 String projectId = immobileCodeRes.getProjectId();
                 String sourceId = body.getYwbh();
-                Gyjsydscdj existsNode = gyjsydscdjService.getBySourceId(sourceId);//todo 这里需要根据sourceId 检查
+                Gyjsydscdj existsNode = gyjsydscdjService.getBySourceId(sourceId);//这里需要根据sourceId 检查
                 if(Objects.nonNull(existsNode)){
                     needUpdateNodeId = existsNode.getId();
                 }

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/utils/ServiceUtil.java

@@ -212,15 +212,12 @@ public class ServiceUtil {
         // 3. 组装业务数据
         Map<String, Object> dataMap = new HashMap<>(4);
         dataMap.putAll(paramMap);
-//        dataMap.put("ywbh", "");
-//        dataMap.put("bdcdyh", "360122011006GB00318F00010001");
 
         // 4. 对象转 JSON ->  公钥加密  -> URLEncode
         ObjectMapper mapper = new ObjectMapper();
         String json = mapper.writeValueAsString(dataMap);
         logger.info("入参:{} ", json);
         String encrypted = encryptByPublicKey(publicKey, json);
-        //System.out.println("密文: " + encrypted);
         logger.info("密文:{} ", encrypted);
         String payload = encrypted;
 
@@ -238,11 +235,9 @@ public class ServiceUtil {
 
         // 7. 使用HttpClientUtil 发起远程POST请求
         String resp = HttpClientUtil.doPostJson(THIRD_API_DOMAIN+THIRD_API_BASE_URL, payload, headers);
-        //System.out.println("响应原文: " + resp);
         logger.info("响应原文:{} ", resp);
         // 8. 用我方私钥解密响应密文
         String plain = decryptByPrivateKey(privateKey, resp);
-        //System.out.println("响应解密明文: " + plain);
         logger.info("响应解密明文:{} ", plain);
         return plain;
     }