更新房屋登记

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/domain/Fwmx.java

@@ -20,7 +20,7 @@ public class Fwmx extends BaseId {
     private String jzmj;           // 建筑面积
     private String tnmj;           // 套内面积
     private String ftmj;           // 分摊面积
-    private String mjdw;           // 面积单位
+    private String tdmjdw;           // 面积单位
     private String fjh;            // 房间号
     private String bdcdyh;         // 不动产单元号
     private String bdcqzh;         // 不动产权证号

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

@@ -20,7 +20,7 @@ public class FwmxVo {
     private String jzmj;           // 建筑面积
     private String tnmj;           // 套内面积
     private String ftmj;           // 分摊面积
-    private String mjdw;           // 面积单位
+    private String tdmjdw;           // 面积单位
     private String fjh;            // 房间号
     private String bdcdyh;         // 不动产单元号
     private String bdcqzh;         // 不动产权证号

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

@@ -10,18 +10,13 @@ import com.siwei.apply.mapper.ProjectImmobileCodeMapper;
 import com.siwei.apply.mapper.ProjectMapper;
 import com.siwei.apply.mapper.ProjectWorkflowMapper;
 import com.siwei.apply.mapper.ThirdRecordStatusMapper;
-import com.siwei.apply.service.GyjsydjfwscdjService;
-import com.siwei.apply.service.GyjsydscdjService;
 import com.siwei.apply.service.NodeAttachmentService;
-import com.siwei.apply.service.NodeLandService;
 import com.siwei.apply.service.third.OfferDataService;
 import com.siwei.apply.service.third.TakeDataService;
 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.uuid.IdUtils;
 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;
@@ -47,18 +42,10 @@ public class OfferDataServiceImpl implements OfferDataService {
     @Autowired
     private ProjectWorkflowMapper projectWorkflowMapper;
 
-    @Autowired
-    private GyjsydscdjService gyjsydscdjService;
-
-    @Autowired
-    private GyjsydjfwscdjService gyjsydjfwscdjService;
 
     @Autowired
     private RemoteSpatialFilesDbService remoteSpatialFilesDbService;
 
-    @Autowired
-    private NodeLandService nodeLandService;
-
     @Autowired
     private ProjectMapper projectMapper;
 

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

@@ -256,8 +256,8 @@ public class TakeDataServiceImpl implements TakeDataService {
         //todo 这里进行远程请求，获取相关数据，解析后入库
         try {
             Map<String,Object> paramMap = new LinkedHashMap<>();
-            paramMap.put("ywbh","HL20260126500101");
-            paramMap.put("yfbdcdyh","360122014005GB00046");
+            paramMap.put("ywbh",ywh);
+            paramMap.put("yfbdcdyh",yfbdcdyh);
 
             String remoteResult = ServiceUtil.getRemoteDataByHttpClient("query.landRegist.datas",paramMap);
             JSONObject root = JSON.parseObject(remoteResult);
@@ -272,9 +272,8 @@ public class TakeDataServiceImpl implements TakeDataService {
                 }
                 //todo 这里需要确认是否返回ywh字段
                 if(StringUtils.isBlank(body.getYwbh())){
-                    body.setYwbh("20260602500601");
+                    body.setYwbh(ywh);
                 }
-
                 String needUpdateNodeId = "";
                 String projectId = immobileCodeRes.getProjectId();
                 String sourceId = body.getYwbh();
@@ -292,6 +291,7 @@ public class TakeDataServiceImpl implements TakeDataService {
         } catch (Exception e) {
             log.error("调用矢量保存文件错误,业务编号：{}: ", ywh);
             e.printStackTrace();
+            throw new RuntimeException(e);
         }
         return retMap;
     }
@@ -466,6 +466,7 @@ public class TakeDataServiceImpl implements TakeDataService {
         } catch (Exception e) {
             log.error("调用不动产获取附件信息错误,业务号：{}: ", ywh);
             e.printStackTrace();
+            throw new RuntimeException(e);
         }
 
         // 第二部分，同步房屋的明细数据入库：
@@ -517,21 +518,21 @@ public class TakeDataServiceImpl implements TakeDataService {
                 //这边直接更新当前数据
                 if(Objects.nonNull(statisticsData)){
                     HouseFirstParamVo body = new HouseFirstParamVo();
-
                     body.setGzdgzsj(statisticsData.getGzdgzsj());
                     body.setKfdw(statisticsData.getKfdw());
                     body.setBdcqk(statisticsData.getBdcqk());
                     body.setJzmj(statisticsData.getJzmj());
-                    body.setJzmjDw(statisticsData.getMjdw());
-                    body.setFtmj(statisticsData.getFtmj());
-                    body.setTnmjDw(statisticsData.getMjdw());
+                    body.setJzmjDw(statisticsData.getTdmjdw());
+                    body.setTnmj(statisticsData.getTnmj());
+                    body.setTnmjDw(statisticsData.getTdmjdw());
                     body.setFtmj(statisticsData.getFtmj());
-                    body.setFtmjDw(statisticsData.getMjdw());
+                    body.setFtmjDw(statisticsData.getTdmjdw());
                     addOrUpdateHouseFirstRegistration(body,retMap.get("projectId").toString(),retMap.get("nodeId").toString());
                 }
             }
         }catch (Exception e) {
                 log.error("调用不动产获取明细信息错误,业务号：{}: ", ywh);
+                throw new RuntimeException(e);
         }
         return retMap;
     }

siwei-modules/siwei-apply/src/main/resources/mapper/FwmxMapper.xml

@@ -14,7 +14,7 @@
         <result property="jzmj" column="jzmj"/>
         <result property="tnmj" column="tnmj"/>
         <result property="ftmj" column="ftmj"/>
-        <result property="mjdw" column="mjdw"/>
+        <result property="tdmjdw" column="mjdw"/>
         <result property="fjh" column="fjh"/>
         <result property="bdcdyh" column="bdcdyh"/>
         <result property="bdcqzh" column="bdcqzh"/>
@@ -28,7 +28,7 @@
                            jzmj, tnmj, ftmj, mjdw, fjh, bdcdyh, bdcqzh, zl,
                            created_at, updated_at)
         VALUES (#{id}, #{ywh}, #{gzdgzsj}, #{kfdw}, #{bdcqk}, #{qlrmc}, #{qlrzjh},
-                #{jzmj}, #{tnmj}, #{ftmj}, #{mjdw}, #{fjh}, #{bdcdyh}, #{bdcqzh}, #{zl},
+                #{jzmj}, #{tnmj}, #{ftmj}, #{tdmjdw}, #{fjh}, #{bdcdyh}, #{bdcqzh}, #{zl},
                 now(), now())
     </insert>
 
@@ -77,7 +77,7 @@
             <if test="jzmj != null">jzmj = #{jzmj},</if>
             <if test="tnmj != null">tnmj = #{tnmj},</if>
             <if test="ftmj != null">ftmj = #{ftmj},</if>
-            <if test="mjdw != null">mjdw = #{mjdw},</if>
+            <if test="mjdw != null">mjdw = #{tdmjdw},</if>
             <if test="fjh != null">fjh = #{fjh},</if>
             <if test="bdcdyh != null">bdcdyh = #{bdcdyh},</if>
             <if test="bdcqzh != null">bdcqzh = #{bdcqzh},</if>