优化识别

src/main/java/com/iden/bms/service/WarningService.java

@@ -183,6 +183,7 @@ public class WarningService {
                 idenWarningPerson = new IdenWarningPerson();
                 idenWarningPerson.setStrangerType(strangerType);
                 idenWarningPerson.setUid(idenFaceImage.getUid());
+                idenWarningPerson.setPersonId(idenFaceImage.getPersonId());
                 idenWarningPerson.setDataDate(idenFaceImage.getDataDate());
                 idenWarningPerson.setImage(idenFaceImage.getImage());
                 idenWarningPerson.setFeatPtr(idenFaceImage.getFeatPtr());
@@ -226,6 +227,7 @@ public class WarningService {
             IdenWarningEvent idenWarningEvent = new IdenWarningEvent();
             idenWarningEvent.setWarningPersonId(idenWarningPerson.getId());
             idenWarningEvent.setUid(idenWarningPerson.getUid());
+            idenWarningEvent.setPersonId(idenWarningPerson.getPersonId());
             idenWarningEvent.setDataTime(idenFaceImage.getPhotographTime());
             idenWarningEvent.setImage(idenFaceImage.getImage());
             idenWarningEvent.setCommunityId(idenWarningPerson.getCommunityId());
@@ -262,6 +264,7 @@ public class WarningService {
         } else {
             idenWarningPerson = new IdenWarningPerson();
             idenWarningPerson.setUid(idenFaceImage.getUid());
+            idenWarningPerson.setPersonId(idenFaceImage.getPersonId());
             idenWarningPerson.setImage(idenFaceImage.getImage());
             idenWarningPerson.setFeatPtr(idenFaceImage.getFeatPtr());
             idenWarningPerson.setDataDate(idenFaceImage.getDataDate());
@@ -303,6 +306,7 @@ public class WarningService {
         IdenWarningEvent idenWarningEvent = new IdenWarningEvent();
         idenWarningEvent.setWarningPersonId(idenWarningPerson.getId());
         idenWarningEvent.setUid(idenWarningPerson.getUid());
+        idenWarningEvent.setPersonId(idenWarningPerson.getPersonId());
         idenWarningEvent.setDataTime(idenFaceImage.getPhotographTime());
         idenWarningEvent.setImage(idenFaceImage.getImage());
         idenWarningEvent.setCommunityId(idenWarningPerson.getCommunityId());
@@ -354,7 +358,7 @@ public class WarningService {
                 QueryWrapper<IdenWarningPerson> queryWrapper0 = new QueryWrapper<>();
                 queryWrapper0.lambda()
                         .eq(IdenWarningPerson::getCommunityId,idenPerson.getCommunityId())
-                        .eq(IdenWarningPerson::getPersonId,idenPerson.getId())
+                        .eq(IdenWarningPerson::getUid,idenPerson.getUid())
                         .eq(IdenWarningPerson::getType,WarningTypeEnum.RESIDENT.getValue());
                 IdenWarningPerson idenWarningPerson = this.idenWarningPersonService.getOne(queryWrapper0);
                 if (idenWarningPerson != null) {
@@ -366,6 +370,7 @@ public class WarningService {
                     //生成预警数据
                     idenWarningPerson = new IdenWarningPerson();
                     idenWarningPerson.setUid(idenPerson.getUid());
+                    idenWarningPerson.setPersonId(idenPerson.getId());
                     idenWarningPerson.setImage(idenPerson.getImage());
                     idenWarningPerson.setFeatPtr(idenFaceImage.getFeatPtr());
                     idenWarningPerson.setDataDate(DateUtils.getYestodayYyyyMMddDate());
@@ -394,6 +399,7 @@ public class WarningService {
                 IdenWarningEvent idenWarningEvent = new IdenWarningEvent();
                 idenWarningEvent.setWarningPersonId(idenWarningPerson.getId());
                 idenWarningEvent.setUid(idenWarningPerson.getUid());
+                idenWarningEvent.setPersonId(idenWarningPerson.getPersonId());
                 idenWarningEvent.setDataTime(idenWarningPerson.getLatestAppearTime());
                 idenWarningEvent.setImage(idenWarningPerson.getImage());
                 idenWarningEvent.setCommunityId(idenWarningPerson.getCommunityId());
@@ -486,6 +492,7 @@ public class WarningService {
             } else {
                  idenWarningPerson = new IdenWarningPerson();
                 idenWarningPerson.setUid(idenFaceImage.getUid());
+                idenWarningPerson.setPersonId(idenFaceImage.getPersonId());
                 idenWarningPerson.setDataDate(idenFaceImage.getDataDate());
                 idenWarningPerson.setImage(idenFaceImage.getImage());
                 idenWarningPerson.setFeatPtr(idenFaceImage.getFeatPtr());
@@ -526,6 +533,7 @@ public class WarningService {
             IdenWarningEvent idenWarningEvent = new IdenWarningEvent();
             idenWarningEvent.setWarningPersonId(idenWarningPerson.getId());
             idenWarningEvent.setUid(idenWarningPerson.getUid());
+            idenWarningEvent.setPersonId(idenWarningPerson.getPersonId());
             idenWarningEvent.setDataTime(idenFaceImage.getPhotographTime());
             idenWarningEvent.setImage(idenFaceImage.getImage());
             idenWarningEvent.setCommunityId(idenWarningPerson.getCommunityId());