|
@@ -946,6 +946,9 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
|
|
if(Validator.isEmpty(studyEndTime)||(studyEndTime.longValue()<userPeriodStatusVo.getRecordEndTime().longValue())){
|
|
if(Validator.isEmpty(studyEndTime)||(studyEndTime.longValue()<userPeriodStatusVo.getRecordEndTime().longValue())){
|
|
studyEndTime = userPeriodStatusVo.getRecordEndTime();
|
|
studyEndTime = userPeriodStatusVo.getRecordEndTime();
|
|
}
|
|
}
|
|
|
|
+ if(Validator.isEmpty(studyStartTime)||(studyStartTime.longValue()>userPeriodStatusVo.getRecordStartTime().longValue())){
|
|
|
|
+ studyStartTime = userPeriodStatusVo.getRecordStartTime();
|
|
|
|
+ }
|
|
syncUserStudyRec.setStudyIP(userPeriodStatusVo.getIp());
|
|
syncUserStudyRec.setStudyIP(userPeriodStatusVo.getIp());
|
|
List<SyncUserImageRc> ImgList = new ArrayList<>();
|
|
List<SyncUserImageRc> ImgList = new ArrayList<>();
|
|
for (UserStudyRecordPhoto videoPhoto : videoPhoto2) {
|
|
for (UserStudyRecordPhoto videoPhoto : videoPhoto2) {
|
|
@@ -954,9 +957,6 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
|
|
imageRc.setCreateTime(DateUtils.timestampToDateFormat(videoPhoto.getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
|
|
imageRc.setCreateTime(DateUtils.timestampToDateFormat(videoPhoto.getCreateTime(),DateUtils.YYYY_MM_DD_HH_MM_SS));
|
|
imageRc.setMatchData(Validator.isNotEmpty(videoPhoto.getSimilarity())?videoPhoto.getSimilarity().toString():null);
|
|
imageRc.setMatchData(Validator.isNotEmpty(videoPhoto.getSimilarity())?videoPhoto.getSimilarity().toString():null);
|
|
ImgList.add(imageRc);
|
|
ImgList.add(imageRc);
|
|
- if(Validator.isEmpty(studyStartTime)||(studyStartTime.longValue()>videoPhoto.getCreateTime().longValue())){
|
|
|
|
- studyStartTime = videoPhoto.getCreateTime();
|
|
|
|
- }
|
|
|
|
}
|
|
}
|
|
syncUserStudyRec.setImgList(ImgList);
|
|
syncUserStudyRec.setImgList(ImgList);
|
|
}
|
|
}
|