asdsad

src/main/java/com/template/services/SmartAccessService.java

@@ -28,4 +28,6 @@ public interface SmartAccessService extends IService<SmartAccess> {
     PageUtils<SmartAccessVo> getAccessPage(Integer currentPage, Integer pageCount, String keyWord, Integer gradeId, Integer classId, String resultStatus, String inOut, String startTime, String endTime);
 
     List<SmartAccess> toDatelist(LocalDateTime start, LocalDateTime end);
+
+    List<SmartAccess> toDateAndPlacelist(LocalDateTime startTime, LocalDateTime endTime, String type);
 }

src/main/java/com/template/services/SmartFaceDiscernService.java

@@ -47,5 +47,10 @@ public interface SmartFaceDiscernService extends IService<SmartFaceDiscern> {
 
     List<SmartFaceDiscern> toDateList(LocalDateTime start, LocalDateTime end);
 
+<<<<<<< HEAD
     List<FaceDiscernVo> queryFaceCountByDate(String startTime, String endTime);
+=======
+    List<SmartFaceDiscern> toDateAndPlacelist(LocalDateTime startTime, LocalDateTime endTime, String location);
+
+>>>>>>> 0823994e062a148976ef1f1717c7038a0fd434ca
 }

src/main/java/com/template/services/impl/SmartAccessServiceImpl.java

@@ -72,4 +72,13 @@ public class SmartAccessServiceImpl extends ServiceImpl<SmartAccessMapper, Smart
         List<SmartAccess> list = this.list(wrapper);
         return list;
     }
+
+    @Override
+    public List<SmartAccess> toDateAndPlacelist(LocalDateTime startTime, LocalDateTime endTime, String type) {
+        LambdaQueryWrapper<SmartAccess> wrapper=new LambdaQueryWrapper<>();
+        wrapper.between(SmartAccess::getDateTime,startTime,endTime)
+                .eq(SmartAccess::getType,type);
+        List<SmartAccess> list = this.list(wrapper);
+        return list;
+    }
 }

src/main/java/com/template/services/impl/SmartFaceDiscernServiceImpl.java

@@ -322,8 +322,17 @@ public class SmartFaceDiscernServiceImpl extends ServiceImpl<SmartFaceDiscernMap
     }
 
     @Override
+<<<<<<< HEAD
     public List<FaceDiscernVo> queryFaceCountByDate(String startTime, String endTime) {
         List<FaceDiscernVo> fdv = smartFaceDiscernMapper.queryFaceCountByDate(startTime,endTime);
         return fdv;
+=======
+    public List<SmartFaceDiscern> toDateAndPlacelist(LocalDateTime startTime, LocalDateTime endTime, String location) {
+        LambdaQueryWrapper<SmartFaceDiscern> wrapper=new LambdaQueryWrapper<>();
+        wrapper.between(SmartFaceDiscern::getDateTime,startTime,endTime)
+                .eq(SmartFaceDiscern::getLocation,location);
+        List<SmartFaceDiscern> list = this.list(wrapper);
+        return list;
+>>>>>>> 0823994e062a148976ef1f1717c7038a0fd434ca
     }
 }

src/main/java/com/template/services/impl/SmartRelationServiceImpl.java

@@ -76,7 +76,8 @@ public class SmartRelationServiceImpl extends ServiceImpl<SmartRelationMapper, S
                 LocalDateTime endTime = date.plusSeconds(5);
                 Integer userId = smartAccess.getUserId();
                 SmartUser smartUser = smartUserService.getSmartById(userId);
-                List<SmartAccess> accesses = smartAccessService.toDatelist(startTime, endTime);
+                String type = smartAccess.getType();
+                List<SmartAccess> accesses = smartAccessService.toDateAndPlacelist(startTime, endTime,type);
                 if (ObjectUtils.isNotEmpty(accesses) && accesses.size() > 0) {
 
                     for (SmartAccess access : accesses) {
@@ -141,7 +142,8 @@ public class SmartRelationServiceImpl extends ServiceImpl<SmartRelationMapper, S
                 LocalDateTime endTime = date.plusSeconds(5);
                 Integer userId = faceDiscern.getUserId();
                 SmartUser smartUser = smartUserService.getSmartById(userId);
-                List<SmartFaceDiscern> faceDiscerns = smartFaceDiscernService.toDateList(startTime, endTime);
+                String location = faceDiscern.getLocation();
+                List<SmartFaceDiscern> faceDiscerns = smartFaceDiscernService.toDateAndPlacelist(startTime, endTime,location);
                 if (ObjectUtils.isNotEmpty(faceDiscerns) && faceDiscerns.size() > 0) {
 
                     for (SmartFaceDiscern faceDiscern1 : faceDiscerns) {