Merge branch 'dev-excel0521' into dev-to-user-1

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

@@ -76,9 +76,15 @@ public class TakeDataController extends BaseController {
     public R<Map<String, Object>> testHouseFirstRegistration(@RequestBody ThirdRecordStatusParamVo  body) {
         try {
             //这里入参,登簿数据
+            body = new ThirdRecordStatusParamVo();
+            body.setYfbdcdyh("360122014004GB60018");
+            body.setBdcdyh("360122011004GB00103F00020012");
 
+            body.setYwlx("2");
+            body.setYwh("20251023145611");
 
             Map<String, Object> map = takeDataService.remoteHouseFirstRegistration(body);
+
             map.put("id", map.get("id"));
             return R.ok(map);
         } catch (Exception e) {

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

@@ -128,5 +128,5 @@ public class HouseFirstParamVo {
      * 必选: 是
      * 业务类型: 业务
      */
-    private Map<String, Object> attachment;
+    private List<Map<String, Object>> attachment;
 }

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

@@ -712,7 +712,6 @@ public class NodeAttachmentImpl implements NodeAttachmentService {
     }
 
 
-
     /**
      * 1.获取不动产附件
      * 2.进行url处理。

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

@@ -182,14 +182,14 @@ public class OfferDataServiceImpl implements OfferDataService {
             tbztFlag = "0";
         }
         log.info("登簿数据入库成功: {}" , id);
-        tbztFlag = "1"; //todo 这里暂时不同步数据
+        //tbztFlag = "1"; //todo 这里暂时不同步数据
         if("0".equals(tbztFlag)) {
             //todo 需要进行数据的抓取，并且需要异步处理，否则下载文件会阻塞接口的返回，导致超时。
             CompletableFuture.supplyAsync(()-> {
                 if("1".equals(ywlx)){ //土地首次登记
                     takeDataService.remoteLandFirstRegistration(body);
                 }else if("2".equals(ywlx)){ //房屋首次登记
-                    //takeDataService.remoteHouseFirstRegistration(body);
+                    takeDataService.remoteHouseFirstRegistration(body);
                 }
                 ThirdRecordStatusParamVo updateVo = new ThirdRecordStatusParamVo();
                 updateVo.setId(body.getId());

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

@@ -1,7 +1,6 @@
 package com.siwei.apply.service.third.impl;
 
 import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.siwei.apply.domain.LandType;
 import com.siwei.apply.domain.Project;
@@ -22,13 +21,11 @@ import com.siwei.apply.service.NodeAttachmentService;
 import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.third.TakeDataService;
 import com.siwei.apply.utils.HttpClientUtil;
-import com.siwei.apply.utils.ServiceFileUtil;
 import com.siwei.apply.utils.ServiceUtil;
-import com.siwei.common.core.domain.R;
 import com.siwei.common.core.exception.ServiceException;
+import com.siwei.common.core.utils.DateUtils;
 import com.siwei.common.core.utils.StringUtils;
 import com.siwei.spatial.api.RemoteSpatialFilesDbService;
-import com.siwei.spatial.api.domain.file.TGeomDb;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -184,7 +181,6 @@ public class TakeDataServiceImpl implements TakeDataService {
         return retMap;
     }
 
-
     /**
      * 远程获取国有建设用地使用权首次登记数据
      * 并且入库
@@ -195,7 +191,7 @@ public class TakeDataServiceImpl implements TakeDataService {
     public Map<String, Object> remoteLandFirstRegistration(ThirdRecordStatusParamVo paramVo) {
         String yfbdcdyh = paramVo.getYfbdcdyh();
         if (StringUtils.isBlank(yfbdcdyh)) {
-            throw new ServiceException("预分不动产单元号为空");
+            throw new ServiceException("预赋不动产单元号为空");
         }
         String ywh = paramVo.getYwh();
         if (StringUtils.isBlank(ywh)) {
@@ -264,58 +260,72 @@ public class TakeDataServiceImpl implements TakeDataService {
     @Override
     public Map<String, Object> remoteHouseFirstRegistration(ThirdRecordStatusParamVo paramVo) {
         String yfbdcdyh = paramVo.getYfbdcdyh();
-        if (org.apache.commons.lang3.StringUtils.isBlank(yfbdcdyh)) {
-            throw new ServiceException("预分不动产单元号为空");
+        if (StringUtils.isBlank(yfbdcdyh)) {
+            throw new ServiceException("预赋不动产单元号为空");
+        }
+        String bdcdyh = paramVo.getBdcdyh();
+        if (StringUtils.isBlank(bdcdyh)) {
+            throw new ServiceException("不动产单元号为空");
         }
         String ywbh = paramVo.getYwh();
-        if (org.apache.commons.lang3.StringUtils.isBlank(ywbh)) {
+        if (StringUtils.isBlank(ywbh)) {
             throw new ServiceException("业务编号为空");
         }
         String ywlx = paramVo.getYwlx();
-        if (org.apache.commons.lang3.StringUtils.isBlank(ywlx)) {
+        if (StringUtils.isBlank(ywlx)) {
             throw new ServiceException("业务类型为空");
         }
+        Map<String, Object> retMap = new HashMap<>();
 
         //todo 这里进行远程请求，获取相关数据，解析后入库
-        HouseFirstParamVo body = new HouseFirstParamVo(); //这里需要调整
-        List<String> geomsList = body.getGeoms();
-        if (CollectionUtils.isEmpty(geomsList)) {
-            throw new ServiceException("geom信息为空");
-        }
         try {
-            GyjsydjfwscdjVo gyjsydjfwscdjVo = new GyjsydjfwscdjVo();
-            gyjsydjfwscdjVo.setProjectId(body.getXmbh());
-//            gyjsydjfwscdjVo.setYwh(body.getYwh());
-//            gyjsydjfwscdjVo.setGzdgzsj(body.getGzdgzsj());
-//            gyjsydjfwscdjVo.setKfdw(body.getKfdw());
-//            gyjsydjfwscdjVo.setBdcqk(body.getBdcqk());
-//            if (StringUtils.isNotBlank(body.getJzmj())) {
-//                gyjsydjfwscdjVo.setJzmj(body.getJzmj());
-//            }
-//            gyjsydjfwscdjVo.setJzmjDw(body.getJzmjDw());
-//            gyjsydjfwscdjVo.setTnmj(body.getTnmj());
-//            gyjsydjfwscdjVo.setTnmjDw(body.getTnmjDw());
-//            gyjsydjfwscdjVo.setFtmj(body.getFtmj());
-//            gyjsydjfwscdjVo.setFtmjDw(body.getFtmjDw());
-//            gyjsydjfwscdjVo.setBz(body.getBz());
-
-            String nodeId = gyjsydjfwscdjService.add(gyjsydjfwscdjVo);
-            Map<String, Object> map1 = new HashMap<>();
-            map1.put("geomData", geomsList);
-            //todo 这里进行矢量文件的保存及其传输。
-            R<TGeomDb> res = remoteSpatialFilesDbService.saveGeom(map1);
-            TGeomDb tGeomDb = res.getData();
-            //这里保存geom映射关系
-            nodeLandService.createNodeLand(nodeId, tGeomDb.getId());
-            Map<String, Object> map = new HashMap<>();
-            map.put("id", nodeId);
-            return map;
+            Map<String,Object> paramMap = new LinkedHashMap<>();
+            paramMap.put("ywbh","");
+            //paramMap.put("bdcdyh",yfbdcdyh);
+            paramMap.put("bdcdyh",bdcdyh);
+            String remoteResult = ServiceUtil.getRemoteDataByHttpClient("query.houseRegist.datas",paramMap);
+            JSONObject root = JSON.parseObject(remoteResult);
+            JSONObject innerData = root.getJSONObject("data").getJSONObject("data");
+            HouseFirstParamVo body = JSON.parseObject(innerData.toString(), HouseFirstParamVo.class);
+
+            if(Objects.nonNull(body)) {
+                ProjectImmobileCode immobileCodeRes = projectImmobileCodeMapper.selectByPreAssignCode(yfbdcdyh);
+                if (Objects.isNull(immobileCodeRes)) {
+                    throw new ServiceException("检查预赋不动产单元号是否正确");
+                }
+                String projectId = immobileCodeRes.getProjectId();
+                GyjsydjfwscdjVo gyjsydjfwscdjVo = new GyjsydjfwscdjVo();
+
+                gyjsydjfwscdjVo.setProjectId(projectId);
+                gyjsydjfwscdjVo.setYwh(body.getYwbh());
+
+                if(StringUtils.isNotBlank(body.getDjrq())){
+                    Date djDate = DateUtils.parseDate(body.getDjrq());
+                    gyjsydjfwscdjVo.setGzdgzsj(djDate);//告知单时间
+                }
+                gyjsydjfwscdjVo.setKfdw(body.getQlr());
+                gyjsydjfwscdjVo.setBdcqk(""); //不动产情况
+
+                gyjsydjfwscdjVo.setJzmj(body.getTdmj()); //建筑面积
+                gyjsydjfwscdjVo.setJzmjDw(body.getTdmjdw());//建筑面积单位
+                gyjsydjfwscdjVo.setTnmj(body.getTdmj());
+                gyjsydjfwscdjVo.setTnmjDw(body.getTdmjdw());
+                gyjsydjfwscdjVo.setFtmj("0");
+                gyjsydjfwscdjVo.setFtmjDw(body.getTdmjdw());
+                gyjsydjfwscdjVo.setBz("");//备注
+
+                String nodeId = gyjsydjfwscdjService.add(gyjsydjfwscdjVo);
+                retMap.put("id", nodeId);
+                //这里保存附件信息
+                if(Objects.nonNull(body.getAttachment()) && !body.getAttachment().isEmpty()){
+                    nodeAttachmentService.getThirdAttachment(projectId,nodeId,AloneWorkFlowEnum.NODE_7.getName(),body.getAttachment());
+                }
+            }
+            return retMap;
         } catch (Exception e) {
             log.error("调用矢量保存文件错误,业务编号：{}: ", ywbh);
             e.printStackTrace();
         }
-        //todo 同步完成之后，需要修改t_third_record_status 表的状态值，同步完成；
-
         return null;
     }