完善批量导入

src/main/java/com/yxt/yyth/biz/lpkgiftcard/LpkGiftCardService.java

@@ -19,6 +19,7 @@ import cn.hutool.extra.qrcode.QrCodeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.ExportExcelUtils;
@@ -50,6 +51,7 @@ import com.yxt.yyth.api.lpkreserveorder.*;
 import com.yxt.yyth.api.lpkreserveordergoods.LpkReserveOrderGoods;
 import com.yxt.yyth.api.lpkstore.LpkStoreDetailsVo;
 import com.yxt.yyth.api.lpkstore.StoreSelect;
+import com.yxt.yyth.api.sysuser.SysUserVo;
 import com.yxt.yyth.biz.customerstore.CustomerStoreService;
 import com.yxt.yyth.biz.empcard.EmpCardService;
 import com.yxt.yyth.biz.empcardgift.EmpCardGiftService;
@@ -67,6 +69,8 @@ import com.yxt.yyth.utils.StyleUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.apache.tomcat.util.threads.ThreadPoolExecutor;
+import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -80,6 +84,7 @@ import java.awt.image.BufferedImage;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
 import java.util.*;
+import java.util.concurrent.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -159,6 +164,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         ;
         System.out.println(a.substring(0, 2));
     }
+
     public ResultBean bindAllCard(BindCardDto bindCardDto) {
         ResultBean rb = new ResultBean().fail();
 
@@ -193,6 +199,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         baseMapper.updateById(lpkGiftCard);
         return rb.success().setMsg("绑定成功");
     }
+
     public ResultBean getGifCardByCustomerSid(PagerQuery<LpkGiftCardQuery> pq) {
         ResultBean rb = new ResultBean().fail();
         LpkGiftCardQuery query = pq.getParams();
@@ -209,6 +216,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         return rb.success().setData(p);
     }
+
     public ResultBean getGifCardsByCustomerSid(PagerQuery<LpkGiftCardQuery> pq) {
         ResultBean rb = new ResultBean().fail();
         LpkGiftCardQuery query = pq.getParams();
@@ -241,6 +249,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         return rb.success().setData(p);
     }
+
     public ResultBean<List<LpkGifGoodsVo>> getGifCardsBySid(String sid) {
         ResultBean rb = new ResultBean().fail();
         AppletNewVo vo = baseMapper.getGifCardsBySid(sid);
@@ -284,6 +293,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         });
         return rb.success().setData(list1);
     }
+
     public ResultBean<AppletVo> getGifCardBySid(String sid) {
         ResultBean rb = new ResultBean().fail();
         AppletVo vo = baseMapper.getGifCardBySid(sid);
@@ -1294,7 +1304,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public ResultBean getExcelInfo3(String startDate, String endDate, MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException {
+    public synchronized ResultBean getExcelInfo3(String startDate, String endDate, MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException {
         ResultBean rb = ResultBean.fireFail();
         try {
             String temp = request.getSession().getServletContext().getRealPath(File.separator) + "temp";// 临时目录
@@ -1341,6 +1351,11 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
             List<LpkCardBuildRecord> records = new ArrayList<>(); //二维码
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
             int cardSerNum = 0;
+            String serNum = baseMapper.selctMaxSerNumForExport(); //取当前最大流水号
+            int serNumInt = 70000000; //默认为初始值-1
+            if (StringUtils.isNotBlank(serNum)) { //如果当前礼品卡中存在流水号,则使用当前最大流水号进行计算
+                serNumInt = Integer.parseInt(serNum);
+            }
             //生成卡包
             if (!importReturn.isEmpty()) {
                 for (int i = 0; i < importReturn.size(); i++) {
@@ -1349,7 +1364,6 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
                     LpkGiftBag bag = new LpkGiftBag();
                     LpkCardQrcode code = new LpkCardQrcode();
                     LpkCardBuildRecord record = new LpkCardBuildRecord();
-                    String serNum = baseMapper.selctMaxSerNumForExport();
                     card.setCreateTime(new DateTime());//卡片生成时间
                     bag.setCreateTime(new DateTime());//礼包生成时间
                     code.setCreateTime(new DateTime());//二维码生成时间
@@ -1357,7 +1371,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
                     record.setBuildDate(new DateTime());//礼包记录生成时间
                     record.setGiftbagSid(bag.getSid());
                     record.setCountNumber("1");
-                    if (StringUtils.isNotBlank(serNum)) {
+                    /*if (StringUtils.isNotBlank(serNum)) {
                         int serNumInt = Integer.parseInt(serNum);
                         if (i == 0) {
                             cardSerNum = serNumInt + 1;
@@ -1366,6 +1380,9 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
                         if (cardSerNum == 0) {
                             cardSerNum = 70000001;
                         }
+                    }*/
+                    if (i == 0) {
+                        cardSerNum = serNumInt + 1;
                     }
                     card.setSerialNumber(String.valueOf(cardSerNum));
                     record.setStartNumber(String.valueOf(cardSerNum));
@@ -1609,6 +1626,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         }
 
     }
+
     public ResultBean cardStatisticsList(PagerQuery<LpkReserveOrderQuery> pq) {
         ResultBean rb = new ResultBean();
         LpkReserveOrderQuery query = pq.getParams();
@@ -1640,6 +1658,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
 
     /**
      * 是否转赠
+     *
      * @param sid
      * @return
      */
@@ -1651,8 +1670,10 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         baseMapper.updateById(card);
         return rb.success().setData("成功");
     }
+
     /**
      * 共享家庭卡详情
+     *
      * @param sid
      * @return
      */
@@ -1688,6 +1709,7 @@ public class LpkGiftCardService extends MybatisBaseService<LpkGiftCardMapper, Lp
         vo.setShareRecordList(v);
         return rb.success().setData(vo);
     }
+
     public ResultBean cardShareGoodsDetail(String sid) {
         ResultBean rb = new ResultBean().fail();
         CardShareDetailVo vo = new CardShareDetailVo();