更新学生轨迹

src/main/java/com/template/controller/SmartFaceDiscernController.java

@@ -106,10 +106,15 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
         List<SmartFaceDiscern> smartFaceDiscerns = smartFaceDiscernService.track(stateTime, endTime, id);
         ArrayList<LastSevenDaysTrackVo> vos = new ArrayList<>();
         for (SmartFaceDiscern faceDiscern : smartFaceDiscerns) {
+            //            人脸通过type查询对应的坐标
+            SmartCoord smartCoord=smartCoordService.getBytype(faceDiscern.getLocation());
             LastSevenDaysTrackVo lastSevenDaysTrackVo = new LastSevenDaysTrackVo();
+            if (ObjectUtils.isNotEmpty(smartCoord)) {
+                lastSevenDaysTrackVo.setLocation(smartCoord.getType());
+            }
             lastSevenDaysTrackVo.setName(faceDiscern.getName());
             lastSevenDaysTrackVo.setType(faceDiscern.getType());
-            lastSevenDaysTrackVo.setLocation(faceDiscern.getLocation());
+//            lastSevenDaysTrackVo.setLocation(faceDiscern.getLocation());
             lastSevenDaysTrackVo.setImage(faceDiscern.getImage());
             lastSevenDaysTrackVo.setDateTime(faceDiscern.getDateTime());
             vos.add(lastSevenDaysTrackVo);
@@ -120,12 +125,18 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
         SmartUser smartUser = smartUserService.getSmartById(id);
         SmartClass smartClass = smartClassService.getSmartClassById(smartUser.getSchoolClass());
         String className = smartClass.getName();
+        //            通过班级找到对应的坐标
+        SmartCoord coord=smartCoordService.getBytype(className);
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         for (SmartAttendance attendance : attendances) {
             LastSevenDaysTrackVo lastSevenDaysTrackVo = new LastSevenDaysTrackVo();
+            if (ObjectUtils.isNotEmpty(coord)) {
+                lastSevenDaysTrackVo.setLocation(coord.getType());
+            }
+
             lastSevenDaysTrackVo.setName(attendance.getXwUserName());
             lastSevenDaysTrackVo.setType("打卡");
-            lastSevenDaysTrackVo.setLocation(className);
+//            lastSevenDaysTrackVo.setLocation(className);
             Date attendTime = attendance.getAttendTime();
             lastSevenDaysTrackVo.setDateTime(sdf.format(attendTime));
             vos.add(lastSevenDaysTrackVo);
@@ -134,10 +145,18 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
 //        门禁信息
         List<SmartAccess> smartAccesses = smartAccessService.track(stateTime, endTime, id);
         for (SmartAccess faceDiscern : smartAccesses) {
+            //            门禁的通过type找到对应的坐标
+            SmartCoord smartCoord=smartCoordService.getBytype(faceDiscern.getType());
+
             LastSevenDaysTrackVo lastSevenDaysTrackVo = new LastSevenDaysTrackVo();
+
+            if (ObjectUtils.isNotEmpty(smartCoord)) {
+                lastSevenDaysTrackVo.setLocation(smartCoord.getType());
+            }
+
             lastSevenDaysTrackVo.setName(faceDiscern.getName());
             lastSevenDaysTrackVo.setType(faceDiscern.getType());
-            lastSevenDaysTrackVo.setLocation(faceDiscern.getLocation());
+//            lastSevenDaysTrackVo.setLocation(faceDiscern.getLocation());
             lastSevenDaysTrackVo.setImage(faceDiscern.getImage());
             lastSevenDaysTrackVo.setDateTime(faceDiscern.getDateTime());
             vos.add(lastSevenDaysTrackVo);
@@ -217,6 +236,7 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
         SmartClass smartClass = smartClassService.getSmartClassById(smartUser.getSchoolClass());
         String className = smartClass.getName();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
         for (SmartAttendance attendance : attendances) {
             LastSevenDaysTrackVo lastSevenDaysTrackVo = new LastSevenDaysTrackVo();
             lastSevenDaysTrackVo.setName(attendance.getXwUserName());
@@ -519,14 +539,14 @@ public class SmartFaceDiscernController implements SmartFaceDiscernControllerAPI
         SmartClass smartClass = smartClassService.getSmartClassById(smartUser.getSchoolClass());
         String className = smartClass.getName();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //            通过班级找到对应的坐标
+        SmartCoord coord=smartCoordService.getBytype(className);
         for (SmartAttendance attendance : attendances) {
-//            通过班级找到对应的坐标
-            SmartCoord smartCoord=smartCoordService.getBytype(className);
             SelectTrackVo vo = new SelectTrackVo();
-            if (ObjectUtils.isNotEmpty(smartCoord)) {
-                vo.setX(smartCoord.getX());
-                vo.setY(smartCoord.getY());
-                vo.setLocation(smartCoord.getType());
+            if (ObjectUtils.isNotEmpty(coord)) {
+                vo.setX(coord.getX());
+                vo.setY(coord.getY());
+                vo.setLocation(coord.getType());
             }
             vo.setName(attendance.getXwUserName());
             vo.setType("打卡");