From e70053d772947e6e50cfa42f5a544a009699c4ac Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 04 八月 2021 17:31:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComSwRotaExcelListen.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComSwRotaExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComSwRotaExcelListen.java
index 893fcfc..2bb7e23 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComSwRotaExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComSwRotaExcelListen.java
@@ -36,6 +36,9 @@
@Override
public void invoke(ComSwRotaExcelVO comSwRotaExcelVO, AnalysisContext analysisContext) {
list.add(comSwRotaExcelVO);
+ if (list.size() == 0) {
+ throw new ServiceException("500", "导入数据为空！");
+ }
// 达到BATCH_COUNT了，需要去存储一次数据库，防止数据几万条数据在内存，容易OOM
if(list.size() >= BATCH_COUNT){
log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
@@ -51,6 +54,9 @@
@Override
public void doAfterAllAnalysed(AnalysisContext analysisContext) {
log.info("excel导入数据【{}】", JSONObject.toJSONString(list));
+ if (list.size() == 0) {
+ throw new ServiceException("500", "导入数据为空！");
+ }
R r = this.communityService.listSaveSwRotaExcelVO(list,this.communityId);//确保最后遗留的数据保存在数据库中
if (!R.isOk(r)) {
throw new ServiceException(r.getMsg());
--
Gitblit v1.7.1