fix:优化下载上传中禁止再次上传

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderCreateServiceImpl.java

@@ -258,7 +258,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
 
 
     @Override
     @Override
     @Transactional
     @Transactional
-    public void saveBatch(List<OrderInfoExcelDTO> cachedDataList, String token, ThreadLocal local ) {
+    public void saveBatch(List<OrderInfoExcelDTO> cachedDataList, String token, ThreadLocal local) {
         String key = redisGroup + token;
         String key = redisGroup + token;
 
 
         ArrayList<OrderInfoErrorExcelDTO> errorList = (ArrayList<OrderInfoErrorExcelDTO>) local.get();
         ArrayList<OrderInfoErrorExcelDTO> errorList = (ArrayList<OrderInfoErrorExcelDTO>) local.get();
@@ -270,7 +270,8 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         if (cachedDataList.size() == 0 && errorList.size() == 0) {
         if (cachedDataList.size() == 0 && errorList.size() == 0) {
             throw new BusinessException("模版数据不能为空");
             throw new BusinessException("模版数据不能为空");
         }
         }
-        if (redisService.get(key) != null) {
+        FileRateDTO fileRateDTO1 = JSONObject.parseObject(redisService.get(key), FileRateDTO.class);
+        if (fileRateDTO1.getFlag() == 1) {
             throw new BusinessException("用户正在上传中,请稍后再试");
             throw new BusinessException("用户正在上传中,请稍后再试");
         }
         }
         //创建保存的对象
         //创建保存的对象
@@ -282,11 +283,12 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         fileRateDTO.setTotalCount(cachedDataList.size());
         fileRateDTO.setTotalCount(cachedDataList.size());
         fileRateDTO.setErrorCount(errorExcelDTOS.size());
         fileRateDTO.setErrorCount(errorExcelDTOS.size());
 
 
-        if (errorExcelDTOS.size() > 0){
+        if (errorExcelDTOS.size() > 0) {
             fileRateDTO.setErrorExcelDTOList(errorExcelDTOS);
             fileRateDTO.setErrorExcelDTOList(errorExcelDTOS);
-            redisService.set(key, JSONObject.toJSONString(fileRateDTO), 60L);
-        }
 
 
+        }
+        fileRateDTO.setFlag(1);
+        redisService.set(key, JSONObject.toJSONString(fileRateDTO), 60L);
 
 
         for (OrderInfoExcelDTO req : cachedDataList) {
         for (OrderInfoExcelDTO req : cachedDataList) {
             OrderInfoEntity byOrderId = orderInfoDao.getByOrderId(req.getOrderId());
             OrderInfoEntity byOrderId = orderInfoDao.getByOrderId(req.getOrderId());
@@ -490,12 +492,13 @@ public class OrderCreateServiceImpl implements OrderCreateService {
             redisService.set(key, JSONObject.toJSONString(fileRateDTO), 60L);
             redisService.set(key, JSONObject.toJSONString(fileRateDTO), 60L);
 
 
         }
         }
-            if (fileRateDTO.getErrorCount()>0){
+        fileRateDTO.setFlag(0);
+        redisService.set(key, JSONObject.toJSONString(fileRateDTO), 60L);
+        if (fileRateDTO.getErrorCount() > 0) {
             throw new BusinessException("订单上传失败，请检查错误模版");
             throw new BusinessException("订单上传失败，请检查错误模版");
         }
         }
 
 
 
 
-
     }
     }
 
 
     /**
     /**
@@ -698,6 +701,7 @@ public class OrderCreateServiceImpl implements OrderCreateService {
         log.info("[createOrder] orderId:{}, 结束,订单信息:{}", req.getOrderId(), entity);
         log.info("[createOrder] orderId:{}, 结束,订单信息:{}", req.getOrderId(), entity);
         return Result.success(null);
         return Result.success(null);
     }
     }
+
     @Async
     @Async
     public void sendMsg(String branchId, String orderId, LocalDate toLocalDate, OrderInfoEntity orderInfo) {
     public void sendMsg(String branchId, String orderId, LocalDate toLocalDate, OrderInfoEntity orderInfo) {
         MsgDTO msgDTO = new MsgDTO();
         MsgDTO msgDTO = new MsgDTO();