Merge branch 'dev' into test

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/constant/KylinTableStatusConst.java

@@ -9,6 +9,9 @@ package com.liquidnet.service.kylin.constant;
  * @since 2021-05-25 6:38 下午
  */
 public class KylinTableStatusConst {
+    /**
+     * 退款
+     */
     // 批量退款 1处理完成 11 处理中
     public static final Integer STATUS_APPLY = 1; // 1申请退款
     public static final Integer STATUS_APPLY11 = 11;
@@ -72,4 +75,10 @@ public class KylinTableStatusConst {
     // 出票状态
     public static final Integer ENTITIES_STATUS0 = 0;    // 未出票
     public static final Integer ENTITIES_STATUS1 = 1;    // 已出票
+
+    /**
+     * 快递
+     */
+    public static final Integer ORDER_EXPRESS_STATUS1 = 1;    // 申请
+    public static final Integer ORDER_EXPRESS_STATUS2 = 2;    //   取消
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/PerformancesExpressController.java

@@ -95,4 +95,42 @@ public class PerformancesExpressController extends BaseController {
         }
     }
 
+    /**
+     * 取消
+     */
+    @RequiresPermissions("kylin:performancesExpress:cancelOrder")
+    @PostMapping("/cancelOrder")
+    @ResponseBody
+    public AjaxResult cancelOrder(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        ResponseDto res = performancesExpressServiceImpl.cancelOrder(performanceExpressSearchAdminParam);
+        try {
+            if (res.isSuccess()) {
+                return success();
+            } else {
+                return error(res.getMessage());
+            }
+        } catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
+    /**
+     * 结果主动查询
+     */
+    @RequiresPermissions("kylin:performancesExpress:getResult")
+    @PostMapping("/getResult")
+    @ResponseBody
+    public AjaxResult getResult(PerformanceExpressSearchAdminParam performanceExpressSearchAdminParam) {
+        ResponseDto res = performancesExpressServiceImpl.getResult(performanceExpressSearchAdminParam);
+        try {
+            if (res.isSuccess()) {
+                return success();
+            } else {
+                return error(res.getMessage());
+            }
+        } catch (Exception e) {
+            return error(e.getMessage());
+        }
+    }
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/performancesExpress/performanceOrderList.html

@@ -69,6 +69,8 @@
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
     var placeOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:placeOrder')}]];
+    var cancelOrderFlag = [[${@permission.hasPermi('kylin:performancesExpress:cancelOrder')}]];
+    var getResultFlag = [[${@permission.hasPermi('kylin:performancesExpress:getResult')}]];
 
     var prefix = ctx + "kylin/performancesExpress";
 
@@ -79,6 +81,8 @@
             url: prefix + "/performanceOrderList",
             modalName: "演出订单",
             placeOrderUrl: prefix + "/placeOrder",
+            cancelOrderUrl: prefix + "/cancelOrder",
+            getResultUrl: prefix + "/getResult",
             columns: [{
                 checkbox: true
             },
@@ -135,7 +139,9 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-danger btn-xs ' + placeOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定下单吗？\', table.options.placeOrderUrl)"></i>下单</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + placeOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定下单吗？\', table.options.placeOrderUrl)"></i>下单</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + cancelOrderFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定取消快递单吗？\', table.options.cancelOrderUrl)"></i>取消</a> ');
+                        actions.push('<a class="btn btn-default btn-xs ' + getResultFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.orderTicketsId + '\', \'确定获取快递信息吗？\', table.options.getResultUrl)"></i>主动获取下单信息</a> ');
                         return actions.join('');
                     }
                 }]

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/MongoVoUtils.java

@@ -167,12 +167,14 @@ public class MongoVoUtils {
         KylinOrderListVo voItem = new KylinOrderListVo();
         KylinOrderTicketVo data;
         if (dataSingle == null) {
-            data = (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
+            data = (KylinOrderTicketVo) dataUtils.getOrderTicketVo(orderId);
+//            data = (KylinOrderTicketVo) redisUtil.get(KylinRedisConst.ORDER + orderId);
         } else {
             data = dataSingle;
         }
         BeanUtils.copyProperties(data, voItem);
-        List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
+        List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) dataUtils.getOrderList(userId);
+//        List<KylinOrderListVo> redisData = (List<KylinOrderListVo>) redisUtil.get(KylinRedisConst.ORDER_LIST + userId);
         if (type == 1) {
             redisVo.add(voItem);
             if (redisData.size() > 0) {

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam.yml

@@ -118,21 +118,14 @@ spring:
     url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&useSSL=false
     username: ${liquidnet.mysql.username}
     password: ${liquidnet.mysql.password}
-    #    type: org.apache.tomcat.jdbc.pool.DataSource
+#    type: org.apache.tomcat.jdbc.pool.DataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    filters: stat
-    maxActive: 200
-    initialSize: 1
-    maxWait: 60000
-    minIdle: 1
-    timeBetweenEvictionRunsMillis: 60000
-    minEvictableIdleTimeMillis: 300000
-    validationQuery: select 'x'
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    poolPreparedStatements: true
-    maxOpenPreparedStatements: 20
+    hikari:
+      maximum-pool-size: 500
+      # 迁移数据暂设10分钟
+      connection-timeout: 600000
+      minimum-idle: 10
+      connection-test-query: SELECT 1
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/PerformanceExpressPerformanceOrderListAdminDao.java

@@ -19,6 +19,7 @@ public class PerformanceExpressPerformanceOrderListAdminDao {
     String expressContacts;
     String expressAddress;
     String expressPhone;
+    String expressStatus;
 
     Integer expressType;
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderExpress.java

@@ -26,10 +26,12 @@ public class KylinOrderExpress implements Serializable {
 
     private String orderExpressId;
     private String orderTicketsId;
+    private String OrderExpressCode;
     private String mailno;
     private Integer expressType;
-    private Integer filterResult;
+    private String filterResult;
     private String remark;
+    private Integer expressStatus;
     private String origincode;
     private String destcode;
     private String printIcon;

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -42,7 +42,7 @@ create table adam_user
 (
     mid         bigint unsigned auto_increment primary key,
     uid         varchar(64) not null,
-    mobile      varchar(30) not null,
+    mobile      varchar(30),
     passwd      varchar(64),
     pay_code    varchar(64),
     state       tinyint default 0 comment '1-NORMAL,2-INVALID',

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamDMAdminController.java

@@ -67,6 +67,7 @@ public class AdamDMAdminController extends AdamBaseController {
                     log.info("==================" + k);
                     dmUserInformationProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
                 });
+                try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
             }
             exec.shutdown();
         } else {
@@ -95,6 +96,7 @@ public class AdamDMAdminController extends AdamBaseController {
                     log.info("==================" + k);
                     dmThirdPartsProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
                 });
+                try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
             }
             exec.shutdown();
         } else {
@@ -123,6 +125,7 @@ public class AdamDMAdminController extends AdamBaseController {
                     log.info("==================" + k);
                     dmRealNameProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
                 });
+                try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
             }
             exec.shutdown();
         } else {
@@ -151,6 +154,7 @@ public class AdamDMAdminController extends AdamBaseController {
                     log.info("==================" + k);
                     dmCollectionProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
                 });
+                try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
             }
             exec.shutdown();
         } else {
@@ -179,6 +183,7 @@ public class AdamDMAdminController extends AdamBaseController {
                     log.info("==================" + k);
                     dmEntersProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
                 });
+                try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
             }
             exec.shutdown();
         } else {
@@ -207,6 +212,7 @@ public class AdamDMAdminController extends AdamBaseController {
                     log.info("==================" + k);
                     dmAddressesProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
                 });
+                try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
             }
             exec.shutdown();
         } else {
@@ -235,6 +241,7 @@ public class AdamDMAdminController extends AdamBaseController {
                     log.info("==================" + k);
                     dmUserMemberProcessor.dataProcessing(k, dG, null, null, k == 0 ? "1" : "");
                 });
+                try { Thread.sleep(100L); } catch (InterruptedException ignored) {}
             }
             exec.shutdown();
         } else {

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMAddressesProcessor.java

@@ -12,11 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -47,15 +47,20 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSetImpl row = null;
+        try {
             Class.forName(DB_DRIVER);
-        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
-
-        PreparedStatement statement = connection.prepareStatement(sqlCount);
-        ResultSetImpl row = (ResultSetImpl) statement.executeQuery();
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
+            statement = connection.prepareStatement(sqlCount);
+            row = (ResultSetImpl) statement.executeQuery();
             row.first();
             int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start.sql:{}", pl, num, pSize, tl, sql);
 
+            row.close();
+            statement.close();
             while (ct > 0) {
                 statement = connection.prepareStatement(sql);
                 int ls = pSize * num;
@@ -68,7 +73,6 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
                 List<AdamAddressesVo> vos = new ArrayList<>();
                 while (row.next()) {
                     String uid = row.getString(2);
-
                     if (!reUidList.contains(uid)) {
                         AdamAddresses addresses = new AdamAddresses();
                         addresses.setAddressesId(row.getString(1));
@@ -88,20 +92,37 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
                         addressesList.add(addresses);
                         vos.add(vo);
                     }
-            }
-            log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, addressesList.size());
-            if (!CollectionUtils.isEmpty(addressesList)) {
+                    if (addressesList.size() == 500) {
                         tl += addressesList.size();
                         mongoTemplate.insert(vos, AdamAddressesVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", adamAddressesService.saveBatch(addressesList));
+                        vos.clear();
+                        addressesList.clear();
                     }
+                }
+                row.close();
+                statement.close();
 
                 num++;
                 ct -= pSize;
+
+                log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, tl);
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
-        row.close();
-        statement.close();
-        connection.close();
+        } catch (Exception e) {
+            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+        }
+        try {
+            if (null != row) row.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != statement) statement.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != connection) connection.close();
+        } catch (SQLException ignored) {
+        }
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMCollectionProcessor.java

@@ -12,11 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -35,7 +35,7 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
             log.info("DM.flush.AdamCollectVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamCollectVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from user_collections where type='TICKET' and status=1 and content_id>=5722 and created_at"+(StringUtils.isBlank(incrDt) ? "<" : ">=")+"curdate()";
+        String sqlCount = "select count(1) from user_collections where type='TICKET' and status=1 and content_id>=5722 and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;
         }
@@ -48,15 +48,20 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSetImpl row = null;
+        try {
             Class.forName(DB_DRIVER);
-        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
-
-        PreparedStatement statement = connection.prepareStatement(sqlCount);
-        ResultSetImpl row = (ResultSetImpl) statement.executeQuery();
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            statement = connection.prepareStatement(sqlCount);
+            row = (ResultSetImpl) statement.executeQuery();
             row.first();
             int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start.sql:{}", pl, num, pSize, tl, sql);
 
+            row.close();
+            statement.close();
             while (ct > 0) {
                 statement = connection.prepareStatement(sql);
                 int ls = pSize * num;
@@ -81,20 +86,37 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
                         collectionList.add(collection);
                         vos.add(AdamCollectVo.getNew().copy(collection));
                     }
-            }
-            log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, collectionList.size());
-            if (!CollectionUtils.isEmpty(collectionList)) {
+                    if (collectionList.size() == 500) {
                         tl += collectionList.size();
                         mongoTemplate.insert(vos, AdamCollectVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", adamCollectionService.saveBatch(collectionList));
+                        vos.clear();
+                        collectionList.clear();
+                    }
                 }
+                row.close();
+                statement.close();
 
                 num++;
                 ct -= pSize;
+
+                log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, tl);
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
-        row.close();
-        statement.close();
-        connection.close();
+        } catch (Exception e) {
+            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+        }
+        try {
+            if (null != row) row.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != statement) statement.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != connection) connection.close();
+        } catch (SQLException ignored) {
+        }
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMEntersProcessor.java

@@ -12,11 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,15 +48,20 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSetImpl row = null;
+        try {
             Class.forName(DB_DRIVER);
-        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
-
-        PreparedStatement statement = connection.prepareStatement(sqlCount);
-        ResultSetImpl row = (ResultSetImpl) statement.executeQuery();
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_MALL, DB_USER, DB_PWD);
+            statement = connection.prepareStatement(sqlCount);
+            row = (ResultSetImpl) statement.executeQuery();
             row.first();
             int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start.sql:{}", pl, num, pSize, tl, sql);
 
+            row.close();
+            statement.close();
             while (ct > 0) {
                 statement = connection.prepareStatement(sql);
                 int ls = pSize * num;
@@ -69,7 +74,6 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
                 List<AdamEntersVo> vos = new ArrayList<>();
                 while (row.next()) {
                     String uid = row.getString(2);
-
                     if (!reUidList.contains(uid)) {
                         AdamEnters enters = new AdamEnters();
                         enters.setEntersId(row.getString(1));
@@ -87,20 +91,37 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
                         entersList.add(enters);
                         vos.add(vo);
                     }
-            }
-            log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, entersList.size());
-            if (!CollectionUtils.isEmpty(entersList)) {
+                    if (entersList.size() == 500) {
                         tl += entersList.size();
                         mongoTemplate.insert(vos, AdamEntersVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", adamEntersService.saveBatch(entersList));
+                        vos.clear();
+                        entersList.clear();
                     }
+                }
+                row.close();
+                statement.close();
 
                 num++;
                 ct -= pSize;
+
+                log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, tl);
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
-        row.close();
-        statement.close();
-        connection.close();
+        } catch (Exception e) {
+            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+        }
+        try {
+            if (null != row) row.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != statement) statement.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != connection) connection.close();
+        } catch (SQLException ignored) {
+        }
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMMemberOrderProcessor.java

@@ -12,11 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -73,15 +73,20 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSetImpl row = null;
+        try {
             Class.forName(DB_DRIVER);
-        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
-
-        PreparedStatement statement = connection.prepareStatement(sqlCount);
-        ResultSetImpl row = (ResultSetImpl) statement.executeQuery();
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            statement = connection.prepareStatement(sqlCount);
+            row = (ResultSetImpl) statement.executeQuery();
             row.first();
             int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start.sql:{}", pl, num, pSize, tl, sql);
 
+            row.close();
+            statement.close();
             while (ct > 0) {
                 statement = connection.prepareStatement(sql);
                 int ls = pSize * num;
@@ -124,20 +129,37 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
                         memberOrderList.add(memberOrder);
                         vos.add(vo);
                     }
-            }
-            log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, memberOrderList.size());
-            if (!CollectionUtils.isEmpty(memberOrderList)) {
+                    if (memberOrderList.size() == 500) {
                         tl += memberOrderList.size();
                         mongoTemplate.insert(vos, AdamMemberOrderVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", adamMemberOrderService.saveBatch(memberOrderList));
+                        vos.clear();
+                        memberOrderList.clear();
+                    }
                 }
+                row.close();
+                statement.close();
 
                 num++;
                 ct -= pSize;
+
+                log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, tl);
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
-        row.close();
-        statement.close();
-        connection.close();
+        } catch (Exception e) {
+            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+        }
+        try {
+            if (null != row) row.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != statement) statement.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != connection) connection.close();
+        } catch (SQLException ignored) {
+        }
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMRealNameProcessor.java

@@ -12,11 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,15 +48,20 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSetImpl row = null;
+        try {
             Class.forName(DB_DRIVER);
-        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
-
-        PreparedStatement statement = connection.prepareStatement(sqlCount);
-        ResultSetImpl row = (ResultSetImpl) statement.executeQuery();
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            statement = connection.prepareStatement(sqlCount);
+            row = (ResultSetImpl) statement.executeQuery();
             row.first();
             int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start.sql:{}", pl, num, pSize, tl, sql);
 
+            row.close();
+            statement.close();
             while (ct > 0) {
                 statement = connection.prepareStatement(sql);
                 int ls = pSize * num;
@@ -90,20 +95,37 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
                         realNameList.add(realName);
                         vos.add(vo);
                     }
-            }
-            log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, realNameList.size());
-            if (!CollectionUtils.isEmpty(realNameList)) {
+                    if (realNameList.size() == 500) {
                         tl += realNameList.size();
                         mongoTemplate.insert(vos, AdamRealInfoVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", adamRealNameService.saveBatch(realNameList));
+                        vos.clear();
+                        realNameList.clear();
+                    }
                 }
+                row.close();
+                statement.close();
 
                 num++;
                 ct -= pSize;
+
+                log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, tl);
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
-        row.close();
-        statement.close();
-        connection.close();
+        } catch (Exception e) {
+            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+        }
+        try {
+            if (null != row) row.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != statement) statement.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != connection) connection.close();
+        } catch (SQLException ignored) {
+        }
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMThirdPartsProcessor.java

@@ -12,11 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -36,7 +36,7 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         }
 
         String sqlCount = "select count(1) from (\n" +
-                "                         select row_number() over (partition by uid,type order by created_at desc) rn,id,uid,open_id,avatar,nickname,type,created_at,updated_at from user_third_parts where `status`=1 and delete_tag in (0,1) and open_id<>'' and uid>0 and created_at"+(StringUtils.isBlank(incrDt) ? "<" : ">=")+"curdate()\n" +
+                "                         select row_number() over (partition by uid,type order by created_at desc) rn,id,uid,open_id,avatar,nickname,type,created_at,updated_at from user_third_parts where `status`=1 and delete_tag in (0,1) and open_id<>'' and uid>0 and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()\n" +
                 "                     ) t where t.rn=1";
         if (null != dg) {
             sqlCount = sqlCount + " and id%" + dG + "=" + dg;
@@ -50,15 +50,20 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSetImpl row = null;
+        try {
             Class.forName(DB_DRIVER);
-        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
-
-        PreparedStatement statement = connection.prepareStatement(sqlCount);
-        ResultSetImpl row = (ResultSetImpl) statement.executeQuery();
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            statement = connection.prepareStatement(sqlCount);
+            row = (ResultSetImpl) statement.executeQuery();
             row.first();
             int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start.sql:{}", pl, num, pSize, tl, sql);
 
+            row.close();
+            statement.close();
             while (ct > 0) {
                 statement = connection.prepareStatement(sql);
                 int ls = pSize * num;
@@ -95,20 +100,37 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
                         thirdPartyList.add(thirdParty);
                         vos.add(vo);
                     }
-            }
-            log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, thirdPartyList.size());
-            if (!CollectionUtils.isEmpty(thirdPartyList)) {
+                    if (thirdPartyList.size() == 500) {
                         tl += thirdPartyList.size();
                         mongoTemplate.insert(vos, AdamThirdPartInfoVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", adamThirdPartyService.saveBatch(thirdPartyList));
+                        vos.clear();
+                        thirdPartyList.clear();
+                    }
                 }
+                row.close();
+                statement.close();
 
                 num++;
                 ct -= pSize;
+
+                log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, tl);
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
-        row.close();
-        statement.close();
-        connection.close();
+        } catch (Exception e) {
+            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+        }
+        try {
+            if (null != row) row.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != statement) statement.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != connection) connection.close();
+        } catch (SQLException ignored) {
+        }
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMUserInformationProcessor.java

@@ -18,11 +18,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -68,15 +68,20 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         }
         sql += " order by uid limit ?,?";
 
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSetImpl row = null;
+        try {
             Class.forName(DB_DRIVER);
-        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
-
-        PreparedStatement statement = connection.prepareStatement(sqlCount);
-        ResultSetImpl row = (ResultSetImpl) statement.executeQuery();
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            statement = connection.prepareStatement(sqlCount);
+            row = (ResultSetImpl) statement.executeQuery();
             row.first();
             int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start.sql:{}", pl, num, pSize, tl, sql);
 
+            row.close();
+            statement.close();
             while (ct > 0) {
                 statement = connection.prepareStatement(sql);
                 int ls = pSize * num;
@@ -132,21 +137,38 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                         userInfoList.add(userInfo);
                         vos.add(vo);
                     }
-            }
-            log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, userList.size());
-            if (!CollectionUtils.isEmpty(userList)) {
+                    if (userList.size() == 500) {
                         tl += userList.size();
                         mongoTemplate.insert(vos, AdamUserInfoVo.class.getSimpleName());
-                log.info("DM.execute.limit.result:{}", adamUserService.saveBatch(userList));
-                log.info("DM.execute.limit.result:{}", adamUserInfoService.saveBatch(userInfoList));
+                        log.info("DM.execute.result:{} - {}", adamUserService.saveBatch(userList), adamUserInfoService.saveBatch(userInfoList));
+                        vos.clear();
+                        userList.clear();
+                        userInfoList.clear();
+                    }
                 }
+                row.close();
+                statement.close();
 
                 num++;
                 ct -= pSize;
+
+                log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, tl);
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
-        row.close();
-        statement.close();
-        connection.close();
+        } catch (Exception e) {
+            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+        }
+        try {
+            if (null != row) row.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != statement) statement.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != connection) connection.close();
+        } catch (SQLException ignored) {
+        }
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/processor/DMUserMemberProcessor.java

@@ -12,11 +12,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -48,15 +48,20 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSetImpl row = null;
+        try {
             Class.forName(DB_DRIVER);
-        Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
-
-        PreparedStatement statement = connection.prepareStatement(sqlCount);
-        ResultSetImpl row = (ResultSetImpl) statement.executeQuery();
+            connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+            statement = connection.prepareStatement(sqlCount);
+            row = (ResultSetImpl) statement.executeQuery();
             row.first();
             int ct = row.getInt(1), pSize = 1000, num = 0, tl = 0, pl = ct;
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> start.sql:{}", pl, num, pSize, tl, sql);
 
+            row.close();
+            statement.close();
             while (ct > 0) {
                 statement = connection.prepareStatement(sql);
                 int ls = pSize * num;
@@ -91,20 +96,37 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
                         userMemberList.add(userMember);
                         vos.add(vo);
                     }
-            }
-            log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, userMemberList.size());
-            if (!CollectionUtils.isEmpty(userMemberList)) {
+                    if (userMemberList.size() == 500) {
                         tl += userMemberList.size();
                         mongoTemplate.insert(vos, AdamUserMemberVo.class.getSimpleName());
                         log.info("DM.execute.limit.result:{}", adamUserMemberService.saveBatch(userMemberList));
+                        vos.clear();
+                        userMemberList.clear();
+                    }
                 }
+                row.close();
+                statement.close();
 
                 num++;
                 ct -= pSize;
+
+                log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, tl);
             }
             log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
-        row.close();
-        statement.close();
-        connection.close();
+        } catch (Exception e) {
+            log.error("ex:getConnection,dG/dg:{}/{},msg:{}", dG, dg, e.getMessage());
+        }
+        try {
+            if (null != row) row.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != statement) statement.close();
+        } catch (SQLException ignored) {
+        }
+        try {
+            if (null != connection) connection.close();
+        } catch (SQLException ignored) {
+        }
     }
 }