From d317d37b3721614370c6e6d79db554ccb5f22083 Mon Sep 17 00:00:00 2001 From: zhangye <654600784@qq.com> Date: Thu, 19 Mar 2020 12:37:20 +0800 Subject: [PATCH] 0319.1 --- .../src/main/java/com/ccsens/health/service/ClockService.java | 2 ++ health/src/main/resources/application.yml | 4 ++-- util/src/main/java/com/ccsens/util/DistanceUtil.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/health/src/main/java/com/ccsens/health/service/ClockService.java b/health/src/main/java/com/ccsens/health/service/ClockService.java index 4f4f0509..b5453835 100644 --- a/health/src/main/java/com/ccsens/health/service/ClockService.java +++ b/health/src/main/java/com/ccsens/health/service/ClockService.java @@ -82,6 +82,8 @@ public class ClockService implements IClockService { siteClockIn.setUserId(userId); siteClockIn.setQrcodeId(clickIn.getSiteId()); siteClockIn.setTime(System.currentTimeMillis()); + siteClockIn.setLocationLatitude(clickIn.getLocationLatitude()); + siteClockIn.setLocationLongitude(clickIn.getLocationLongitude()); siteClockInDao.insertSelective(siteClockIn); } diff --git a/health/src/main/resources/application.yml b/health/src/main/resources/application.yml index 5c2cd5c4..5889ff7f 100644 --- a/health/src/main/resources/application.yml +++ b/health/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: dev - include: common, util-dev \ No newline at end of file + active: test + include: common, util-test \ No newline at end of file diff --git a/util/src/main/java/com/ccsens/util/DistanceUtil.java b/util/src/main/java/com/ccsens/util/DistanceUtil.java index 8cc18973..c6985673 100644 --- a/util/src/main/java/com/ccsens/util/DistanceUtil.java +++ b/util/src/main/java/com/ccsens/util/DistanceUtil.java @@ -10,7 +10,7 @@ public class DistanceUtil { private static double EARTH_RADIUS = 6378.137; private static BigDecimal rad(BigDecimal d) { - return d.multiply(new BigDecimal(Math.PI)).divide(new BigDecimal(180.0)); + return d.multiply(new BigDecimal(Math.PI)).divide(new BigDecimal(180.0),15, BigDecimal.ROUND_DOWN); } /**