feature 增加提示信息

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

@@ -46,7 +46,7 @@ public class MeterReadingRecordListener extends AnalysisEventListener<ImportMete
     // 时间异常的记录
     private List<ImportMeterReadingRecordVo> timeAnomalyList = new ArrayList<>();
 
-    private SimpleDateFormat YMD_SDF = new SimpleDateFormat("yyyyMMdd");
+    private SimpleDateFormat YMD_SDF = new SimpleDateFormat("yyyy-MM-dd");
 
     private SimpleDateFormat Y_SDF = new SimpleDateFormat("yyyy");
     private SimpleDateFormat M_SDF = new SimpleDateFormat("M");
@@ -132,14 +132,15 @@ public class MeterReadingRecordListener extends AnalysisEventListener<ImportMete
                 .in(SwWaterUsageEntryDo::getMonth, months)
                 .in(SwWaterUsageEntryDo::getUsernumber, accountNumList));
         // 按照年月日分组
-        Map<String, List<SwWaterUsageEntryDo>> existsDataMap = existsData.parallelStream().collect(Collectors.groupingBy(info -> info.getUsernumber() +
+        Map<String, List<SwWaterUsageEntryDo>> existsDataMap = existsData.stream().collect(Collectors.groupingBy(info ->
+                info.getUsernumber() +
                 YMD_SDF.format(info.getCurrentreadingdate()) +
                 info.getThisreading().stripTrailingZeros().toPlainString()));
-        List<ImportMeterReadingRecordVo> repeatDataList = recordList.parallelStream().filter(data -> existsDataMap.containsKey(data.getCheckRepeatData())).collect(Collectors.toList());
+        List<ImportMeterReadingRecordVo> repeatDataList = recordList.stream().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());
+        recordList = recordList.stream().filter(data->!existsDataMap.containsKey(data.getCheckRepeatData())).collect(Collectors.toList());
         if(recordList.isEmpty()){
             return;
         }

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

@@ -74,7 +74,7 @@ public class ImportExcelServiceImpl implements ImportExcelService {
         log.error("excel解析时长：{}", startTime - entTime);
         List<SwWaterUsageEntryDo> saveList = meterReadingRecordListener.getData();
         if(saveList.isEmpty()) {
-            R.error("数据已导入或excel为空");
+          return  R.error("excel为空或excel中的数据已导入过");
         }
         Map<String, SwUserManagementDo> ownerMap = meterReadingRecordListener.getOwnerMap();
         SysUserVo currentUser = ZHSWCommonUtils.getCurrentUser();