|
|
@@ -85,25 +85,25 @@ public class RtuImportTask implements Callable<Integer> {
|
|
|
// for (RtuInfoEntity entity : rtuList) {
|
|
|
// rtuStatus.put(entity.getRtuCode(), 0);
|
|
|
// }
|
|
|
- if(!fileName.endsWith("xlsx")){
|
|
|
- recordEntity.setImportStatus(2L);
|
|
|
- rtuImportRecordService.saveOrUpdate(recordEntity);
|
|
|
- return 0;
|
|
|
- }
|
|
|
- DataListener<RtuInfoTableDataEntity> dataListener = new DataListener<>();
|
|
|
- InputStream inputStreambuff = new BufferedInputStream(inputStream);
|
|
|
- ExcelReaderBuilder builder = EasyExcel.read(inputStreambuff, RtuInfoTableDataEntity.class, dataListener);
|
|
|
- ((ExcelReaderSheetBuilder)builder.sheet(0).headRowNumber(3)).doRead();
|
|
|
- List<RtuInfoTableDataEntity> list= dataListener.getDataList();
|
|
|
- if (null != list && list.size()>0){
|
|
|
- for (RtuInfoTableDataEntity entity:list){
|
|
|
- log.info(entity.getRtuCode());
|
|
|
- }
|
|
|
- }
|
|
|
+// if(!fileName.endsWith("xlsx")){
|
|
|
+// recordEntity.setImportStatus(2L);
|
|
|
+// rtuImportRecordService.saveOrUpdate(recordEntity);
|
|
|
+// return 0;
|
|
|
+// }
|
|
|
+// DataListener<RtuInfoTableDataEntity> dataListener = new DataListener<>();
|
|
|
+// InputStream inputStreambuff = new BufferedInputStream(inputStream);
|
|
|
+// ExcelReaderBuilder builder = EasyExcel.read(inputStreambuff, RtuInfoTableDataEntity.class, dataListener);
|
|
|
+// ((ExcelReaderSheetBuilder)builder.sheet(0).headRowNumber(3)).doRead();
|
|
|
+// List<RtuInfoTableDataEntity> list= dataListener.getDataList();
|
|
|
+// if (null != list && list.size()>0){
|
|
|
+// for (RtuInfoTableDataEntity entity:list){
|
|
|
+// log.info(entity.getRtuCode());
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
//List<NoticeExcel> list = ExcelUtil.read(inputStream, 0, RtuInfoTableDataEntity.class);
|
|
|
|
|
|
- // List<RtuInfoTableDataEntity> list = new LinkedList<>();
|
|
|
+ List<RtuInfoTableDataEntity> list = new LinkedList<>();
|
|
|
if (fileName.endsWith("xlsx")) {
|
|
|
EasyExcel.read(inputStream, RtuInfoTableDataEntity.class, new ReadListener() {
|
|
|
@Override
|