yaowang
/
kn-vordm
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修正上传接口/importTemplate

This commit is contained in:
遥望-何玉明 2024-07-11 09:50:54 +08:00
parent d5f552784d
commit 6dc9085d53
1 changed files with 104 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataAllServiceImpl.java
View File

@ -6,18 +6,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.kening.vordm.entity.EntityDataAll; import com.kening.vordm.entity.EntityDataAll;
import com.kening.vordm.entity.GuestInfo; import com.kening.vordm.entity.GuestInfo;
import com.kening.vordm.entity.RemoteSensingSourceData;
import com.kening.vordm.mapper.GuestInfoMapper; import com.kening.vordm.mapper.GuestInfoMapper;
import com.kening.vordm.service.EntityDataAllService; import com.kening.vordm.service.EntityDataAllService;
import com.kening.vordm.mapper.EntityDataAllMapper; import com.kening.vordm.mapper.EntityDataAllMapper;
import com.kening.vordm.vo.UserTenantVo; import com.kening.vordm.vo.UserTenantVo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springblade.core.oss.MinioTemplate; import org.springblade.core.oss.MinioTemplate;
import org.springblade.core.oss.model.BladeFile; import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.oss.props.OssProperties; import org.springblade.core.oss.props.OssProperties;
@ -29,8 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Stream;
/** /**
* @author G * @author G
@ -39,6 +34,7 @@ import java.util.stream.Stream;
*/ */
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor
@Slf4j
public class EntityDataAllServiceImpl extends ServiceImpl<EntityDataAllMapper, EntityDataAll> public class EntityDataAllServiceImpl extends ServiceImpl<EntityDataAllMapper, EntityDataAll>
implements EntityDataAllService { implements EntityDataAllService {
@ -114,15 +110,11 @@ public class EntityDataAllServiceImpl extends ServiceImpl<EntityDataAllMapper, E
InputStream inputStream = fileDataOne.getInputStream(); InputStream inputStream = fileDataOne.getInputStream();
Workbook workbook = new HSSFWorkbook(inputStream); Workbook workbook = new HSSFWorkbook(inputStream);
Sheet sheet = workbook.getSheetAt(0); Sheet sheet = workbook.getSheetAt(0);
Iterator<Row> iterator = sheet.iterator(); sheet.forEach(currentRow -> {
while (iterator.hasNext()) { if (currentRow.getRowNum()!= 0&&currentRow!=null&&!isBlankRow(currentRow)) {
Row currentRow = iterator.next();
if (currentRow.getRowNum() != 0) {
Iterator<Cell> cellIterator = currentRow.iterator();
EntityDataAll entityDataAll = new EntityDataAll(); EntityDataAll entityDataAll = new EntityDataAll();
while (cellIterator.hasNext()) { currentRow.forEach(cell -> {
Cell cell = cellIterator.next(); if (!Objects.isNull(cell)){
//判断cell是否为空，为空不进行添加操作
int columnIndex = cell.getColumnIndex(); int columnIndex = cell.getColumnIndex();
switch (columnIndex) { switch (columnIndex) {
case 0: case 0:
@ -189,7 +181,7 @@ public class EntityDataAllServiceImpl extends ServiceImpl<EntityDataAllMapper, E
String filename = multipartFile.getOriginalFilename(); String filename = multipartFile.getOriginalFilename();
if (filename.contains(cell.getStringCellValue())) { if (filename.contains(cell.getStringCellValue())) {
BladeFile bladeFile = minioTemplate.putFile(multipartFile); BladeFile bladeFile = minioTemplate.putFile(multipartFile);
bladeFile = this.format(bladeFile, imageUrl); bladeFile = format(bladeFile, imageUrl);
entityDataAll.setLink(bladeFile.getLink()); entityDataAll.setLink(bladeFile.getLink());
} }
}); });
@ -200,6 +192,7 @@ public class EntityDataAllServiceImpl extends ServiceImpl<EntityDataAllMapper, E
break; break;
} }
} }
});
entityDataAll.setType("4"); entityDataAll.setType("4");
entityDataAll.setSource("Other"); entityDataAll.setSource("Other");
entityDataAll.setDisasterId(disasterId); entityDataAll.setDisasterId(disasterId);
@ -208,7 +201,7 @@ public class EntityDataAllServiceImpl extends ServiceImpl<EntityDataAllMapper, E
entityDataAll.setIsAdministration(1); entityDataAll.setIsAdministration(1);
baseMapper.insert(entityDataAll); baseMapper.insert(entityDataAll);
} }
} });
workbook.close(); workbook.close();
inputStream.close(); inputStream.close();
} catch (IOException e) { } catch (IOException e) {
@ -235,6 +228,25 @@ public class EntityDataAllServiceImpl extends ServiceImpl<EntityDataAllMapper, E
} }
return bladeFile; return bladeFile;
} }
public static boolean isBlankRow(Row row){
boolean isEmptyRow = true;
for (int i=0; i<row.getLastCellNum(); i++){
if (row.getCell(i) != null){
if (row.getCell(i).getCellType()== CellType.STRING && !row.getCell(i).getRichStringCellValue().equals("")){
isEmptyRow = false;
break;
}else if (row.getCell(i).getCellType()!=CellType.BLANK){
isEmptyRow = false;
break;
}
}
if (!isEmptyRow)
break;
}
return isEmptyRow;
}
} }