0410.2

health/src/main/java/com/ccsens/health/bean/dto/ClockDto.java

@@ -50,11 +50,9 @@ public class ClockDto {
     @ApiModel("时间段内场所人数统计")
     public static class SiteOverview{
         @ApiModelProperty("场所ID")
-        private Long siteId;
-        @ApiModelProperty("开始时间 默认今天零点")
+        private String siteName;
+        @ApiModelProperty("开始时间")
         private Long startTime;
-        @ApiModelProperty("结束时间 默认当前时间")
-        private Long endTime;
     }
 
     @Data

health/src/main/java/com/ccsens/health/service/ClockService.java

@@ -89,7 +89,7 @@ public class ClockService implements IClockService {
         }
 
         //判断经纬度是否正确
-        boolean inCircle = DistanceUtil.isInCircle(site.getLongitude(), site.getLatitude(), clickIn.getLocationLongitude(), clickIn.getLocationLatitude(), "0.1");
+        boolean inCircle = DistanceUtil.isInCircle(site.getLongitude(), site.getLatitude(), clickIn.getLocationLongitude(), clickIn.getLocationLatitude(), "0.8");
         log.info("是否在半径内：{}", inCircle);
         if (!inCircle) {
             throw new BaseException(CodeEnum.LOCATION_LONG);

health/src/main/java/com/ccsens/health/service/JourneyService.java

@@ -159,6 +159,7 @@ public class JourneyService implements IJourneyService{
      */
     @Override
     public List<JourneyVo.StudentJourneyInfo> getJourneyInfoList(JourneyDto.SelectJourneyByName param, Long userId) {
+//        List<JourneyVo.StudentJourneyInfo> studentJourneyInfos =
         return null;
     }