|
|
@@ -9,11 +9,11 @@ import com.face.monitor.FaceMonitor;
|
|
|
import com.face.monitor.model.FaceModel;
|
|
|
import com.iden.common.entity.IdenCamera;
|
|
|
import com.iden.common.entity.IdenCommunity;
|
|
|
-import com.iden.common.entity.IdenImageStore;
|
|
|
+import com.iden.common.entity.IdenFaceImage;
|
|
|
|
|
|
import com.iden.common.service.IdenCameraService;
|
|
|
import com.iden.common.service.IdenCommunityService;
|
|
|
-import com.iden.common.service.IdenImageStoreService;
|
|
|
+import com.iden.common.service.IdenFaceImageService;
|
|
|
|
|
|
import com.iden.common.util.DateUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
@@ -38,7 +38,7 @@ import java.util.List;
|
|
|
@Service
|
|
|
public class FaceIdenService {
|
|
|
@Resource
|
|
|
- private IdenImageStoreService idenImageStoreService;
|
|
|
+ private IdenFaceImageService idenFaceImageService;
|
|
|
@Resource
|
|
|
private IdenCameraService idenCameraService;
|
|
|
@Resource
|
|
|
@@ -86,12 +86,12 @@ public class FaceIdenService {
|
|
|
//获取特征码
|
|
|
FaceModel[] faceModels = FaceIdenTool.extractFeature(faceMonitor,imgFiles);
|
|
|
|
|
|
- List<IdenImageStore> idenImageStoreList = new ArrayList<>();
|
|
|
+ List<IdenFaceImage> idenFaceImageList = new ArrayList<>();
|
|
|
for(int i = 0; i < imgFiles.length; i++) {
|
|
|
File imgFile = imgFiles[i];
|
|
|
- IdenImageStore idenImageStore = new IdenImageStore();
|
|
|
- idenImageStore.setCameraId(idenCamera.getId());
|
|
|
- idenImageStore.setCommunityId(idenCamera.getCommunityId());
|
|
|
+ IdenFaceImage idenFaceImage = new IdenFaceImage();
|
|
|
+ idenFaceImage.setCameraId(idenCamera.getId());
|
|
|
+ idenFaceImage.setCommunityId(idenCamera.getCommunityId());
|
|
|
String photographPlace = idenCamera.getPlace();
|
|
|
logger.info("FaceIdenService.exe ...4");
|
|
|
if (StringUtils.isEmpty(photographPlace)) {
|
|
|
@@ -101,14 +101,14 @@ public class FaceIdenService {
|
|
|
}
|
|
|
}
|
|
|
logger.info("FaceIdenService.exe ...5");
|
|
|
- idenImageStore.setPhotographPlace(photographPlace);
|
|
|
- idenImageStore.setLongitude(idenCamera.getLongitude());
|
|
|
- idenImageStore.setLatitude(idenCamera.getLatitude());
|
|
|
+ idenFaceImage.setPhotographPlace(photographPlace);
|
|
|
+ idenFaceImage.setLongitude(idenCamera.getLongitude());
|
|
|
+ idenFaceImage.setLatitude(idenCamera.getLatitude());
|
|
|
String imgFileName = imgFile.getName();
|
|
|
String photographTime = imgFileName.substring(0, imgFileName.indexOf("_"));
|
|
|
- idenImageStore.setPhotographTime(DateUtils.strToDate(photographTime,"yyyyMMddHHmmss"));
|
|
|
+ idenFaceImage.setPhotographTime(DateUtils.strToDate(photographTime,"yyyyMMddHHmmss"));
|
|
|
|
|
|
- idenImageStore.setFeatPtr(FaceIdenTool.getFeatPtr(faceModels,String.valueOf(i)));
|
|
|
+ idenFaceImage.setFeatPtr(FaceIdenTool.getFeatPtr(faceModels,String.valueOf(i)));
|
|
|
|
|
|
File finalDir = new File(imgFile.getParentFile().getAbsolutePath().replace("origin","final"));
|
|
|
if(!finalDir.exists()){
|
|
|
@@ -122,17 +122,17 @@ public class FaceIdenService {
|
|
|
|
|
|
imgFile.renameTo(finalImgFile);//移动到最终目录
|
|
|
|
|
|
- idenImageStore.setImage( imageUrl + cameraCode + "/" + finalImgFile.getName());
|
|
|
+ idenFaceImage.setImage( imageUrl + cameraCode + "/" + finalImgFile.getName());
|
|
|
|
|
|
//TODO 关联personId
|
|
|
- idenImageStore.setCreateTime(new Date());
|
|
|
- idenImageStoreList.add(idenImageStore);
|
|
|
+ idenFaceImage.setCreateTime(new Date());
|
|
|
+ idenFaceImageList.add(idenFaceImage);
|
|
|
}
|
|
|
logger.info("FaceIdenService.exe ...7");
|
|
|
//把图像存到图库中
|
|
|
- if (CollUtil.isNotEmpty(idenImageStoreList)) {
|
|
|
+ if (CollUtil.isNotEmpty(idenFaceImageList)) {
|
|
|
logger.info("FaceIdenService.exe ...8");
|
|
|
- idenImageStoreService.saveBatch(idenImageStoreList);
|
|
|
+ idenFaceImageService.saveBatch(idenFaceImageList);
|
|
|
}
|
|
|
}
|
|
|
|
suntianwu