|
@@ -272,9 +272,10 @@ public class PersonService {
|
|
|
public List<Long> importWithExcel(MultipartFile file) throws BDException {
|
|
|
List<Long> personIdList = new ArrayList<>();
|
|
|
try {
|
|
|
- System.out.println("file.getName()==" + file.getName());
|
|
|
- System.out.println("file.getName()2==" + file.getName().substring(file.getName().length() - 4));
|
|
|
- if (!file.getName().substring(file.getName().length() - 4).equals("xlsx")) {
|
|
|
+ String excelFileName = file.getOriginalFilename();
|
|
|
+ System.out.println("file.getName()==" + excelFileName);
|
|
|
+ System.out.println("file.getName()2==" + excelFileName.substring(excelFileName.length() - 4));
|
|
|
+ if (!excelFileName.substring(excelFileName.length() - 4).equals("xlsx")) {
|
|
|
throw new BDException("导入Excel只支持xlsx格式");
|
|
|
}
|
|
|
|
|
@@ -455,11 +456,11 @@ public class PersonService {
|
|
|
PictureData picData = picMap.get(i);
|
|
|
if(picData != null){
|
|
|
//保存的文件名
|
|
|
- String fileName = DateUtils.getCurrYyyyMMddHHmmssDate() + "_" + UUID.randomUUID().toString() + ".jpg";
|
|
|
- String savePath = idenRoot + "data/final/person/image/" + idenCommunity.getCode() + "/" + fileName;
|
|
|
+ String saveFileName = DateUtils.getCurrYyyyMMddHHmmssDate() + "_" + UUID.randomUUID().toString() + ".jpg";
|
|
|
+ String savePath = idenRoot + "data/final/person/image/" + idenCommunity.getCode() + "/" + saveFileName;
|
|
|
// 保存图片
|
|
|
savePic(picData,savePath);
|
|
|
- personVO.setImage(fileUrl + "person/image/" + idenCommunity.getCode() +"/" + fileName);
|
|
|
+ personVO.setImage(fileUrl + "person/image/" + idenCommunity.getCode() +"/" + saveFileName);
|
|
|
}
|
|
|
|
|
|
}
|