feature 增加提示信息

zhsw-common/src/main/java/com/rongwei/zhsw/system/importListener/MeterReadingRecordListener.java

@@ -9,6 +9,7 @@ import com.rongwe.zhsw.system.domain.SwWaterUsageEntryDo;
 import com.rongwe.zhsw.system.vo.ImportMeterReadingRecordVo;
 import com.rongwei.rwadmincommon.system.vo.SysUserVo;
 import com.rongwei.rwcommon.base.BaseDo;
+import com.rongwei.rwcommon.base.R;
 import com.rongwei.rwcommon.base.exception.CustomException;
 import com.rongwei.rwcommon.utils.SecurityUtil;
 import com.rongwei.zhsw.system.service.impl.SwUserManagementServiceImpl;
@@ -135,10 +136,13 @@ public class MeterReadingRecordListener extends AnalysisEventListener<ImportMete
                 YMD_SDF.format(info.getCurrentreadingdate()) +
                 info.getThisreading().stripTrailingZeros().toPlainString()));
         List<ImportMeterReadingRecordVo> repeatDataList = recordList.parallelStream().filter(data -> existsDataMap.containsKey(data.getCheckRepeatData())).collect(Collectors.toList());
-        recordList = recordList.parallelStream().filter(data->!existsDataMap.containsKey(data.getCheckRepeatData())).collect(Collectors.toList());
         if(!repeatDataList.isEmpty()){
             log.error("以下数据已存在相同的抄表记录:{}",repeatDataList);
         }
+        recordList = recordList.parallelStream().filter(data->!existsDataMap.containsKey(data.getCheckRepeatData())).collect(Collectors.toList());
+        if(recordList.isEmpty()){
+            return;
+        }
         // 获取户号信息
         ownerMap = Lists.partition(accountNumList, 2500).stream().map(accountNum ->
                         swUserManagementService.list(new LambdaQueryWrapper<SwUserManagementDo>()

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/ImportExcelServiceImpl.java

@@ -73,6 +73,9 @@ public class ImportExcelServiceImpl implements ImportExcelService {
         long entTime = System.currentTimeMillis();
         log.error("excel解析时长：{}", startTime - entTime);
         List<SwWaterUsageEntryDo> saveList = meterReadingRecordListener.getData();
+        if(!saveList.isEmpty()) {
+            R.error("数据已导入或excel为空");
+        }
         Map<String, SwUserManagementDo> ownerMap = meterReadingRecordListener.getOwnerMap();
         SysUserVo currentUser = ZHSWCommonUtils.getCurrentUser();
         String dskey = currentUser.getTenantDo().getDskey();