所有的数据分割调整

src/main/java/com/skyversation/poiaddr/service/impl/YyskAddressStandardizationServiceImpl.java

@@ -536,7 +536,7 @@ public class YyskAddressStandardizationServiceImpl {
                     }
                 }
                 datas.add(data);
-                if (i != 0 && (i % (pageSize - 1) == 0 || i == datas.size() - 1)) {
+                if (i != 0 && (i % pageSize == 0 || i == datas.size())) {
                     dataList.put("data", datas);
                     try {
                         System.out.println(AddressQueryEngine.getInstance().putDataToSJ_Big_Data2(dataList));
@@ -548,6 +548,16 @@ public class YyskAddressStandardizationServiceImpl {
                     datas.clear();
                 }
             }
+            if(datas.size() > 0){
+                dataList.put("data", datas);
+                try {
+                    System.out.println(AddressQueryEngine.getInstance().putDataToSJ_Big_Data2(dataList));
+                    System.out.println("补录数据条数" + datas.size());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                datas.clear();
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -588,7 +598,7 @@ public class YyskAddressStandardizationServiceImpl {
                     }
                 }
                 datas.add(data);
-                if (i != 0 && (i % (pageSize - 1) == 0 || i == datas.size() - 1)) {
+                if (i != 0 && (i % pageSize == 0 || i == datas.size())) {
                     dataList.put("data", datas);
                     try {
                         System.out.println(AddressQueryEngine.getInstance().putDataToSJ_Big_Data3(dataList));
@@ -802,10 +812,12 @@ public class YyskAddressStandardizationServiceImpl {
                 dataItem.put("updatetime", getCurrentDateTime());
                 dataItem.put("match_level", yyskAddressStandardization.getMatchLevel());
                 datas.add(dataItem);
-                if (i != 0 && (i % (pageSize - 1) == 0 || i == listData.size() - 1)) {
+                if (i != 0 && (i % pageSize == 0 || i == listData.size())) {
                     dataList.put("data", datas);
                     try {
-//                        System.out.println(AddressQueryEngine.getInstance().putDataToSJ_Big_Data(dataList));
+                        System.out.println(AddressQueryEngine.getInstance().putDataToSJ_Big_Data(dataList));
+                        long endTime = System.currentTimeMillis();
+                        System.out.println("处理单批次用时" + (endTime - startTime) / 1000 + "秒！");
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -814,8 +826,10 @@ public class YyskAddressStandardizationServiceImpl {
             }
             dataList.put("data", datas);
             if (datas.size() > 0) {
+                dataList.put("data", datas);
                 try {
                     System.out.println(AddressQueryEngine.getInstance().putDataToSJ_Big_Data(dataList));
+                    System.out.println("补录数据条数：" + datas.size());
                 } catch (Exception e) {
                     e.printStackTrace();
                 }