类型变更

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

@@ -192,10 +192,10 @@ public class OfferDataServiceImpl implements OfferDataService {
         if("0".equals(tbztFlag)) {
             //todo 需要进行数据的抓取，并且需要异步处理，否则下载文件会阻塞接口的返回，导致超时。
             CompletableFuture.supplyAsync(()-> {
-                if("1".equals(ywlx)){ //土地首次登记
-                    takeDataService.remoteLandFirstRegistration(body);
-                }else if("2".equals(ywlx)){ //房屋首次登记
+                if("1".equals(ywlx)){ //房屋首次登记（后来类型变更）
                     takeDataService.remoteHouseFirstRegistration(body);
+                }else if("2".equals(ywlx)){ //土地首次登记
+                    takeDataService.remoteLandFirstRegistration(body);
                 }
                 ThirdRecordStatusParamVo updateVo = new ThirdRecordStatusParamVo();
                 updateVo.setId(body.getId());

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

@@ -247,6 +247,7 @@ public class TakeDataServiceImpl implements TakeDataService {
                 gyjsydscdjVo.setBdczh(body.getBdczh());
                 gyjsydscdjVo.setDjjg(body.getDjjg());
                 gyjsydscdjVo.setDjDate(body.getDjrq());
+                gyjsydscdjVo.setSourceId(ywh);
                 String nodeId = gyjsydscdjService.add(gyjsydscdjVo);
                 retMap.put("id", nodeId);
                 //这里保存附件信息
@@ -273,9 +274,9 @@ public class TakeDataServiceImpl implements TakeDataService {
         if (StringUtils.isBlank(bdcdyh)) {
             throw new ServiceException("不动产单元号为空");
         }
-        String ywbh = paramVo.getYwh();
-        if (StringUtils.isBlank(ywbh)) {
-            throw new ServiceException("业务编号为空");
+        String ywh = paramVo.getYwh();
+        if (StringUtils.isBlank(ywh)) {
+            throw new ServiceException("业务号为空");
         }
         String ywlx = paramVo.getYwlx();
         if (StringUtils.isBlank(ywlx)) {
@@ -319,7 +320,7 @@ public class TakeDataServiceImpl implements TakeDataService {
                 gyjsydjfwscdjVo.setFtmj("0");
                 gyjsydjfwscdjVo.setFtmjDw(body.getTdmjdw());
                 gyjsydjfwscdjVo.setBz("");//备注
-
+                gyjsydjfwscdjVo.setSourceId(ywh);
                 String nodeId = gyjsydjfwscdjService.add(gyjsydjfwscdjVo);
                 retMap.put("id", nodeId);
                 //这里保存附件信息
@@ -329,7 +330,7 @@ public class TakeDataServiceImpl implements TakeDataService {
             }
             return retMap;
         } catch (Exception e) {
-            log.error("调用矢量保存文件错误,业务编号：{}: ", ywbh);
+            log.error("调用矢量保存文件错误,业务号：{}: ", ywh);
             e.printStackTrace();
         }
         return null;

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

@@ -202,6 +202,9 @@ public class ServiceUtil {
         String privateKey = THIRD_API_PRIVATE_KEY;
         String publicKey = THIRD_API_PUBLIC_KEY;
 
+        privateKey  = "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
+        publicKey = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCoVP+LpSUfIL6r2nvN/TYOmBGGJT/6vB2Us8Qhk/4ZhmPIo1PE/8ovpdFcNXaYGbtd6/32dkotxFgMxiLdHFHii3EaBL6PXUYHiZWnIRz79gmttHQGDXhOVRGbldNHOZXWBBrek8/GWDk6Z5jgUFhi3K5853JU5fIc8w5TGyVs7wIDAQAB";
+
         // 2. 三方提供其公钥（这里用我方公钥模拟三方公钥，联调时替换为真实三方公钥）
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         String time = sdf.format(new Date());