|
@@ -278,7 +278,7 @@ public class PersonService {
|
|
|
try {
|
|
|
|
|
|
//上传的目录
|
|
|
- String uploadSubDir = "data/final/person/image";
|
|
|
+ String uploadSubDir = "data/final/person/image/";
|
|
|
|
|
|
//图片对应的行和图片数据
|
|
|
Map<Integer, PictureData> sheetIndexPicMap = new HashMap<>();
|
|
@@ -478,7 +478,7 @@ public class PersonService {
|
|
|
}
|
|
|
|
|
|
String saveFileName = DateUtils.getCurrYyyyMMddHHmmssDate() + "_" + UUID.randomUUID().toString() + fileName.substring(fileName.lastIndexOf("."), fileName.length());
|
|
|
- String picFullFileName = idenRoot + "data/final/person/" + idenCommunity.getCode() + "/" + saveFileName;
|
|
|
+ String picFullFileName = idenRoot + "data/final/person/image/" + idenCommunity.getCode() + "/" + saveFileName;
|
|
|
FileOutputStream fos = new FileOutputStream(picFullFileName);
|
|
|
fos.write(file.getBytes());
|
|
|
image = fileUrl + "person/image/" + idenCommunity.getCode() +"/"+ saveFileName;
|
|
@@ -518,7 +518,7 @@ public class PersonService {
|
|
|
String image = idenPerson.getImage();
|
|
|
if(StringUtils.isNotEmpty(image)){
|
|
|
String fileName = image.substring(image.lastIndexOf("/"));
|
|
|
- File imgFile = new File(idenRoot + "data/final/person/"+ idenCommunity.getCode() + "/" + fileName);
|
|
|
+ File imgFile = new File(idenRoot + "data/final/person/image/"+ idenCommunity.getCode() + "/" + fileName);
|
|
|
String featPtr = FaceIdenTool.getFeatPtr(idenRoot,imgFile);
|
|
|
if (FaceIdenTool.isBad(featPtr)) {
|
|
|
File discardDir = new File(imgFile.getParentFile().getAbsolutePath().replace("final","discard"));
|
|
@@ -558,7 +558,7 @@ public class PersonService {
|
|
|
if (StringUtils.isNotEmpty(newImage) && !newImage.equals(oldImage)){
|
|
|
//识别
|
|
|
String fileNameNew = newImage.substring(newImage.lastIndexOf("/"));
|
|
|
- File imgFileNew = new File(idenRoot + "data/final/person/" + idenCommunity.getCode() + "/" + fileNameNew);
|
|
|
+ File imgFileNew = new File(idenRoot + "data/final/person/image/" + idenCommunity.getCode() + "/" + fileNameNew);
|
|
|
String featPtr = FaceIdenTool.getFeatPtr(idenRoot,imgFileNew);
|
|
|
if (FaceIdenTool.isBad(featPtr)){
|
|
|
File discardDir = new File(imgFileNew.getParentFile().getAbsolutePath().replace("final","discard"));
|
|
@@ -574,7 +574,7 @@ public class PersonService {
|
|
|
// 删除老的文件
|
|
|
if(StringUtils.isNotEmpty(oldImage)){
|
|
|
String fileNameOld = oldImage.substring(oldImage.lastIndexOf("/"));
|
|
|
- File imgFileOld = new File(idenRoot + "data/final/person/" + idenCommunity.getCode() + "/" + fileNameOld);
|
|
|
+ File imgFileOld = new File(idenRoot + "data/final/person/image/" + idenCommunity.getCode() + "/" + fileNameOld);
|
|
|
if(imgFileOld.exists()){
|
|
|
imgFileOld.delete();
|
|
|
}
|