|
@@ -295,6 +295,12 @@ public class WarningService {
|
|
|
|
|
|
idenWarningPerson.setType(WarningTypeEnum.KEYNOTE.getValue());
|
|
idenWarningPerson.setType(WarningTypeEnum.KEYNOTE.getValue());
|
|
idenWarningPerson.setPersonId(idenFaceImage.getPersonId());
|
|
idenWarningPerson.setPersonId(idenFaceImage.getPersonId());
|
|
|
|
+ if(idenWarningPerson.getPersonId() != null){
|
|
|
|
+ IdenPerson idenPerson = this.idenPersonService.getById(idenWarningPerson.getPersonId());
|
|
|
|
+ if(idenPerson != null){
|
|
|
|
+ idenWarningPerson.setPersonName(idenPerson.getName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
idenWarningPerson.setCreateTime(idenFaceImage.getCreateTime());
|
|
idenWarningPerson.setCreateTime(idenFaceImage.getCreateTime());
|
|
this.idenWarningPersonService.save(idenWarningPerson);
|
|
this.idenWarningPersonService.save(idenWarningPerson);
|
|
|
|
|
|
@@ -371,6 +377,7 @@ public class WarningService {
|
|
idenWarningPerson = new IdenWarningPerson();
|
|
idenWarningPerson = new IdenWarningPerson();
|
|
idenWarningPerson.setUid(idenPerson.getUid());
|
|
idenWarningPerson.setUid(idenPerson.getUid());
|
|
idenWarningPerson.setPersonId(idenPerson.getId());
|
|
idenWarningPerson.setPersonId(idenPerson.getId());
|
|
|
|
+ idenWarningPerson.setPersonName(idenPerson.getName());
|
|
idenWarningPerson.setImage(idenPerson.getImage());
|
|
idenWarningPerson.setImage(idenPerson.getImage());
|
|
idenWarningPerson.setFeatPtr(idenPerson.getFeatPtr());
|
|
idenWarningPerson.setFeatPtr(idenPerson.getFeatPtr());
|
|
idenWarningPerson.setDataDate(DateUtils.getYestodayYyyyMMddDate());
|
|
idenWarningPerson.setDataDate(DateUtils.getYestodayYyyyMMddDate());
|
|
@@ -400,6 +407,7 @@ public class WarningService {
|
|
idenWarningEvent.setWarningPersonId(idenWarningPerson.getId());
|
|
idenWarningEvent.setWarningPersonId(idenWarningPerson.getId());
|
|
idenWarningEvent.setUid(idenWarningPerson.getUid());
|
|
idenWarningEvent.setUid(idenWarningPerson.getUid());
|
|
idenWarningEvent.setPersonId(idenWarningPerson.getPersonId());
|
|
idenWarningEvent.setPersonId(idenWarningPerson.getPersonId());
|
|
|
|
+
|
|
idenWarningEvent.setDataTime(idenWarningPerson.getLatestAppearTime());
|
|
idenWarningEvent.setDataTime(idenWarningPerson.getLatestAppearTime());
|
|
idenWarningEvent.setImage(idenWarningPerson.getImage());
|
|
idenWarningEvent.setImage(idenWarningPerson.getImage());
|
|
idenWarningEvent.setCommunityId(idenWarningPerson.getCommunityId());
|
|
idenWarningEvent.setCommunityId(idenWarningPerson.getCommunityId());
|
|
@@ -493,6 +501,12 @@ public class WarningService {
|
|
idenWarningPerson = new IdenWarningPerson();
|
|
idenWarningPerson = new IdenWarningPerson();
|
|
idenWarningPerson.setUid(idenFaceImage.getUid());
|
|
idenWarningPerson.setUid(idenFaceImage.getUid());
|
|
idenWarningPerson.setPersonId(idenFaceImage.getPersonId());
|
|
idenWarningPerson.setPersonId(idenFaceImage.getPersonId());
|
|
|
|
+ if(idenWarningPerson.getPersonId() != null){
|
|
|
|
+ IdenPerson idenPerson = this.idenPersonService.getById(idenWarningPerson.getPersonId());
|
|
|
|
+ if(idenPerson != null){
|
|
|
|
+ idenWarningPerson.setPersonName(idenPerson.getName());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
idenWarningPerson.setDataDate(idenFaceImage.getDataDate());
|
|
idenWarningPerson.setDataDate(idenFaceImage.getDataDate());
|
|
idenWarningPerson.setImage(idenFaceImage.getImage());
|
|
idenWarningPerson.setImage(idenFaceImage.getImage());
|
|
idenWarningPerson.setFeatPtr(idenFaceImage.getFeatPtr());
|
|
idenWarningPerson.setFeatPtr(idenFaceImage.getFeatPtr());
|