Merge branch 'dev' of http://gitlab.zhengzai.tv/dongjingwei/liquidnet-bus-v1 into dev

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

 package com.liquidnet.service.kylin.constant;
 
+import sun.management.resources.agent;
+
 public class KylinRedisConst {
     public static final String FIELDS = "kylin:fields:id";
     public static final String PERFORMANCES = "kylin:performances:id:";
@@ -10,7 +12,7 @@ public class KylinRedisConst {
     public static final String PERFORMANCES_LIST_RECOMMEND = "kylin:performances:recommend";
     public static final String PERFORMANCES_LIST_EXCLUSIVE = "kylin:performances:exclusive";
     public static final String PERFORMANCES_ROADLIST = "kylin:performances:roadShowId:";
-    public static final String PERFORMANCES_RECOMMEND = "kylin:performances:recommend:id:";
+    public static final String PERFORMANCES_AGENT_INFO = "kylin:agent:hash:id:";
     public static final String PERFORMANCES_INVENTORY = "kylin:performances_inventory:ticket:id:";
     public static final String SURPLUS_GENERAL = "surplusGeneral";
     public static final String SURPLUS_EXCHANGE = "surplusExchange";
@@ -18,7 +20,6 @@ public class KylinRedisConst {
     public static final String ORDER = "kylin:order:id:";
     public static final String ORDER_ENTITIES = "kylin:order_entities:id:";
     public static final String TIMES = "kylin:times:id:";
-    public static final String BANNERS = "kylin:banners:id:";
     public static final String AGENT = "kylin:agent:info";
     public static final String ORDER_LIST = "kylin:order:list:userId:";
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinPerformanceVo.java

@@ -104,6 +104,9 @@ public class KylinPerformanceVo {
     @ApiModelProperty(value = "场次")
     private List<KylinTicketTimesVo> ticketTimeList;
 
+    @ApiModelProperty(value = "分销人名称")
+    private String agentName;
+
     public void setPerformance(KylinPerformances performance) {
         this.mid = performance.getMid();
         this.performancesId = performance.getPerformancesId();

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

@@ -34,20 +34,20 @@
                                 <option value="desc">倒序</option>
                             </select>
                         </li>
-<!--                        <li>-->
-<!--                            <label>演出状态：</label>-->
-<!--                            <select name="status">-->
-<!--                                <option value="-2">全部</option>-->
-<!--                                <option value="1">审核中</option>-->
-<!--                                <option value="3">审核通过</option>-->
-<!--                                <option value="4">审核拒绝</option>-->
-<!--                                <option value="6">售卖</option>-->
-<!--                                <option value="7">已下架</option>-->
-<!--                                <option value="8">售罄</option>-->
-<!--                                <option value="9">未开始</option>-->
-<!--                                <option value="10">演出结束</option>-->
-<!--                            </select>-->
-<!--                        </li>-->
+                        <li style="visibility: hidden">
+                            <label>演出状态：</label>
+                            <select name="status">
+                                <option value="-2">全部</option>
+                                <option value="1">审核中</option>
+                                <option value="3">审核通过</option>
+                                <option value="4">审核拒绝</option>
+                                <option value="6">售卖</option>
+                                <option value="7">已下架</option>
+                                <option value="8">售罄</option>
+                                <option value="9">未开始</option>
+                                <option value="10">演出结束</option>
+                            </select>
+                        </li>
                         <li>
                             <label>审核状态：</label>
                             <select name="auditStatus">

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

@@ -125,7 +125,7 @@
                         var expressContacts = row.expressContacts;
                         var expressAddress = row.expressAddress;
                         var expressPhone = row.expressPhone;
-                        return '姓名：'+expressContacts+'<br>'+'手机号：'+expressPhone+'<br>'+'地址：'+expressAddress;
+                        return '姓名：'+expressContacts+'<br>'+'地址：'+expressAddress+'<br>'+'手机号：'+expressPhone;
                     }
                 },
                 {

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

@@ -246,14 +246,21 @@ public class DataUtils {
             allTicketId.put(timeItem.getUseStart(), ticketList);
         }
 
+        System.out.println(" PERFORMANCE_ID = "+performanceId);
+
         if (0 == isTrueName) {
             redisKey = KylinRedisConst.USERID_BUY_INFO + userId;
         } else {
             redisKey = KylinRedisConst.IDCARD_BUY_INFO + idCard;
         }
+
+        System.out.println(" REDIS KEY= "+redisKey);
+
         String performanceIdKey = redisKey + ":" + KylinRedisConst.PERFORMANCE_ID + ":" + performanceId;
         String ticketIdKey = redisKey + ":" + KylinRedisConst.TICKET_ID + ":" + ticketId;
         String ticketUseTimeKey = ticketIdKey + ":" + KylinRedisConst.USE_TIME;
+        System.out.println("PERFORMANCEID REDIS KEY = "+performanceIdKey);
+        System.out.println("TICKETID REDIS KEY = "+ticketIdKey);
         redisUtil.set(ticketUseTimeKey, useTime);
         if (buyCount > 0) {
             redisUtil.incr(ticketIdKey, buyCount);
@@ -278,6 +285,7 @@ public class DataUtils {
                     }
                 }
             } else {
+                System.out.println("BUY_COUNT = "+buyCount);
                 redisUtil.incr(performanceIdKey, buyCount);
             }
         } else {

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/GenSnowFlowerUtil.java

@@ -10,7 +10,7 @@ import java.net.UnknownHostException;
 import java.util.Arrays;
 
 public class GenSnowFlowerUtil {
-    private static final long twepoch = 961430400000L;
+    private static final long twepoch = 1624550400000L;
     private static final long workerIdBits = 5L;
     private static final long dataCenterIdBits = 5L;
     //// 最大支持机器节点数0~31，一共32个

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/filter/GlobalAuthorityInterceptor.java

@@ -42,7 +42,7 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
     private static final String ENV_PROD = "prod";
     private static final String ENV_ACTIVE = "spring.profiles.active";
 
-    private static final String KYLIN_STATION_JWT_VALID = "/station/**";
+    private static final String KYLIN_STATION_JWT_VALID = "*/station/**";
 
     private final static AntPathMatcher antPathMatcher = new AntPathMatcher();
 

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

@@ -121,7 +121,7 @@ spring:
     #    type: org.apache.tomcat.jdbc.pool.DataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
     filters: stat
-    maxActive: 20
+    maxActive: 200
     initialSize: 1
     maxWait: 60000
     minIdle: 1

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -198,7 +198,7 @@
         FROM kylin_order_tickets AS ot
         LEFT JOIN kylin_order_ticket_status AS ots ON ots.order_id = ot.order_tickets_id
         LEFT JOIN kylin_order_ticket_relations AS otr ON otr.order_id = ot.order_tickets_id
-        WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -pay_countdown_minute MINUTE)
+        WHERE status = 0 AND NOW() > DATE_SUB(ot.created_at,INTERVAL -(pay_countdown_minute+1) MINUTE)
         <if test="userId!=''">
             AND user_id = #{userId}
         </if>

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

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamAddressesVo;
 import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
@@ -15,7 +14,9 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,16 +28,16 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        String lS = request.getParameter(DM_LS), incrDt = request.getParameter(DM_INCR_DT),
-                flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
-        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
+        if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.addresses:{}", userMapper.executeForDM("adam_addresses"));
             log.info("DM.flush.AdamAddressesVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamAddressesVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from addresses where created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        if (null != dg) {
+            sqlCount = sqlCount + " and id%" + dG + "=" + dg;
+        }
         String field = "id,user_id,user_name,user_phone,province,city,county,user_address,defaultDelivery,created_at";
 //                     1-id,2-user_id,3-user_name,4-user_phone,5-province,6-city,7-county,8-user_address,9-defaultDelivery,10-created_at
         String sql = sqlCount.replace("count(1)", field);
@@ -46,15 +47,18 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        statement = connection.prepareStatement(sqlCount);
-        row = (ResultSetImpl) statement.executeQuery();
+        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();
         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);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            int ls = pSize * num;
             statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
@@ -96,5 +100,8 @@ public class DMAddressesProcessor extends DataMigrationProcessorService {
             ct -= pSize;
         }
         log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
+        row.close();
+        statement.close();
+        connection.close();
     }
 }

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

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
 import com.liquidnet.service.adam.entity.AdamCollection;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
@@ -15,7 +14,9 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,17 +28,17 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        String lS = request.getParameter(DM_LS), incrDt = request.getParameter(DM_INCR_DT),
-                flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
-        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
+        if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.collection:{}", userMapper.executeForDM("adam_collection"));
 
             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()";
+        if (null != dg) {
+            sqlCount = sqlCount + " and id%" + dG + "=" + dg;
+        }
         String field = "uid,content_id,`type`,`status`,created_at,updated_at";
 //                     1-uid,2-content_id,3-`type`,4-`status`,5-created_at,6-updated_at
         String sql = sqlCount.replace("count(1)", field);
@@ -47,15 +48,18 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        statement = connection.prepareStatement(sqlCount);
-        row = (ResultSetImpl) statement.executeQuery();
+        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();
         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);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            int ls = pSize * num;
             statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
@@ -89,5 +93,8 @@ public class DMCollectionProcessor extends DataMigrationProcessorService {
             ct -= pSize;
         }
         log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
+        row.close();
+        statement.close();
+        connection.close();
     }
 }

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

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamEntersVo;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
@@ -15,7 +14,9 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,17 +28,17 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        String lS = request.getParameter(DM_LS), incrDt = request.getParameter(DM_INCR_DT),
-                flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
-        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
+        if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.enters:{}", userMapper.executeForDM("adam_enters"));
 
             log.info("DM.flush.AdamEntersVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamEntersVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from enters where (type <> 1 or (type = 1 and is_certification = 'yes')) and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        if (null != dg) {
+            sqlCount = sqlCount + " and id%" + dG + "=" + dg;
+        }
         String field = "id,user_id,type,`name`,mobile,idcode,if(is_default='no', 0, 1),created_at";
 //                     1-id,2-user_id,3-type,4-`name`,5-mobile,6-idcode,7-if(is_default='no', 0, 1),8-created_at
         String sql = sqlCount.replace("count(1)", field);
@@ -47,15 +48,18 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        statement = connection.prepareStatement(sqlCount);
-        row = (ResultSetImpl) statement.executeQuery();
+        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();
         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);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            int ls = pSize * num;
             statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
@@ -95,5 +99,8 @@ public class DMEntersProcessor extends DataMigrationProcessorService {
             ct -= pSize;
         }
         log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
+        row.close();
+        statement.close();
+        connection.close();
     }
 }

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

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamMemberCodeVo;
 import com.liquidnet.service.adam.entity.AdamMemberCode;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
@@ -15,7 +14,9 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -180,32 +181,35 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        String lS = request.getParameter(DM_LS), incrDt = request.getParameter(DM_INCR_DT),
-                flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
-        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
+        if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.member_code:{}", userMapper.executeForDM("adam_member_code"));
 
             log.info("DM.flush.AdamMemberCodeVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberCodeVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from vip_card_codes where buy_order_id <> use_order_id or status=0";
+        if (null != dg) {
+            sqlCount = sqlCount + " and id%" + dG + "=" + dg;
+        }
         String field = "vip_card_code,`type`+1,card_number,`status`,created_at,updated_at,buy_order_id,buy_uid,buy_time,use_order_id,use_uid,use_time";
 //      1-vip_card_code,2-`type`+1,3-card_number,4-`status`,5-created_at,6-updated_at,
 //      7-buy_order_id,8-buy_uid,9-buy_time,10-use_order_id,11-use_uid,12-use_time
         String sql = sqlCount.replace("count(1)", field);
         sql += " order by id limit ?,?";
 
-        statement = connection.prepareStatement(sqlCount);
-        row = (ResultSetImpl) statement.executeQuery();
+        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();
         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);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            int ls = pSize * num;
             statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
@@ -248,5 +252,8 @@ public class DMMemberCodeProcessor extends DataMigrationProcessorService {
             ct -= pSize;
         }
         log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
+        row.close();
+        statement.close();
+        connection.close();
     }
 }

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

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamMemberOrderVo;
 import com.liquidnet.service.adam.entity.AdamMemberOrder;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
@@ -15,7 +14,9 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -51,17 +52,17 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        String lS = request.getParameter(DM_LS), incrDt = request.getParameter(DM_INCR_DT),
-                flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
-        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
+        if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.member_order:{}", userMapper.executeForDM("adam_member_order"));
 
             log.info("DM.flush.AdamMemberOrderVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamMemberOrderVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_vip_card_orders where status in (1,5) and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        if (null != dg) {
+            sqlCount = sqlCount + " and id%" + dG + "=" + dg;
+        }
         String field = "order_code,uid,order_sub_type,vip_card_price,price,status,card_number,birthday,pay_type,pay_code,pay_at,created_at,updated_at,client_ip,source,version";
 //      1-order_code,2-uid,3-order_sub_type,4-vip_card_price,5-price,6-status,7-card_number,8-birthday,
 //      9-pay_type,10-pay_code,11-pay_at,12-created_at,13-updated_at,14-client_ip,15-source,16-version
@@ -72,15 +73,18 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        statement = connection.prepareStatement(sqlCount);
-        row = (ResultSetImpl) statement.executeQuery();
+        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();
         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);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            int ls = pSize * num;
             statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
@@ -132,5 +136,8 @@ public class DMMemberOrderProcessor extends DataMigrationProcessorService {
             ct -= pSize;
         }
         log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
+        row.close();
+        statement.close();
+        connection.close();
     }
 }

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

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamRealInfoVo;
 import com.liquidnet.service.adam.entity.AdamRealName;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
@@ -15,7 +14,9 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,17 +28,17 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        String lS = request.getParameter(DM_LS), incrDt = request.getParameter(DM_INCR_DT),
-                flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
-        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
+        if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.real_name:{}", userMapper.executeForDM("adam_real_name"));
 
             log.info("DM.flush.AdamRealInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamRealInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_real_name where id not in (9145,7456,7448,7197,7194,4137,4138,4139,269,261,262,263,264,265,266,267,251) and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        if (null != dg) {
+            sqlCount = sqlCount + " and id%" + dG + "=" + dg;
+        }
         String field = "id,uid,real_name,id_card,ifnull(created_at, '1970-01-01 00:00:00') created_at,updated_at";
 //                     1-id,2-uid,3-real_name,4-id_card,5-created_at,6-updated_at
         String sql = sqlCount.replace("count(1)", field);
@@ -47,15 +48,18 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        statement = connection.prepareStatement(sqlCount);
-        row = (ResultSetImpl) statement.executeQuery();
+        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();
         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);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            int ls = pSize * num;
             statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
@@ -98,5 +102,8 @@ public class DMRealNameProcessor extends DataMigrationProcessorService {
             ct -= pSize;
         }
         log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
+        row.close();
+        statement.close();
+        connection.close();
     }
 }

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

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
 import com.liquidnet.service.adam.entity.AdamThirdParty;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
@@ -15,7 +14,9 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,11 +28,8 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        String lS = request.getParameter(DM_LS), incrDt = request.getParameter(DM_INCR_DT),
-                flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
-        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
+        if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.third_party:{}", userMapper.executeForDM("adam_third_party"));
 
             log.info("DM.flush.AdamThirdPartInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamThirdPartInfoVo.class.getSimpleName()).getDeletedCount());
@@ -40,6 +38,9 @@ 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" +
                 "                     ) t where t.rn=1";
+        if (null != dg) {
+            sqlCount = sqlCount + " and id%" + dG + "=" + dg;
+        }
         String field = "uid,open_id,avatar,nickname,type,created_at,updated_at";
 //                     1-uid,2-open_id,3-avatar,4-nickname,5-type,6-created_at,7-updated_at
         String sql = sqlCount.replace("count(1)", field);
@@ -49,15 +50,18 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        statement = connection.prepareStatement(sqlCount);
-        row = (ResultSetImpl) statement.executeQuery();
+        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();
         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);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            int ls = pSize * num;
             statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
@@ -103,5 +107,8 @@ public class DMThirdPartsProcessor extends DataMigrationProcessorService {
             ct -= pSize;
         }
         log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
+        row.close();
+        statement.close();
+        connection.close();
     }
 }

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

 package com.liquidnet.service.adam.service.processor;
 
 import com.liquidnet.common.cache.redis.util.RedisUtil;
-import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamMemberPriceVo;
 import com.liquidnet.service.adam.dto.vo.AdamMemberVo;
-import com.liquidnet.service.adam.dto.vo.AdamThirdPartInfoVo;
 import com.liquidnet.service.adam.entity.AdamMember;
 import com.liquidnet.service.adam.entity.AdamMemberPrice;
 import com.liquidnet.service.adam.mapper.AdamMemberMapper;
@@ -20,7 +18,9 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
 @Slf4j
@@ -36,9 +36,8 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
     AdamMemberPriceMapper memberPriceMapper;
 
     @Override
-    protected void dataProcessing() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
+        if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.member:{}", userMapper.executeForDM("adam_member"));
             log.info("DM.flush.member_price:{}", userMapper.executeForDM("adam_member_price"));
 
@@ -54,8 +53,12 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
         try {
             String sql = "select id,`name`,sub_title,icon,avatar,min_card_number,if(`type`='VIP',1,0),interests_detail,notes,created_at,updated_at,is_notice,vip_notice,vip_notice_title,need_question,display_agreement,status,limitation from vip_cards";
 //        1-id,2-`name`,3-sub_title,4-icon,5-avatar,6-min_card_number,7-`type`,8-interests_detail,9-notes,10-created_at,11-updated_at,12-is_notice,13-vip_notice,14-vip_notice_title,15-need_question,16-display_agreement,17-status,18-limitation
-            statement = connection.prepareStatement(sql);
-            row = (ResultSetImpl) statement.executeQuery();
+
+            Class.forName(DB_DRIVER);
+            Connection connection = DriverManager.getConnection(DB_URL + DB_NAME_PASSPORT, DB_USER, DB_PWD);
+
+            PreparedStatement statement = connection.prepareStatement(sql);
+            ResultSetImpl row = (ResultSetImpl) statement.executeQuery();
             row.first();
 
             AdamMember o = new AdamMember();
@@ -83,6 +86,10 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
 
             memberMapper.insert(o);
             mongoTemplate.insert(vo, AdamMemberVo.class.getSimpleName());
+
+            row.close();
+            statement.close();
+            connection.close();
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
@@ -93,8 +100,14 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
         try {
             String sql = "select id,vip_card_id,status,name,price,days,detail,created_at,updated_at from vip_card_prices";
 //        1-id,2-vip_card_id,3-status,4-name,5-price,6-days,7-detail,8-created_at,9-updated_at
-            statement = connection.prepareStatement(sql);
-            row = (ResultSetImpl) statement.executeQuery();
+
+            Class.forName(DB_DRIVER);
+//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/passport";
+            String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/passport";
+            Connection connection = DriverManager.getConnection(url, "readonly", "ZWDsf8Fy");
+
+            PreparedStatement statement = connection.prepareStatement(sql);
+            ResultSetImpl row = (ResultSetImpl) statement.executeQuery();
             row.first();
 
             AdamMemberPrice o = new AdamMemberPrice();
@@ -113,51 +126,12 @@ public class DMTracesInfoProcessor extends DataMigrationProcessorService {
 
             memberPriceMapper.insert(o);
             mongoTemplate.insert(vo, AdamMemberPriceVo.class.getSimpleName());
+
+            row.close();
+            statement.close();
+            connection.close();
         } catch (SQLException throwables) {
             throwables.printStackTrace();
         }
     }
-
-
-
-
-
-//    @SneakyThrows
-//    @Override
-//    protected void dataProcessing(boolean flg) {
-//        String sqlCount = "select count(1) from addresses where 1=1";
-//        String field = "id,user_id,user_name,user_phone,province,city,county,user_address,defaultDelivery,created_at";
-////                     1-id,2-user_id,3-user_name,4-user_phone,5-province,6-city,7-county,8-user_address,9-defaultDelivery,10-created_at
-//        String sql = sqlCount.replace("count(1)", field);
-//
-//        if (flg) {
-//            sqlCount += " and user_id in ('2026628','544327','1997335','773650','809406')";
-//            sql += " and user_id in ('2026628','544327','1997335','773650','809406')";
-//        }
-//
-//        sql += " limit ?,?";
-//
-//        statement = connection.prepareStatement(sqlCount);
-//        resultSet = statement.executeQuery();
-//        resultSet.first();
-//        int ct = resultSet.getInt(1), pSize = 2, num = 0;
-//        log.info("DM数据迁移总数:{}", ct);
-//
-//
-//
-//        while (ct > 0) {
-//            statement = connection.prepareStatement(sql);
-//            statement.setInt(1, pSize * num);
-//            statement.setInt(2, pSize);
-//            resultSet = statement.executeQuery();
-//            log.info("DM.execute.limit:[pNo:{},pSize:{}]", pSize * num, pSize);
-//            while (resultSet.next()) {
-//
-//            }
-//
-//
-//            num++;
-//            ct -= pSize;
-//        }
-//    }
 }

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

 package com.liquidnet.service.adam.service.processor;
 
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
-import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamTagVo;
 import com.liquidnet.service.adam.dto.vo.AdamUserInfoVo;
 import com.liquidnet.service.adam.entity.AdamUser;
@@ -22,8 +20,9 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.servlet.http.HttpServletRequest;
-import java.sql.SQLException;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -37,8 +36,6 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
     @Autowired
     IAdamUserInfoService adamUserInfoService;
 
-    public static final String DM_FAILED_USER = "dm:failed:uid";
-    public static final String DM_EXISTS_USER = "dm:exists:uid";
     public static Map<String, AdamTagVo> sexMap = new HashMap<>();
 
     static {
@@ -49,18 +46,19 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        String lS = request.getParameter(DM_LS), incrDt = request.getParameter(DM_INCR_DT),
-                flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
-        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
+        if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.user:{}", userMapper.executeForDM("adam_user"));
             log.info("DM.flush.user_info:{}", userMapper.executeForDM("adam_user_info"));
 
             log.info("DM.flush.AdamUserInfoVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserInfoVo.class.getSimpleName()).getDeletedCount());
         }
 
-        String sqlCount = "select count(1) from users where delete_tag in (0,1) and length(mobile)=11 and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+//        String sqlCount = "select count(1) from users where delete_tag in (0,1) and length(mobile)=11 and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        String sqlCount = "select count(1) from users where delete_tag in (0,1) and created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        if (null != dg) {
+            sqlCount = sqlCount + " and uid%" + dG + "=" + dg;
+        }
         String field = "uid,mobile,username,sex,birthday,area,sign,face_url,back_url,created_at,updated_at,is_complete,rong_cloud_token,rong_cloud_tag";
 //                     1-uid,2-mobile,3-username,4-sex,5-birthday,6-area,7-sign,8-face_url,9-back_url,10-created_at,11-updated_at,12-is_complete,13-rong_cloud_token,14-rong_cloud_tag
         String sql = sqlCount.replace("count(1)", field);
@@ -70,15 +68,18 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
         }
         sql += " order by uid limit ?,?";
 
-        statement = connection.prepareStatement(sqlCount);
-        row = (ResultSetImpl) statement.executeQuery();
+        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();
         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);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            int ls = pSize * num;
             statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
@@ -88,13 +89,9 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
             List<AdamUserInfo> userInfoList = new ArrayList<>();
             List<AdamUserInfoVo> vos = new ArrayList<>();
             while (row.next()) {
-                try {
                 AdamTagVo sex = sexMap.get(row.getString(4));
                 String uid = row.getString(1);
                 if (!reUidList.contains(uid)) {
-//                        if (userMapper.selectCount(Wrappers.lambdaQuery(AdamUser.class).eq(AdamUser::getUid, uid)) > 0) {
-//                            redisUtil.lSet(DM_EXISTS_USER, uid);
-//                        } else {
                     AdamUser user = new AdamUser();
                     user.setUid(uid);
                     user.setMobile(row.getString(2));
@@ -134,12 +131,6 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
                     userList.add(user);
                     userInfoList.add(userInfo);
                     vos.add(vo);
-//                        }
-                    }
-                } catch (SQLException throwables) {
-                    redisUtil.lSet(DM_FAILED_USER, row.getString(1));
-                    log.error("DM数据处理异常[uid:{},mobile:{}],{} - {}", row.getString(1), row.getString(2),
-                            throwables.getErrorCode(), throwables.getMessage());
                 }
             }
             log.info("DM.execute.limit {},{} - handle.counts:{}", ls, pSize, userList.size());
@@ -154,5 +145,8 @@ public class DMUserInformationProcessor extends DataMigrationProcessorService {
             ct -= pSize;
         }
         log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
+        row.close();
+        statement.close();
+        connection.close();
     }
 }

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

 package com.liquidnet.service.adam.service.processor;
 
-import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.adam.dto.vo.AdamUserMemberVo;
 import com.liquidnet.service.adam.entity.AdamUserMember;
 import com.liquidnet.service.adam.service.DataMigrationProcessorService;
@@ -15,7 +14,9 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import javax.servlet.http.HttpServletRequest;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.PreparedStatement;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -27,17 +28,17 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
 
     @SneakyThrows
     @Override
-    protected void dataProcessing() {
-        HttpServletRequest request = ServletUtils.getRequest();
-        String lS = request.getParameter(DM_LS), incrDt = request.getParameter(DM_INCR_DT),
-                flg = StringUtils.defaultIfBlank(request.getParameter(DM_FLG), "");
-        if (StringUtils.isNotEmpty(request.getParameter(DM_FLUSH))) {
+    public void dataProcessing(Integer dg, Integer dG, String incrDt, String flg, String flu) {
+        if (StringUtils.isNotEmpty(flu)) {
             log.info("DM.flush.user_member:{}", userMapper.executeForDM("adam_user_member"));
 
             log.info("DM.flush.AdamUserMemberVo:{}", mongoTemplate.remove(Query.query(Criteria.where("_id").exists(true)), AdamUserMemberVo.class.getSimpleName()).getDeletedCount());
         }
 
         String sqlCount = "select count(1) from user_cards where created_at" + (StringUtils.isBlank(incrDt) ? "<" : ">=") + "curdate()";
+        if (null != dg) {
+            sqlCount = sqlCount + " and id%" + dG + "=" + dg;
+        }
         String field = "uid,card_id,card_number,`status`,expired_at,created_at,updated_at";
 //                     1-uid,2-card_id,3-card_number,4-status,5-expired_at,6-created_at,7-updated_at
         String sql = sqlCount.replace("count(1)", field);
@@ -47,15 +48,18 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
         }
         sql += " order by id limit ?,?";
 
-        statement = connection.prepareStatement(sqlCount);
-        row = (ResultSetImpl) statement.executeQuery();
+        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();
         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);
 
         while (ct > 0) {
             statement = connection.prepareStatement(sql);
-            int ls = (num == 0 && StringUtils.isNotEmpty(lS)) ? Integer.parseInt(lS) : pSize * num;
+            int ls = pSize * num;
             statement.setInt(1, ls);
             statement.setInt(2, pSize);
             row = (ResultSetImpl) statement.executeQuery();
@@ -99,5 +103,8 @@ public class DMUserMemberProcessor extends DataMigrationProcessorService {
             ct -= pSize;
         }
         log.info("DM.execute.counts:{}/{},{} ~ {} ----------------------------> end", pl, num, pSize, tl);
+        row.close();
+        statement.close();
+        connection.close();
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java

@@ -5,7 +5,6 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.PayDetailVo;
 import com.liquidnet.service.kylin.service.IKylinLackRegistersService;
-import com.liquidnet.service.kylin.service.impl.KylinLackRegistersServiceImpl;
 import com.liquidnet.service.kylin.service.impl.KylinPerformancesServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -145,14 +144,16 @@ public class KylinPerformancesController {
     @ApiImplicitParams({
             @ApiImplicitParam(type = "path", dataType = "String", name = "performancesId", value = "演出id", required = true),
             @ApiImplicitParam(type = "query", dataType = "double", name = "latitudeFrom", value = "经纬度"),
-            @ApiImplicitParam(type = "query", dataType = "double", name = "longitudeFrom", value = "经纬度")
+            @ApiImplicitParam(type = "query", dataType = "double", name = "longitudeFrom", value = "经纬度"),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "agentId", value = "分销用户id")
     })
     public ResponseDto<KylinPerformanceVo> detail(
             @PathVariable("performancesId") String performancesId,
             @RequestParam(defaultValue = "0") double latitudeFrom,
-            @RequestParam(defaultValue = "0") double longitudeFrom
+            @RequestParam(defaultValue = "0") double longitudeFrom,
+            @RequestParam(defaultValue = "0") String agentId
     ) {
-        KylinPerformanceVo result = kylinPerformancesService.detail(performancesId, latitudeFrom, longitudeFrom);
+        KylinPerformanceVo result = kylinPerformancesService.detail(performancesId, latitudeFrom, longitudeFrom, agentId);
         if (result != null) {
             return ResponseDto.success(result);
         } else {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -278,6 +278,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                             int age = IDCard.getAgeByIdCard(adamEnters.getIdCard());
                             if (age > 25) {
                                 redisLockUtil.unlock(lock);
+                                dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
                                 return ResponseDto.failure(ErrorMapping.get("20017"));//年龄超了
                             }
                         }
@@ -294,6 +295,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                         log.debug("redis 判断库存 -> time:" + (currentTime) + "毫秒");
                         if (!res1.equals("")) {
                             redisLockUtil.unlock(lock);
+                            dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
                             return ResponseDto.failure(res1);//乱七八糟异常
                         }
                     }
@@ -306,6 +308,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     currentTime = System.currentTimeMillis() - currentTime;
                     if (!res1.equals("")) {
                         redisLockUtil.unlock(lock);
+                        dataUtils.changeSurplusGeneral(payOrderParam.getTicketId(), payOrderParam.getNumber());
                         return ResponseDto.failure(res1);//乱七八糟异常
                     }
                     currentTime = System.currentTimeMillis() - currentTime;
@@ -918,11 +921,15 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                                 DateUtil.parse(item.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
                                 DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
                         ));
+                        if(item.getRestTime()<=0L){
+                            item.setRestTime(0L);
+                        }
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
                     log.debug("item.getOverdueAt() = " + item.getOverdueAt());
                     log.debug("DateUtil.getNowTime() = " + DateUtil.getNowTime());
+                    log.debug("item.getRestTime() = " + item.getRestTime());
                 } else {
                     item.setRestTime(0L);
                 }
@@ -1006,6 +1013,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                             DateUtil.parse(orderTicketVo.getOverdueAt(), "yyyy-MM-dd HH:mm:ss"),
                             DateUtil.parse(DateUtil.getNowTime(), "yyyy-MM-dd HH:mm:ss")
                     ));
+                    if(vo.getRestTime()<=0L){
+                        vo.setRestTime(0L);
+                    }
                 } else {
                     vo.setRestTime(0L);
                 }
@@ -1025,6 +1035,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             log.info(UserPathDto.setData("订单列表", orderId, vo));
             return vo;
         } catch (Exception e) {
+            e.printStackTrace();
             return vo;
         }
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.CommonConst;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.DistanceUtil;
-import com.liquidnet.commons.lang.util.ServletUtils;
 import com.liquidnet.service.base.UserPathDto;
 import com.liquidnet.service.kylin.constant.KylinPerformanceStatusEnum;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
@@ -55,9 +54,6 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
     @Autowired
     private PerformanceVoTask task;
 
-    @Autowired
-    private KylinPerformancesMapper performancesMapper;
-
     public HashMap<String, Object> localList(
             int days, String cityName, int type,
             Integer isDiscount, Integer isAdvance, Integer isExclusive,
@@ -135,7 +131,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         info.put("total", 0);
         info.put("list", performancesListNew);
 
-        log.info(UserPathDto.setData("演出列表","cityName="+cityName+" type="+type+" isDiscount="+isDiscount+"isAdvance ="+isAdvance+" isExclusive="+isExclusive,info));
+        log.info(UserPathDto.setData("本地演出列表", "cityName=" + cityName + " type=" + type + " isDiscount=" + isDiscount + " isAdvance =" + isAdvance + " isExclusive=" + isExclusive + " days=" + days, info));
         return info;
     }
 
@@ -168,14 +164,14 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         return performancesListExclusive;
     }
 
-    public KylinPerformanceVo detail(String performancesId, double latitudeFrom, double longitudeFrom) {
+    public KylinPerformanceVo detail(String performancesId, double latitudeFrom, double longitudeFrom, String agentId) {
         KylinPerformanceVo performancesInfo = dataUtils.getPerformanceVo(performancesId);
+        String agentName = dataUtils.getAgentInfoName(agentId);
+        performancesInfo.setAgentName(agentName);
         try {
             performancesInfo = checkAppStatusInfo(performancesInfo);
             performancesInfo.setMessage(KylinPerformanceStatusEnum.getName(performancesInfo.getAppStatus()));
         } catch (Exception e) {
-            log.debug(" ERROR PERFORMANCE DETAILS AGENT : " +  ServletUtils.getRequest().getHeader("User-Agent"));
-            log.debug(" ERROR PERFORMANCE DETAILS HOST : " +  ServletUtils.getRequest().getHeader("Host"));
             log.debug(" ERROR PERFORMANCE DETAILS PERFORMANCE_ID : " + performancesId);
         }
 
@@ -185,7 +181,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             performancesInfo.setDiffDistance(diffDistance);
         }
 
-        log.info(UserPathDto.setData("演出详情","performancesId="+performancesId+" latitudeFrom="+latitudeFrom+" longitudeFrom="+longitudeFrom,performancesInfo));
+        log.info(UserPathDto.setData("演出详情", "performancesId=" + performancesId + " latitudeFrom=" + latitudeFrom + " longitudeFrom=" + longitudeFrom, performancesInfo));
         return performancesInfo;
     }
 
@@ -214,7 +210,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
                         if (0 == ticket.getIsAgent()) {
                             ticketListNew.add(ticket);
                         }
-                    } else if(1 == isAgent) {
+                    } else if (1 == isAgent) {
                         if (1 == ticket.getIsAgent()) {
                             ticketListNew.add(ticket);
                         }
@@ -335,7 +331,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         info.put("total", count);
         info.put("list", list);
 
-        log.info(UserPathDto.setData("演出搜索","title="+title+" page="+page+" size="+size,info));
+        log.info(UserPathDto.setData("演出搜索", "title=" + title + " page=" + page + " size=" + size, info));
         return info;
     }
 
@@ -363,7 +359,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         payDetailVo.setPerformanceInfo(performancesInfo);
         payDetailVo.setTicketInfo(ticketVo);
 
-        log.info(UserPathDto.setData("预支付","performancesId="+performancesId+" ticketsId="+ticketsId,payDetailVo));
+        log.info(UserPathDto.setData("预支付演出票种详情", "performancesId=" + performancesId + " ticketsId=" + ticketsId, payDetailVo));
         return payDetailVo;
     }
 
@@ -456,6 +452,12 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         int getStatus = ticketItem.getStatus();
         int status = getStatus;
         if (null != ticketItem) {
+            // 判断售罄
+            boolean isSellOut = dataUtils.ticketIsSoldOut(ticketItem.getTicketsId());
+            if (isSellOut) {
+                getStatus = 8;
+                status = 8;
+            }
             if (6 == getStatus || 9 == getStatus || 10 == getStatus) {
                 String timeStart = ticketItem.getTimeStart();
                 String timeEnd = ticketItem.getTimeEnd();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/utils/DataUtils.java

@@ -5,7 +5,6 @@ import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
-import com.liquidnet.service.kylin.dto.vo.*;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketTimesVo;
 import com.liquidnet.service.kylin.dto.vo.middle.KylinTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.*;
@@ -24,7 +23,6 @@ import org.springframework.stereotype.Component;
 
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.regex.Pattern;
 
@@ -451,6 +449,19 @@ public class DataUtils {
         return (KylinPerformanceVo) redisUtil.get(KylinRedisConst.PERFORMANCES + performanceId);
     }
 
+    /**
+     * 获取分销用户名字
+     *
+     * @param agentId
+     * @return
+     */
+    public String getAgentInfoName(String agentId) {
+        String redisKey = KylinRedisConst.PERFORMANCES_AGENT_INFO.concat(agentId);
+//        String name = (String) redisUtil.hget(redisKey, "name");
+        String name = "";
+        return name;
+    }
+
     /**
      * 获取演出列表redis
      *