Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamCollectionService.java

 package com.liquidnet.service.adam.service;
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
+import com.liquidnet.service.base.PagedResult;
 
 /**
  * <p>
@@ -22,5 +22,5 @@ public interface IAdamCollectionService {
 
     boolean queryState(String uid, String type, String contentId);
 
-    PageInfo<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize);
+    PagedResult<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize);
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamDisposedService.java

 package com.liquidnet.service.adam.service;
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
+import com.liquidnet.service.base.PagedResult;
 
 /**
  * <p>
@@ -23,7 +23,7 @@ public interface IAdamDisposedService {
 
     boolean queryState(String uid, String type, String contentId);
 
-    PageInfo<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize);
+    PagedResult<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize);
 
-    PageInfo<AdamDisposedUserVo> queryDisposedUsers(String type, String contentId, int pageNo, int pageSize);
+    PagedResult<AdamDisposedUserVo> queryDisposedUsers(String type, String contentId, int pageNo, int pageSize);
 }

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamMemberOrderService.java

 package com.liquidnet.service.adam.service;
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.adam.dto.AdamMemberOrderCallbackParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderResult;
 import com.liquidnet.service.adam.dto.vo.AdamMemberOrderSimpleVo;
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 
 /**
@@ -40,5 +40,5 @@ public interface IAdamMemberOrderService {
      * @param pageSize
      * @return
      */
-    PageInfo<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize);
+    PagedResult<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize);
 }

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/PagedResult.java

-/**
- * $Id$
- * Copyright(C) 2015-2020 kowlone - internet center, All Rights Reserved.
- */
 package com.liquidnet.service.base;
 
 import java.io.Serializable;
+import java.util.List;
 
-/**
- * 分页显示的结果
- * @author <a href="mailto:lzm8285@163.com">Li Zhongmin</a>
- * @version 1.0 2015年12月08日 17:44:00
- */
-public class PagedResult<T> implements Serializable{
-
-	private static final long serialVersionUID = 9014763784496485161L;
-	/** 总页数 */
-	private int totalPages;
-	/** 总记录数 */
-	private int totalRows;
-	/** 分页数据 */
-	private T data;
-
-	public PagedResult(){}
-
-	public PagedResult(T data,Object page) {
-		this.data = data;
-	}
-
-	public PagedResult(T data,int totalPages,int totalRows) {
-		this.totalPages = totalPages;
-		this.totalRows = totalRows;
-		this.data = data;
-	}
-
-
-	public T getData() {
-		return data;
-	}
-
-	public int getTotalPages() {
-		return totalPages;
-	}
-
-	public int getTotalRows() {
-		return totalRows;
-	}
+public class PagedResult<T> implements Serializable, Cloneable {
+	private static final long serialVersionUID = 8141034447809038759L;
+	/**
+     * 总页数
+     */
+    private int pages;
+    /**
+     * 总记录数
+     */
+    private long total;
+    /**
+     * 分页数据
+     */
+    private List<T> list;
+
+    public PagedResult() {
+    }
+
+    public int getPages() {
+        return pages;
+    }
+
+//	public PagedResult<T> setTotalPages(int totalPages) {
+//		this.totalPages = totalPages;
+//		return this;
+//	}
+
+    public long getTotal() {
+        return total;
+    }
+
+    public PagedResult<T> setTotal(long total, int pageSize) {
+        this.total = total;
+        if (total == -1L) {
+            this.pages = 1;
+        } else {
+            if (pageSize > 0) {
+                this.pages = (int) (total / pageSize + (total % pageSize == 0L ? 0 : 1));
+            } else {
+                this.pages = 0;
+            }
+        }
+        return this;
+    }
+
+    public List<T> getList() {
+        return list;
+    }
+
+    public PagedResult<T> setList(List<T> list) {
+        this.list = list;
+        return this;
+    }
+
+    @Override
+    public PagedResult<T> clone() {
+        try {
+            return (PagedResult<T>) super.clone();
+        } catch (CloneNotSupportedException e) {
+            return new PagedResult<>();
+        }
+    }
 }

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

@@ -69,6 +69,8 @@ spring:
       max-request-size: 10MB
   profiles:
     include: common-service #这里加载management相关公共配置
+  autoconfigure:
+    exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   rabbitmq:
     addresses: ${liquidnet.rabbitmq.host}
     port: ${liquidnet.rabbitmq.port}
@@ -114,26 +116,6 @@ spring:
       uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
       sslEnabled: ${liquidnet.mongodb.sslEnabled}
       database: ${liquidnet.mongodb.database}
-  datasource:
-    name: ${liquidnet.mysql.database-name}
-    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
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    filters: stat
-    maxActive: 20
-    initialSize: 1
-    maxWait: 60000
-    minIdle: 1
-    timeBetweenEvictionRunsMillis: 60000
-    minEvictableIdleTimeMillis: 300000
-    validationQuery: select 'x'
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    poolPreparedStatements: true
-    maxOpenPreparedStatements: 20
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------

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

@@ -69,6 +69,9 @@ spring:
       max-request-size: 10MB
   profiles:
     include: common-service #这里加载management相关公共配置
+  autoconfigure:
+    exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
+
   rabbitmq:
     addresses: ${liquidnet.rabbitmq.host}
     port: ${liquidnet.rabbitmq.port}

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

@@ -69,6 +69,8 @@ spring:
       max-request-size: 10MB
   profiles:
     include: common-service #这里加载management相关公共配置
+  autoconfigure:
+    exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   rabbitmq:
     addresses: ${liquidnet.rabbitmq.host}
     port: ${liquidnet.rabbitmq.port}

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

@@ -7,6 +7,7 @@ import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
 import com.liquidnet.service.adam.service.IAdamCollectionService;
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
+import java.util.List;
 
 /**
  * <p>
@@ -86,10 +88,10 @@ public class AdamCollectionController {
             @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "5"),
     })
     @PostMapping("list")
-    public ResponseDto<PageInfo<AdamCollectVo>> list(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "收藏类型无效")
+    public ResponseDto<PagedResult<AdamCollectVo>> list(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "收藏类型无效")
                                                      @RequestParam String type,
-                                                     @RequestParam(defaultValue = "1", required = false) int pageNo,
-                                                     @RequestParam(defaultValue = "5", required = false) int pageSize) {
+                                                              @RequestParam(defaultValue = "1", required = false) int pageNo,
+                                                              @RequestParam(defaultValue = "5", required = false) int pageSize) {
         pageNo = pageNo > 0 ? pageNo : 1;
         pageSize = pageSize <= 0 || pageSize > 10 ? 5 : pageSize;
 

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

 package com.liquidnet.service.adam.controller;
 
-import com.github.pagehelper.PageInfo;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.liquidnet.commons.lang.util.CurrentUtil;
@@ -8,6 +7,7 @@ import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
 import com.liquidnet.service.adam.service.IAdamDisposedService;
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -88,10 +88,10 @@ public class AdamDisposedController {
             @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "5"),
     })
     @PostMapping("list")
-    public ResponseDto<PageInfo<AdamDisposedVo>> list(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
-                                                      @RequestParam String type,
-                                                      @RequestParam(defaultValue = "1", required = false) int pageNo,
-                                                      @RequestParam(defaultValue = "5", required = false) int pageSize) {
+    public ResponseDto<PagedResult<AdamDisposedVo>> list(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
+                                                         @RequestParam String type,
+                                                         @RequestParam(defaultValue = "1", required = false) int pageNo,
+                                                         @RequestParam(defaultValue = "5", required = false) int pageSize) {
         pageNo = pageNo > 0 ? pageNo : 1;
         pageSize = pageSize <= 0 || pageSize > 10 ? 10 : pageSize;
 
@@ -107,12 +107,12 @@ public class AdamDisposedController {
             @ApiImplicitParam(type = "form", required = false, dataType = "Integer", name = "pageSize", value = "页展示条数", example = "10"),
     })
     @PostMapping("list/user")
-    public ResponseDto<PageInfo<AdamDisposedUserVo>> listUser(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
-                                                              @RequestParam String type,
-                                                              @Size(min = 1, max = 64, message = "内容ID长度限制1-64位")
-                                                              @RequestParam String contentId,
-                                                              @RequestParam(defaultValue = "1", required = false) int pageNo,
-                                                              @RequestParam(defaultValue = "10", required = false) int pageSize) {
+    public ResponseDto<PagedResult<AdamDisposedUserVo>> listUser(@Pattern(regexp = "\\b(TICKET|VIDEO)\\b", message = "想去类型无效")
+                                                                 @RequestParam String type,
+                                                                 @Size(min = 1, max = 64, message = "内容ID长度限制1-64位")
+                                                                 @RequestParam String contentId,
+                                                                 @RequestParam(defaultValue = "1", required = false) int pageNo,
+                                                                 @RequestParam(defaultValue = "10", required = false) int pageSize) {
         pageNo = pageNo > 0 ? pageNo : 1;
         pageSize = pageSize <= 0 || pageSize > 20 ? 20 : pageSize;
 

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

@@ -20,6 +20,7 @@ import com.liquidnet.service.adam.service.IAdamMemberOrderService;
 import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserService;
 import com.liquidnet.service.base.ErrorMapping;
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -139,13 +140,13 @@ public class AdamMemberOrderController {
     @ApiOperation(value = "会员支付回调")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "status", value = "1-成功｜0-失败", example = "1"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "order_code", value = "会员订单号", example = "77062761607274496V"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "orderCode", value = "会员订单号", example = "77062761607274496V"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "code", value = "支付订单号", example = "20210616153954199964032352974P"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "type", value = "购买类型", example = "VIP"),
             @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "price", value = "支付金额", example = "0.01"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payment_type", value = "支付类型", example = "APPALIPAY"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payment_at", value = "支付时间", example = "2021-06-16 15:40:02"),
-            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "payment_id", value = "支付ID", example = "2021061622001468121421203878"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "paymentType", value = "支付类型", example = "APPALIPAY"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "paymentAt", value = "支付时间", example = "2021-06-16 15:40:02"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "paymentId", value = "支付ID", example = "2021061622001468121421203878"),
     })
     @PostMapping("callback")
     public String paymentNotifyCallBack() {
@@ -239,8 +240,8 @@ public class AdamMemberOrderController {
     @ApiOperationSupport(order = 5)
     @ApiOperation(value = "会员订单列表")
     @GetMapping("list")
-    public ResponseDto<PageInfo<AdamMemberOrderSimpleVo>> list(@RequestParam(defaultValue = "1", required = false) int pageNo,
-                                                               @RequestParam(defaultValue = "5", required = false) int pageSize) {
+    public ResponseDto<PagedResult<AdamMemberOrderSimpleVo>> list(@RequestParam(defaultValue = "1", required = false) int pageNo,
+                                                                  @RequestParam(defaultValue = "5", required = false) int pageSize) {
         return ResponseDto.success(adamMemberOrderService.queryPage(CurrentUtil.getCurrentUid(), pageNo, pageSize));
     }
 

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

@@ -11,6 +11,7 @@ import com.liquidnet.service.adam.dto.vo.*;
 import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamUserInfoService;
 import com.liquidnet.service.adam.service.IAdamUserService;
+import com.liquidnet.service.adam.util.ObjectUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import io.swagger.annotations.Api;
@@ -74,7 +75,7 @@ public class AdamUserController {
 //            // 已选中的父级标签与系统筛选命中的父级标签数量不同
 //            return ResponseDto.failure(ErrorMapping.get("10012"));
 //        }
-//        List<AdamTagParentVo> tagMeVoList = new ArrayList<>();
+//        List<AdamTagParentVo> tagMeVoList = ObjectUtil.getAdamTagParentVoArrayList();
 //        // tagMe子级标签校验处理
 //        for (AdamTagParentVo parentVo : tagMeVos) {
 //            // 系统对应的父级标签
@@ -131,7 +132,7 @@ public class AdamUserController {
     public ResponseDto<List<AdamTagParentVo>> getTagsForMusic() {
         List<AdamTagParentVo> tagsForMusic = adamRdmService.getTagsForMusic();
         if (CollectionUtils.isEmpty(tagsForMusic)) {
-            tagsForMusic = new ArrayList<>();
+            tagsForMusic = ObjectUtil.getAdamTagParentVoArrayList();
             tagsForMusic.add(AdamTagParentVo.getNew().setVal("MMS01").setDesc("民歌").setTagVos(Arrays.asList(
                     AdamTagVo.getNew().setVal("MMS0101").setDesc("A"),
                     AdamTagVo.getNew().setVal("MMS0102").setDesc("B")
@@ -156,7 +157,7 @@ public class AdamUserController {
     public ResponseDto<List<AdamTagVo>> getTagsForSex() {
         List<AdamTagVo> tagsForSex = adamRdmService.getTagsForSex();
         if (CollectionUtils.isEmpty(tagsForSex)) {
-            tagsForSex = new ArrayList<>();
+            tagsForSex = ObjectUtil.getAdamTagVoArrayList();
             tagsForSex.add(AdamTagVo.getNew().setVal("MS00").setDesc("保密"));
             tagsForSex.add(AdamTagVo.getNew().setVal("MS01").setDesc("男性"));
             tagsForSex.add(AdamTagVo.getNew().setVal("MS02").setDesc("女性"));

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

 package com.liquidnet.service.adam.service.impl;
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.adam.dto.vo.AdamCollectBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamCollectVo;
 import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamCollectionService;
+import com.liquidnet.service.adam.util.ObjectUtil;
 import com.liquidnet.service.adam.util.QueueUtils;
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -99,14 +100,14 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
     }
 
     @Override
-    public PageInfo<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize) {
+    public PagedResult<AdamCollectVo> queryPage(String uid, String type, int pageNo, int pageSize) {
         Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("state").is(1));
 
         long s = System.currentTimeMillis();
         long count = mongoTemplate.count(query, AdamCollectBaseVo.class.getSimpleName());
         log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 
-        PageInfo<AdamCollectVo> voPageInfo = null;
+        PagedResult<AdamCollectVo> pagedResult = ObjectUtil.getAdamCollectVoPagedResult();
         if (count > 0) {
             Pageable pageable = PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt"));
 
@@ -164,12 +165,9 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
                 log.debug("#COL.RDS.K耗时:{}ms", System.currentTimeMillis() - s);
             }
 
-            voPageInfo = PageInfo.of(collectVoList);
-            voPageInfo.setTotal(count);
-        } else {
-            voPageInfo = new PageInfo<>();
+            pagedResult.setList(collectVoList).setTotal(count, pageSize);
         }
 
-        return voPageInfo;
+        return pagedResult;
     }
 }

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

 package com.liquidnet.service.adam.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.adam.dto.vo.AdamCollectInfoVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedBaseVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedUserVo;
 import com.liquidnet.service.adam.dto.vo.AdamDisposedVo;
-import com.liquidnet.service.adam.entity.AdamDisposed;
-import com.liquidnet.service.adam.mapper.AdamDisposedMapper;
 import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamDisposedService;
+import com.liquidnet.service.adam.util.ObjectUtil;
 import com.liquidnet.service.adam.util.QueueUtils;
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -107,14 +105,14 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
     }
 
     @Override
-    public PageInfo<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize) {
+    public PagedResult<AdamDisposedVo> queryPage(String uid, String type, int pageNo, int pageSize) {
         Query query = Query.query(Criteria.where("uid").is(uid).and("type").is(type).and("state").is(1));
 
         long s = System.currentTimeMillis();
         long count = mongoTemplate.count(query, AdamDisposedBaseVo.class.getSimpleName());
         log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 
-        PageInfo<AdamDisposedVo> voPageInfo = null;
+        PagedResult<AdamDisposedVo> pagedResult = ObjectUtil.getAdamDisposedVoPagedResult();
         if (count > 0) {
             query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt")));
 
@@ -179,30 +177,27 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
                         vo.setIsAdvance(performanceVo.getIsAdvance());
                     }
                     r.setContentInfo(vo);
-                    PageInfo<AdamDisposedUserVo> disposedUserVoPageInfo = this.queryDisposedUsers(type, r.getContentId(), 1, 3);
-                    if (disposedUserVoPageInfo.getTotal() > 0) r.setUserVos(disposedUserVoPageInfo.getList());
+                    PagedResult<AdamDisposedUserVo> disposedUserVoPagedResult = this.queryDisposedUsers(type, r.getContentId(), 1, 3);
+                    if (disposedUserVoPagedResult.getTotal() > 0) r.setUserVos(disposedUserVoPagedResult.getList());
                 });
                 log.debug("#DIS.RDS.MDB.K耗时:{}ms", System.currentTimeMillis() - s);
             }
 
-            voPageInfo = PageInfo.of(disposedVoList);
-            voPageInfo.setTotal(count);
-        } else {
-            voPageInfo = new PageInfo<>();
+            pagedResult.setList(disposedVoList).setTotal(count, pageSize);
         }
 
-        return voPageInfo;
+        return pagedResult;
     }
 
     @Override
-    public PageInfo<AdamDisposedUserVo> queryDisposedUsers(String type, String contentId, int pageNo, int pageSize) {
+    public PagedResult<AdamDisposedUserVo> queryDisposedUsers(String type, String contentId, int pageNo, int pageSize) {
         Query query = Query.query(Criteria.where("type").is(type).and("contentId").is(contentId).and("state").is(1));
 
         long s = System.currentTimeMillis();
         long count = mongoTemplate.count(query, AdamDisposedBaseVo.class.getSimpleName());
         log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 
-        PageInfo<AdamDisposedUserVo> voPageInfo = null;
+        PagedResult<AdamDisposedUserVo> pagedResult = ObjectUtil.getAdamDisposedUserVoPagedResult();
         if (count > 0) {
             query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt")));
 
@@ -210,11 +205,8 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
             List<AdamDisposedUserVo> disposedUserVoList = mongoTemplate.find(query, AdamDisposedUserVo.class, AdamDisposedBaseVo.class.getSimpleName());
             log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
 
-            voPageInfo = PageInfo.of(disposedUserVoList);
-            voPageInfo.setTotal(count);
-        } else {
-            voPageInfo = new PageInfo<>();
+            pagedResult.setList(disposedUserVoList).setTotal(count, pageSize);
         }
-        return voPageInfo;
+        return pagedResult;
     }
 }

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

 package com.liquidnet.service.adam.service.impl;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.*;
 import com.liquidnet.service.adam.dto.AdamMemberOrderCallbackParam;
 import com.liquidnet.service.adam.dto.AdamMemberOrderCodeParam;
@@ -12,8 +11,10 @@ import com.liquidnet.service.adam.service.AdamRdmService;
 import com.liquidnet.service.adam.service.IAdamMemberOrderService;
 import com.liquidnet.service.adam.service.IAdamUserMemberService;
 import com.liquidnet.service.adam.util.MemberUtil;
+import com.liquidnet.service.adam.util.ObjectUtil;
 import com.liquidnet.service.adam.util.QueueUtils;
 import com.liquidnet.service.base.ErrorMapping;
+import com.liquidnet.service.base.PagedResult;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
@@ -35,7 +36,6 @@ import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @Service
@@ -117,7 +117,7 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
         payParam.add("expireTime", "5");// 过期时间，单位分钟，默认5
 
         // 生成订单信息
-        AdamMemberOrderVo memberOrderVo = new AdamMemberOrderVo();
+        AdamMemberOrderVo memberOrderVo = AdamMemberOrderVo.getNew();
         memberOrderVo.setOrderNo(orderNo);
         memberOrderVo.setMemberId(param.getMemberId());
         memberOrderVo.setDays(memberPriceVo.getDays());
@@ -435,12 +435,12 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
     }
 
     @Override
-    public PageInfo<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize) {
+    public PagedResult<AdamMemberOrderSimpleVo> queryPage(String uid, int pageNo, int pageSize) {
         Query query = Query.query(Criteria.where("uid").is(uid).and("state").in(1,5));
 
         long count = mongoTemplate.count(query, AdamMemberOrderVo.class.getSimpleName());
 
-        PageInfo<AdamMemberOrderSimpleVo> pageInfo = null;
+        PagedResult<AdamMemberOrderSimpleVo> pagedResult = ObjectUtil.getAdamMemberOrderSimpleVoPagedResult();
         if (count > 0) {
             query.with(PageRequest.of(pageNo - 1, pageSize, Sort.by(Sort.Direction.DESC, "createdAt")));
 
@@ -448,11 +448,8 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     query, AdamMemberOrderSimpleVo.class, AdamMemberOrderVo.class.getSimpleName()
             );
 
-            pageInfo = PageInfo.of(voList);
-            pageInfo.setTotal(count);
-        } else {
-            pageInfo = new PageInfo<>();
+            pagedResult.setList(voList).setTotal(count, pageSize);
         }
-        return pageInfo;
+        return pagedResult;
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/util/ObjectUtil.java

+package com.liquidnet.service.adam.util;
+
+import com.liquidnet.service.adam.dto.vo.*;
+import com.liquidnet.service.base.PagedResult;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ObjectUtil {
+    private static final ArrayList<AdamTagParentVo> adamTagParentVoArrayList = new ArrayList<>();
+    private static final ArrayList<AdamTagVo> adamTagVoArrayList = new ArrayList<>();
+
+    private static final PagedResult<AdamCollectVo> adamCollectVoPagedResult = new PagedResult<>();
+    private static final PagedResult<AdamMemberOrderSimpleVo> adamMemberOrderSimpleVoPagedResult = new PagedResult<>();
+    private static final PagedResult<AdamDisposedVo> adamDisposedVoPagedResult = new PagedResult<>();
+    private static final PagedResult<AdamDisposedUserVo> adamDisposedUserVoPagedResult = new PagedResult<>();
+
+    public static List<AdamTagParentVo> getAdamTagParentVoArrayList() {
+        return (List<AdamTagParentVo>) adamTagParentVoArrayList.clone();
+    }
+
+    public static List<AdamTagVo> getAdamTagVoArrayList() {
+        return (List<AdamTagVo>) adamTagVoArrayList.clone();
+    }
+
+    public static PagedResult<AdamCollectVo> getAdamCollectVoPagedResult() {
+        return adamCollectVoPagedResult.clone();
+    }
+
+    public static PagedResult<AdamMemberOrderSimpleVo> getAdamMemberOrderSimpleVoPagedResult() {
+        return adamMemberOrderSimpleVoPagedResult.clone();
+    }
+
+    public static PagedResult<AdamDisposedVo> getAdamDisposedVoPagedResult() {
+        return adamDisposedVoPagedResult.clone();
+    }
+
+    public static PagedResult<AdamDisposedUserVo> getAdamDisposedUserVoPagedResult() {
+        return adamDisposedUserVoPagedResult.clone();
+    }
+}

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

@@ -774,7 +774,7 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
             if (orderTicketData.getStatus() == 2) {
                 orderUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId(), null);
                 log.error("订单号为 {} 的订单超时支付", syncOrderParam.getOrderCode());
-                orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId(),syncOrderParam.getPaymentId());
+                orderRefundsCallbackService.refundApply(orderTicketData.getOrderTicketsId(),syncOrderParam.getPaymentId(),syncOrderParam.getPaymentType());
             } else if (orderTicketData.getStatus() == 3 || orderTicketData.getStatus() == 4) {
                 log.error("订单号为 {} 的订单正在退款 或者已退款", syncOrderParam.getOrderCode());
             } else {

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/KylinRefundsStatusServiceImpl.java

@@ -58,7 +58,7 @@ public class KylinRefundsStatusServiceImpl {
     public Boolean orderTicketRefunding(
             KylinOrderTicketVo orderInfo, String orderTicketsId,
             BigDecimal RefundPriceExpress,
-            List<String> ticketEntityIds, List<BigDecimal> entitiesPrice, String paymentId
+            List<String> ticketEntityIds, List<BigDecimal> entitiesPrice, String paymentId,String paymentType
     ) {
         if (CollectionUtil.isEmpty(ticketEntityIds)) {
             return false;
@@ -184,12 +184,13 @@ public class KylinRefundsStatusServiceImpl {
         sqls.add(SqlMapping.get("kylin_order_refund_entities.overtimeRefund"));
         sqls.add(SqlMapping.get("kylin_order_tickets.overtimeRefund"));
 
-        Object[] objectE = ObjectUtil.cloneObjectsArray(5);
+        Object[] objectE = ObjectUtil.cloneObjectsArray(6);
         objectE[0] = paymentId;
-        objectE[1] = orderStatusTable.getUpdatedAt();
-        objectE[2] = orderInfo.getOrderTicketsId();
-        objectE[3] = orderInfo.getChangeDate();
+        objectE[1] = paymentType;
+        objectE[2] = orderStatusTable.getUpdatedAt();
+        objectE[3] = orderInfo.getOrderTicketsId();
         objectE[4] = orderInfo.getChangeDate();
+        objectE[5] = orderInfo.getChangeDate();
         sqlsDataE.add(objectE);
 
         Object[] objectA = ObjectUtil.cloneObjectsArray(5);

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/OrderRefundOvertimeServiceImpl.java

@@ -34,7 +34,7 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
     @Autowired
     private DataUtils dataUtils;
 
-    public Boolean refundApply(String orderTicketsId,String paymentId) {
+    public Boolean refundApply(String orderTicketsId,String paymentId,String paymentType) {
         KylinOrderTicketVo orderInfo = dataUtils.getOrderTicketVo(orderTicketsId);
         // 快递费 未进行判断
         BigDecimal RefundPriceExpress = orderInfo.getPriceExpress();
@@ -57,7 +57,7 @@ public class OrderRefundOvertimeServiceImpl implements IKylinOrderRefundsService
         boolean res = kylinRefundsStatusServiceImpl.orderTicketRefunding(
                 orderInfo, orderTicketsId,
                 RefundPriceExpress,
-                ticketEntityIds, entitiesPrice,paymentId
+                ticketEntityIds, entitiesPrice,paymentId,paymentType
         );
         if (res) {
             // 超时直接退还库存

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/resources/sqlmap.properties

@@ -46,7 +46,7 @@ kylin_order_refund.withDraw=UPDATE kylin_order_refunds SET status = ? ,updated_a
 
 # ------------------------超时支付申请退款----------------------------
 kylin_order_ticket_status.overtimeRefund=UPDATE kylin_order_ticket_status SET status = ? ,updated_at = ?  WHERE order_id = ? and (updated_at <= ? or created_at = ?)
-kylin_order_tickets.overtimeRefund=UPDATE kylin_order_tickets SET payment_id = ? ,updated_at = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
+kylin_order_tickets.overtimeRefund=UPDATE kylin_order_tickets SET payment_id = ? , payment_type = ? ,updated_at = ?  WHERE order_tickets_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_ticket_entities.overtimeRefund=UPDATE kylin_order_ticket_entities SET is_payment = ? ,updated_at = ?  WHERE order_ticket_entities_id = ? and (updated_at <= ? or created_at = ?)
 kylin_order_refund.overtimeRefund=INSERT INTO kylin_order_refunds (order_refunds_id,order_tickets_id,order_refund_code,price,price_express,status,type,applicant_id,applicant_name,applicant_at,reason,refund_cate,created_at) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?)
 kylin_order_refund_entities.overtimeRefund=INSERT INTO kylin_order_refund_entities (order_refunds_entities_id,order_refunds_id,refund_price,order_ticket_entities_id,created_at) VALUES(?,?,?,?,?)

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualAppletDto.java

 package com.liquidnet.service.sweet.dto;
 
+import com.liquidnet.service.sweet.entity.SweetManualSort;
 import lombok.Data;
 
 import java.io.Serializable;
 
 @Data
-public class SweetManualAppletDto implements Serializable {
+public class SweetManualAppletDto implements Serializable ,Cloneable{
     private String manualId;
     private String performancesId;
     private String title;
@@ -17,4 +18,14 @@ public class SweetManualAppletDto implements Serializable {
 
     private String longitude;
     private String latitude;
+
+
+    private static final SweetManualAppletDto obj = new SweetManualAppletDto();
+    public static SweetManualAppletDto getNew() {
+        try {
+            return (SweetManualAppletDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualAppletDto();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistList2Dto.java

@@ -6,8 +6,17 @@ import java.io.Serializable;
 import java.util.List;
 
 @Data
-public class SweetManualArtistList2Dto implements Serializable {
+public class SweetManualArtistList2Dto implements Serializable ,Cloneable {
     private List<SweetManualArtistListDto> data;
     private List<String> date;
     private List<SweetManualArtistStageListDto> stage;
+
+    private static final SweetManualArtistList2Dto obj = new SweetManualArtistList2Dto();
+    public static SweetManualArtistList2Dto getNew() {
+        try {
+            return (SweetManualArtistList2Dto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualArtistList2Dto();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistListDto.java

@@ -6,7 +6,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 
 @Data
-public class SweetManualArtistListDto implements Serializable {
+public class SweetManualArtistListDto implements Serializable,Cloneable {
 
     private String manualRelationId;
     private String artistId;
@@ -19,4 +19,13 @@ public class SweetManualArtistListDto implements Serializable {
     private String signatureEnd;
 
     private ArrayList<String> date;
+
+    private static final SweetManualArtistListDto obj = new SweetManualArtistListDto();
+    public static SweetManualArtistListDto getNew() {
+        try {
+            return (SweetManualArtistListDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualArtistListDto();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualArtistStageListDto.java

@@ -6,6 +6,15 @@ import java.io.Serializable;
 import java.util.ArrayList;
 
 @Data
-public class SweetManualArtistStageListDto implements Serializable {
+public class SweetManualArtistStageListDto implements Serializable ,Cloneable{
     private String title;
+
+    private static final SweetManualArtistStageListDto obj = new SweetManualArtistStageListDto();
+    public static SweetManualArtistStageListDto getNew() {
+        try {
+            return (SweetManualArtistStageListDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualArtistStageListDto();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/dto/SweetManualDto.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.io.Serializable;
 
 @Data
-public class SweetManualDto implements Serializable {
+public class SweetManualDto implements Serializable ,Cloneable{
 
     private String performancesId;
     private String title;
@@ -16,4 +16,13 @@ public class SweetManualDto implements Serializable {
     private Integer status;
     private Integer manualStatus;
     private Integer isRelease;
+
+    private static final SweetManualDto obj = new SweetManualDto();
+    public static SweetManualDto getNew() {
+        try {
+            return (SweetManualDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualDto();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetArtists.java

@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SweetArtists implements Serializable {
+public class SweetArtists implements Serializable,Cloneable {
 
     private static final long serialVersionUID = 1L;
 
@@ -64,5 +64,12 @@ public class SweetArtists implements Serializable {
      */
     private LocalDateTime updatdAt;
 
-
+    private static final SweetArtists obj = new SweetArtists();
+    public static SweetArtists getNew() {
+        try {
+            return (SweetArtists) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetArtists();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManual.java

@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SweetManual implements Serializable {
+public class SweetManual implements Serializable,Cloneable {
 
     private static final long serialVersionUID = 1L;
 
@@ -54,5 +54,12 @@ public class SweetManual implements Serializable {
      */
     private LocalDateTime updatedAt;
 
-
+    private static final SweetManual obj = new SweetManual();
+    public static SweetManual getNew() {
+        try {
+            return (SweetManual) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManual();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualArtists.java

@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SweetManualArtists implements Serializable {
+public class SweetManualArtists implements Serializable ,Cloneable{
 
     private static final long serialVersionUID = 1L;
 
@@ -79,5 +79,12 @@ public class SweetManualArtists implements Serializable {
      */
     private LocalDateTime updatedAt;
 
-
+    private static final SweetManualArtists obj = new SweetManualArtists();
+    public static SweetManualArtists getNew() {
+        try {
+            return (SweetManualArtists) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualArtists();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualNotify.java

@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SweetManualNotify implements Serializable {
+public class SweetManualNotify implements Serializable ,Cloneable{
 
     private static final long serialVersionUID = 1L;
 
@@ -59,5 +59,12 @@ public class SweetManualNotify implements Serializable {
      */
     private LocalDateTime updatedAt;
 
-
+    private static final SweetManualNotify obj = new SweetManualNotify();
+    public static SweetManualNotify getNew() {
+        try {
+            return (SweetManualNotify) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualNotify();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetManualSort.java

@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SweetManualSort implements Serializable {
+public class SweetManualSort implements Serializable,Cloneable {
 
     private static final long serialVersionUID = 1L;
 
@@ -44,5 +44,12 @@ public class SweetManualSort implements Serializable {
      */
     private LocalDateTime updatedAt;
 
-
+    private static final SweetManualSort obj = new SweetManualSort();
+    public static SweetManualSort getNew() {
+        try {
+            return (SweetManualSort) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetManualSort();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetRichtext.java

@@ -2,8 +2,10 @@ package com.liquidnet.service.sweet.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -17,7 +19,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SweetRichtext implements Serializable {
+public class SweetRichtext implements Serializable, Cloneable {
 
     private static final long serialVersionUID = 1L;
 
@@ -69,5 +71,12 @@ public class SweetRichtext implements Serializable {
      */
     private LocalDateTime updatedAt;
 
-
+    private static final SweetRichtext obj = new SweetRichtext();
+    public static SweetRichtext getNew() {
+        try {
+            return (SweetRichtext) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetRichtext();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/entity/SweetStage.java

@@ -17,7 +17,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SweetStage implements Serializable {
+public class SweetStage implements Serializable,Cloneable {
 
     private static final long serialVersionUID = 1L;
 
@@ -49,5 +49,12 @@ public class SweetStage implements Serializable {
      */
     private LocalDateTime updatedAt;
 
-
+    private static final SweetStage obj = new SweetStage();
+    public static SweetStage getNew() {
+        try {
+            return (SweetStage) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetStage();
+        }
+    }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetArtistsServiceImpl.java

@@ -57,7 +57,7 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
     @Override
     public ResponseDto<Boolean> add(String picUrl, String name, String pinyin, String describe) {
         try {
-            SweetArtists sweetArtists = new SweetArtists();
+            SweetArtists sweetArtists = SweetArtists.getNew();
             sweetArtists.setArtistsId(IDGenerator.nextSnowId());
             sweetArtists.setPicUrl(picUrl);
             sweetArtists.setName(name);
@@ -83,7 +83,7 @@ public class SweetArtistsServiceImpl extends ServiceImpl<SweetArtistsMapper, Swe
     @Override
     public ResponseDto<Boolean> change(String artistsId, String picUrl, String name, String pinyin, String describe) {
         try {
-            SweetArtists sweetArtists = new SweetArtists();
+            SweetArtists sweetArtists = SweetArtists.getNew();
             sweetArtists.setPicUrl(picUrl);
             sweetArtists.setName(name);
             sweetArtists.setPinyin(pinyin);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualArtistsServiceImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.sweet.service.impl;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ResponseDto;
@@ -42,7 +43,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
         PageInfo<SweetManualArtistListDto> pageInfoTmp;
         try {
             PageHelper.startPage(page, size);
-            HashMap<String, Object> map = new HashMap<>();
+            HashMap<String, Object> map = CollectionUtil.mapStringObject();
             map.put("manualId", manualId);
             List<SweetManualArtistListDto> voList = sweetManualArtistsMapper.getManualList(map);
             pageInfoTmp = new PageInfo(voList);
@@ -56,7 +57,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
     @Override
     public ResponseDto<Boolean> add(String manualId, String artistId, String stageId, String performanceStart, String performanceEnd, String signatureStart, String signatureEnd) {
         try {
-            SweetManualArtists sweetManualNotify = new SweetManualArtists();
+            SweetManualArtists sweetManualNotify = SweetManualArtists.getNew();
             sweetManualNotify.setManualRelationId(IDGenerator.nextSnowId());
             sweetManualNotify.setManualId(manualId);
             sweetManualNotify.setStageId(stageId);
@@ -78,7 +79,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
     @Override
     public ResponseDto<SweetManualArtistListDto> details(String manualRelationId) {
         try {
-            HashMap<String, Object> map = new HashMap<>();
+            HashMap<String, Object> map = CollectionUtil.mapStringObject();
             map.put("manualRelationId", manualRelationId);
             SweetManualArtistListDto dto = sweetManualArtistsMapper.getManualDetails(map);
             return ResponseDto.success(dto);
@@ -91,7 +92,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
     @Override
     public ResponseDto<Boolean> change(String manualRelationId, String manualId, String artistId, String stageId, String performanceStart, String performanceEnd, String signatureStart, String signatureEnd) {
         try {
-            SweetManualArtists sweetManualNotify = new SweetManualArtists();
+            SweetManualArtists sweetManualNotify = SweetManualArtists.getNew();
             sweetManualNotify.setStageId(stageId);
             sweetManualNotify.setArtistsId(artistId);
             sweetManualNotify.setPerformanceEnd(DateUtil.Formatter.yyyyMMddHHmmss.parse(performanceEnd));
@@ -111,7 +112,7 @@ public class SweetManualArtistsServiceImpl extends ServiceImpl<SweetManualArtist
     @Override
     public ResponseDto<Boolean> delete(String manualRelationId, String manualId) {
         try {
-            SweetManualArtists sweetManualNotify = new SweetManualArtists();
+            SweetManualArtists sweetManualNotify = SweetManualArtists.getNew();
             sweetManualNotify.setManualRelationId(IDGenerator.nextSnowId());
             sweetManualNotify.setStatus(0);
             sweetManualNotify.setUpdatedAt(LocalDateTime.now());

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualNotifyServiceImpl.java

@@ -49,7 +49,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
     @Override
     public ResponseDto<Boolean> add(String manualId, String title, String content) {
         try {
-            SweetManualNotify sweetManualNotify = new SweetManualNotify();
+            SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
             sweetManualNotify.setManualNotifyId(IDGenerator.nextSnowId());
             sweetManualNotify.setManualId(manualId);
             sweetManualNotify.setTitle(title);
@@ -79,7 +79,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
     @Override
     public ResponseDto<Boolean> change(String manualId,String manualNotifyId, String title, String content) {
         try {
-            SweetManualNotify sweetManualNotify = new SweetManualNotify();
+            SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
             sweetManualNotify.setTitle(title);
             sweetManualNotify.setContent(content);
             sweetManualNotify.setUpdatedAt(LocalDateTime.now());
@@ -104,7 +104,7 @@ public class SweetManualNotifyServiceImpl extends ServiceImpl<SweetManualNotifyM
     @Override
     public ResponseDto<Boolean> delete(String manualNotifyId) {
         try {
-            SweetManualNotify sweetManualNotify = new SweetManualNotify();
+            SweetManualNotify sweetManualNotify = SweetManualNotify.getNew();
             sweetManualNotify.setStatus(0);
             sweetManualNotify.setUpdatedAt(LocalDateTime.now());
             sweetManualNotifyMapper.update(sweetManualNotify, Wrappers.lambdaUpdate(SweetManualNotify.class).eq(SweetManualNotify::getManualNotifyId, manualNotifyId));

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.commons.lang.util.BeanUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.ErrorMapping;
@@ -44,7 +45,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
         PageInfo<SweetManualDto> pageInfoTmp;
         try {
             PageHelper.startPage(page, size);
-            HashMap<String, Object> map = new HashMap<>();
+            HashMap<String, Object> map = CollectionUtil.mapStringObject();
             map.put("title", name);
             List<SweetManualDto> voList = sweetManualMapper.getManualList(BeanUtil.convertBeanToMap(map));
             for (int i = 0; i < voList.size(); i++) {
@@ -71,7 +72,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
     public ResponseDto<Boolean> changeStatus(String manualId, String performancesId, Integer status) {
         try {
             int count = sweetManualMapper.selectCount(Wrappers.lambdaUpdate(SweetManual.class).eq(SweetManual::getManualId, manualId));
-            SweetManual sweetManual = new SweetManual();
+            SweetManual sweetManual = SweetManual.getNew();
             if (count > 0) {//修改
                 sweetManual.setStatus(status);
                 sweetManual.setUpdatedAt(LocalDateTime.now());
@@ -94,7 +95,7 @@ public class SweetManualServiceImpl extends ServiceImpl<SweetManualMapper, Sweet
     @Override
     public ResponseDto<Boolean> changeRelease(String manualId, Integer isRelease) {
         try {
-            SweetManual sweetManual = new SweetManual();
+            SweetManual sweetManual = SweetManual.getNew();
             sweetManual.setIsRelease(isRelease);
             sweetManual.setUpdatedAt(LocalDateTime.now());
             sweetManualMapper.update(sweetManual, Wrappers.lambdaUpdate(SweetManual.class).eq(SweetManual::getManualId, manualId));

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetManualSortServiceImpl.java

@@ -43,13 +43,13 @@ public class SweetManualSortServiceImpl extends ServiceImpl<SweetManualSortMappe
         try {
             int count = sweetManualSortMapper.selectCount(Wrappers.lambdaUpdate(SweetManualSort.class).eq(SweetManualSort::getManualId, manualId));
             if (count > 0) {
-                SweetManualSort sweetManualSort = new SweetManualSort();
+                SweetManualSort sweetManualSort = SweetManualSort.getNew();
                 sweetManualSort.setManualId(manualId);
                 sweetManualSort.setShowPosition(content);
                 sweetManualSort.setUpdatedAt(LocalDateTime.now());
                 sweetManualSortMapper.update(sweetManualSort, Wrappers.lambdaUpdate(SweetManualSort.class).eq(SweetManualSort::getManualId, manualId));
             } else {
-                SweetManualSort sweetManualSort = new SweetManualSort();
+                SweetManualSort sweetManualSort = SweetManualSort.getNew();
                 sweetManualSort.setManualId(manualId);
                 sweetManualSort.setShowPosition(content);
                 sweetManualSort.setCreatedAt(LocalDateTime.now());

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetRichtextServiceImpl.java

@@ -42,7 +42,7 @@ public class SweetRichtextServiceImpl extends ServiceImpl<SweetRichtextMapper, S
     @Override
     public ResponseDto<Boolean> add(String manualId, String details, String local, String pirUrl, Integer type) {
         try {
-            SweetRichtext sweetRichtext = new SweetRichtext();
+            SweetRichtext sweetRichtext = SweetRichtext.getNew();
             sweetRichtext.setRichtextId(IDGenerator.nextSnowId());
             sweetRichtext.setManualId(manualId);
             if (type == 5) {
@@ -65,7 +65,7 @@ public class SweetRichtextServiceImpl extends ServiceImpl<SweetRichtextMapper, S
     @Override
     public ResponseDto<Boolean> change(String manualId, String details, String local, String pirUrl, Integer type) {
         try {
-            SweetRichtext sweetRichtext = new SweetRichtext();
+            SweetRichtext sweetRichtext = SweetRichtext.getNew();
             sweetRichtext.setRichtextId(IDGenerator.nextSnowId());
             sweetRichtext.setManualId(manualId);
             sweetRichtext.setDetails(details);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetStageServiceImpl.java

@@ -54,7 +54,7 @@ public class SweetStageServiceImpl extends ServiceImpl<SweetStageMapper, SweetSt
     @Override
     public ResponseDto<Boolean> add(String name) {
         try {
-            SweetStage sweetStage = new SweetStage();
+            SweetStage sweetStage = SweetStage.getNew();
             sweetStage.setStageId(IDGenerator.nextSnowId());
             sweetStage.setTitle(name);
             sweetStage.setCreatedAt(LocalDateTime.now());
@@ -77,7 +77,7 @@ public class SweetStageServiceImpl extends ServiceImpl<SweetStageMapper, SweetSt
     @Override
     public ResponseDto<Boolean> change(String name, String stageId) {
         try {
-            SweetStage sweetStage = new SweetStage();
+            SweetStage sweetStage = SweetStage.getNew();
             sweetStage.setTitle(name);
             sweetStage.setUpdatedAt(LocalDateTime.now());
             sweetStageMapper.update(sweetStage, Wrappers.lambdaUpdate(SweetStage.class).eq(SweetStage::getStageId, stageId));

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.sweet.utils;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.SweetManualAppletDto;
@@ -64,7 +65,7 @@ public class RedisDataUtils {
     //获取电子手册演出详情
     public SweetManualAppletDto getAppletPerformance(String manualId) {
         List<SweetManualAppletDto> data = getPushList();
-        SweetManualAppletDto returnData = new SweetManualAppletDto();
+        SweetManualAppletDto returnData = SweetManualAppletDto.getNew();
         for (SweetManualAppletDto item : data) {
             if (item.getManualId().equalsIgnoreCase(manualId)) {
                 returnData = item;
@@ -76,7 +77,7 @@ public class RedisDataUtils {
 
     public SweetManualArtistList2Dto setTimeList(String manualId,String content) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_MANUAL_TIME_LIST.concat(manualId);
-        HashMap<String, Object> map = new HashMap<>();
+        HashMap<String, Object> map = CollectionUtil.mapStringObject();
         map.put("manualId", manualId);
         List<SweetManualArtistListDto> data = sweetManualArtistsMapper.getManualList(map);
 
@@ -93,7 +94,7 @@ public class RedisDataUtils {
         //获取舞台
         List<SweetManualArtistStageListDto> stageData = sweetManualArtistsMapper.getStageNameList(map);
 
-        SweetManualArtistList2Dto returnData = new SweetManualArtistList2Dto();
+        SweetManualArtistList2Dto returnData = SweetManualArtistList2Dto.getNew();
         returnData.setDate(list);
         returnData.setData(data);
         returnData.setStage(stageData);