优化推送数据，同步后状态更新

siwei-modules/siwei-apply/src/main/java/com/siwei/apply/mapper/ProjectImmobileCodeMapper.java

@@ -60,6 +60,14 @@ public interface ProjectImmobileCodeMapper {
      */
     void updateById(ProjectImmobileCode projectImmobileCode);
 
+
+    /**
+     * 根据ID更新记录（可选字段更新）
+     */
+    void updateByPreCode(ProjectImmobileCode projectImmobileCode);
+
+
+
     /**
      * 根据项目ID删除
      */

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

@@ -133,6 +133,12 @@ public class OfferDataServiceImpl implements OfferDataService {
 //            throw new ServiceException("预赋不动产单元号长度必须为19位");
 //        }
 
+        //这里两者必须绑定
+        String bdcdyh = body.getBdcdyh();
+        if (StringUtils.isBlank(bdcdyh)) {
+            throw new ServiceException("不动产单元号为空");
+        }
+
         String ywlx = body.getYwlx();
         if (StringUtils.isBlank(ywlx)) {
             throw new ServiceException("业务类型为空");
@@ -195,6 +201,12 @@ public class OfferDataServiceImpl implements OfferDataService {
                 updateVo.setId(body.getId());
                 updateVo.setTbzt("1");
                 thirdRecordStatusMapper.updateById(updateVo);
+
+                //这里需要更新绑定关系
+                ProjectImmobileCode  updateImmobileCode = new ProjectImmobileCode();
+                updateImmobileCode.setCode(bdcdyh);
+                updateImmobileCode.setPreAssignCode(yfbdcdyh);
+                projectImmobileCodeMapper.updateByPreCode(updateImmobileCode);
                 return body.getId();
             }).exceptionally(e -> {
                 log.error("不动产远程抓取数据失败: ywh={}, ywlx={}", ywh, ywlx, e);

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

@@ -23,12 +23,12 @@ public class ServiceUtil {
     private static final String SECRET_KEY = "siwei";  // Secret key for signature
     private static final String TIME_KEY = "?time=";  // time
     private static final String DOMAIN = "http://192.168.60.219/prod-api/apply";  // doman
-    public static final String THIRD_API_PRIVATE_KEY = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAI1O4yrVG7/Eg1M0G1f/bRDV1ABUpRSSBxvfAxh4dL2W7ApMCz+Krs3xushcQzTOsVuxPGAjgXB906iUEyUJoefnixiKthYV56kzVeXtIw+J1Tbnc1ujTvhWNUkaJYxLCTw+8Z/kASL0XNKImSgzNsB6YQ/ZlYa0kBUEFrs0RBStAgMBAAECgYAxOrqJwZTZSm02H4EnNyWYJ+aj9tlMQVOYsikx7UU+h8XUEIoaqQYdWYnpI7uGOjwv5Z9THwuJVUzX/j5tON3el/eMeOCdnRaSzprY90ceKPr13TezIy6PvyZbH0JRua7Qwu+Klh8GL/6s5lZfs3VAM3qImSE+O86SlL+GbdLiAQJBANF5zA/a8KGkm7yremftARqvfOTy+PQxXXXE7tbWqE5P/t4/feZI45OKoNNId1EGFs4nIS/G+p99AEO80sQNnVUCQQCssUV6h6ddEp3SAVfDSB1Ss0i35kd5GRZT5v+atA9ETAyP37o8ZqnFln1blG95Afp7qy0NcP+ltGCZZftOBdn5AkAv+SXbx7duPYWRKvBolqW3F9ORl3eebSPLUeOk/hojfTyQZ5gMwkqkQo5cdO8mdi+I3PtDtt0042rJGJhoX/nVAkEAqJekGdxHgzDCjJws/wPvRKatDoQtMMdSKfUxgunYobeQ6ADmQ0OC6NhjZ73BGiTZUlSp9h5kJnSzfe626dQCmQJBAM7heHLxlzNY65ziyTp5RkShxmp/yEi6d4cFzZ5/UyFDWW/vphrbKezsKK5rpbFmQjNhFcAk61+O+70J0V8Yoh8=";  // doman
-    public static final String THIRD_API_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCoVP+LpSUfIL6r2nvN/TYOmBGGJT/6vB2Us8Qhk/4ZhmPIo1PE/8ovpdFcNXaYGbtd6/32dkotxFgMxiLdHFHii3EaBL6PXUYHiZWnIRz79gmttHQGDXhOVRGbldNHOZXWBBrek8/GWDk6Z5jgUFhi3K5853JU5fIc8w5TGyVs7wIDAQAB";
-
+    //不动产系统
+//    public static final String THIRD_API_PRIVATE_KEY = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAI1O4yrVG7/Eg1M0G1f/bRDV1ABUpRSSBxvfAxh4dL2W7ApMCz+Krs3xushcQzTOsVuxPGAjgXB906iUEyUJoefnixiKthYV56kzVeXtIw+J1Tbnc1ujTvhWNUkaJYxLCTw+8Z/kASL0XNKImSgzNsB6YQ/ZlYa0kBUEFrs0RBStAgMBAAECgYAxOrqJwZTZSm02H4EnNyWYJ+aj9tlMQVOYsikx7UU+h8XUEIoaqQYdWYnpI7uGOjwv5Z9THwuJVUzX/j5tON3el/eMeOCdnRaSzprY90ceKPr13TezIy6PvyZbH0JRua7Qwu+Klh8GL/6s5lZfs3VAM3qImSE+O86SlL+GbdLiAQJBANF5zA/a8KGkm7yremftARqvfOTy+PQxXXXE7tbWqE5P/t4/feZI45OKoNNId1EGFs4nIS/G+p99AEO80sQNnVUCQQCssUV6h6ddEp3SAVfDSB1Ss0i35kd5GRZT5v+atA9ETAyP37o8ZqnFln1blG95Afp7qy0NcP+ltGCZZftOBdn5AkAv+SXbx7duPYWRKvBolqW3F9ORl3eebSPLUeOk/hojfTyQZ5gMwkqkQo5cdO8mdi+I3PtDtt0042rJGJhoX/nVAkEAqJekGdxHgzDCjJws/wPvRKatDoQtMMdSKfUxgunYobeQ6ADmQ0OC6NhjZ73BGiTZUlSp9h5kJnSzfe626dQCmQJBAM7heHLxlzNY65ziyTp5RkShxmp/yEi6d4cFzZ5/UyFDWW/vphrbKezsKK5rpbFmQjNhFcAk61+O+70J0V8Yoh8=";  // doman
+//    public static final String THIRD_API_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCoVP+LpSUfIL6r2nvN/TYOmBGGJT/6vB2Us8Qhk/4ZhmPIo1PE/8ovpdFcNXaYGbtd6/32dkotxFgMxiLdHFHii3EaBL6PXUYHiZWnIRz79gmttHQGDXhOVRGbldNHOZXWBBrek8/GWDk6Z5jgUFhi3K5853JU5fIc8w5TGyVs7wIDAQAB";
 //   本地密钥
-//    public static final String THIRD_API_PRIVATE_KEY = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJ5/O5IdusAZ+tmS8kFIhqOSkTm9nE+boXnQ7tqD+wdBCeE37t0muKI64q8nk9WFz68sMAadnhjWvpflfV6qHKQmH47ZNqeH2vwIJz5vw7su49o3GRDZVW99X56LSVv0oJsVuXL/SvxKGONuC/qtbpb7SXltLWZCmgAgjnuIIjfZAgMBAAECgYA3FRCm3x4f1OeQ5bi7Z3EjN7Sw1GyWXgfoRew8lNGQ29GLK90fjm1sM/rD1IVUF4Tt4/Vs1yoyh68FKwQ++e+prZ3CTbpKhmuZ5NKWrJEaZkuYTtsP4xiuae38lM8lZgrA89Qkrmfu/TdR+AJAFtSIohmy5Md4YM78D3BIxOLXgQJBAPZBl5utD86YhgeXHth51OOrzN0ftqUAm281dCa4I9Zaf2uvGqfB5J61uyeK1PBXRu+4MfbA0q5ZSSr2wPZnr6UCQQCkxLMK3H7O3H0w4555+j4m0v+n/Gx6jUfXiMcALO85so/bFDr/5v9VWojEKgO8re7yoje+bD+ubSuDKqeJxnElAkBjefeucWiTQlXSNx/EvuJa3gmxwZ/cY7RmZid3hKclbgVPELspzU93NV5XCOQf+oGzUKsOTLJOr864xlkIsLXpAkEAgvvHpXPB7yrC7xGUEz3HGNAV4vI9PnN/0CzwnggaqRB1YeDEQljdVHojTWZlECJpWUNx8xRUz5IDzEMlatZxbQJBAI9xCcKTBg5qO9olagSAA9TKhMfNtNm1SaMtAzkHNJKJojUK01ORdlE+6vpEOC2SfoS9C4ZAEGXV1/sROmeoUBQ=";  // doman
-//    public static final String THIRD_API_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCefzuSHbrAGfrZkvJBSIajkpE5vZxPm6F50O7ag/sHQQnhN+7dJriiOuKvJ5PVhc+vLDAMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCefzuSHbrAGfrZkvJBSIajkpE5vZxPm6F50O7ag/sHQQnhN+7dJriiOuKvJ5PVhc+vLDAGnZ4Y1r6X5X1eqhykJh+O2Tanh9r8CCc+b8O7LuPaNxkQ2VVvfV+ei0lb9KCbFbly/0r8Shjjbgv6rW6W+0l5bS1mQpoAII57iCI32QIDAQAB";
+    public static final String THIRD_API_PRIVATE_KEY = "MIICdwIBADANBgkqhkiG9w0BAQEFAASCAmEwggJdAgEAAoGBAJ5/O5IdusAZ+tmS8kFIhqOSkTm9nE+boXnQ7tqD+wdBCeE37t0muKI64q8nk9WFz68sMAadnhjWvpflfV6qHKQmH47ZNqeH2vwIJz5vw7su49o3GRDZVW99X56LSVv0oJsVuXL/SvxKGONuC/qtbpb7SXltLWZCmgAgjnuIIjfZAgMBAAECgYA3FRCm3x4f1OeQ5bi7Z3EjN7Sw1GyWXgfoRew8lNGQ29GLK90fjm1sM/rD1IVUF4Tt4/Vs1yoyh68FKwQ++e+prZ3CTbpKhmuZ5NKWrJEaZkuYTtsP4xiuae38lM8lZgrA89Qkrmfu/TdR+AJAFtSIohmy5Md4YM78D3BIxOLXgQJBAPZBl5utD86YhgeXHth51OOrzN0ftqUAm281dCa4I9Zaf2uvGqfB5J61uyeK1PBXRu+4MfbA0q5ZSSr2wPZnr6UCQQCkxLMK3H7O3H0w4555+j4m0v+n/Gx6jUfXiMcALO85so/bFDr/5v9VWojEKgO8re7yoje+bD+ubSuDKqeJxnElAkBjefeucWiTQlXSNx/EvuJa3gmxwZ/cY7RmZid3hKclbgVPELspzU93NV5XCOQf+oGzUKsOTLJOr864xlkIsLXpAkEAgvvHpXPB7yrC7xGUEz3HGNAV4vI9PnN/0CzwnggaqRB1YeDEQljdVHojTWZlECJpWUNx8xRUz5IDzEMlatZxbQJBAI9xCcKTBg5qO9olagSAA9TKhMfNtNm1SaMtAzkHNJKJojUK01ORdlE+6vpEOC2SfoS9C4ZAEGXV1/sROmeoUBQ=";  // doman
+    public static final String THIRD_API_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCefzuSHbrAGfrZkvJBSIajkpE5vZxPm6F50O7ag/sHQQnhN+7dJriiOuKvJ5PVhc+vLDAGnZ4Y1r6X5X1eqhykJh+O2Tanh9r8CCc+b8O7LuPaNxkQ2VVvfV+ei0lb9KCbFbly/0r8Shjjbgv6rW6W+0l5bS1mQpoAII57iCI32QIDAQAB";
 
     public static final String THIRD_API_DOMAIN = "http://10.224.1.228:10001";
     public static final String THIRD_API_BASE_URL = "/dsp-register-server/dspRegisterService/proxyService/proxyThirdPlatformService";
@@ -37,7 +37,6 @@ public class ServiceUtil {
 
 
 
-
     /**
      * 获取指定目录下的子children list
      *

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

@@ -178,6 +178,23 @@
         WHERE id = #{id}
     </update>
 
+    <!-- 根据预赋码更新记录（可选字段更新） -->
+    <update id="updateByPreCode" parameterType="com.siwei.apply.domain.ProjectImmobileCode">
+        UPDATE t_project_immobile_code
+        <set>
+            <if test="projectId != null">project_id = #{projectId},</if>
+            <if test="sequenceNumber != null">sequence_number = #{sequenceNumber},</if>
+            <if test="code != null">code = #{code},</if>
+            <if test="validFlag != null">valid_flag = #{validFlag},</if>
+            <if test="nodeId != null">node_id = #{nodeId},</if>
+            <if test="geomDbId != null">geom_db_id = #{geomDbId},</if>
+            <if test="geomDetailsId != null">geom_details_id = #{geomDetailsId},</if>
+            <if test="updatedAt != null">updated_at = #{updatedAt}</if>
+        </set>
+        WHERE pre_assign_code = #{preAssignCode}
+    </update>
+
+
     <!-- 根据项目ID删除 -->
     <delete id="deleteByProjectId" parameterType="String">
         DELETE FROM t_project_immobile_code WHERE project_id = #{projectId}

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

@@ -848,12 +848,12 @@
             td.has_zz         as bzzt,
             td.hbcrhtbh       as hbcrhtbh,
             td.hbcrht_date    as hbcrhtrq,
-            (SELECT immobile.pre_assign_code
+            COALESCE((SELECT immobile.pre_assign_code
                FROM t_project_immobile_code immobile
               WHERE immobile.project_id = pro.id
                 AND immobile.valid_flag = 1
                 AND immobile.pre_assign_code IS NOT NULL
-              LIMIT 1) as yfbdcdyh,
+              LIMIT 1),'') as yfbdcdyh,
             (SELECT array_to_string(array_agg(ST_AsEWKT(gd.geom)), '|')
                FROM t_node_land nl
                LEFT JOIN t_geom_db_details gd ON nl.geom_db_id = gd.upload_id

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

@@ -101,9 +101,6 @@
     </select>
 
 
-
-
-
     <!-- 根据主键 ID 覆盖更新登簿状态信息 -->
     <update id="updateById" parameterType="com.siwei.apply.domain.vo.ThirdRecordStatusParamVo">
         UPDATE t_third_record_status