From 6c914caa1e16d709d16c39b6ae55bd8b5c8f0283 Mon Sep 17 00:00:00 2001 From: leutu <leutu@qq.com> Date: 星期二, 20 八月 2024 09:54:50 +0800 Subject: [PATCH] 使用本地时间戳,避免时间不同步无法推送数据 --- src/main/java/com/skyline/electricity/timer/Consumer.java | 18 ++++++------------ 1 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/skyline/electricity/timer/Consumer.java b/src/main/java/com/skyline/electricity/timer/Consumer.java index 7028f6a..ca48a60 100644 --- a/src/main/java/com/skyline/electricity/timer/Consumer.java +++ b/src/main/java/com/skyline/electricity/timer/Consumer.java @@ -19,7 +19,6 @@ import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import java.text.SimpleDateFormat; import java.util.*; @Slf4j @@ -73,12 +72,7 @@ System.out.println("銆恥ser]:"+JSONObject.toJSONString(sysUser)); List<RetInfo> list = new ArrayList<>(); //鏌ヨ鐢ㄦ埛鎵�澶勫洿鏍� - List<FencePosition> fencePositionList = null ; - try{ - fencePositionList = (List<FencePosition>)this.detectService.checkInFence(jsonObject.get("w84lat").toString(),jsonObject.get("w84lon").toString()); - }catch (Exception e){ - System.out.println(e.getMessage()); - } + List<FencePosition> fencePositionList = (List<FencePosition>)this.detectService.checkInFence(jsonObject.get("w84lat").toString(),jsonObject.get("w84lon").toString()); System.out.println("銆怓encePosition]:"+JSONObject.toJSONString(fencePositionList)); RetInfo alertinfo = new RetInfo(); initAlertInfos(jsonObject, personNo, sysUser, alertinfo); @@ -120,10 +114,8 @@ alertinfo.setMobile(sysUser.getMobile()); alertinfo.setBaseFloor(jsonObject.get("baseFloor").toString()); - String time = Long.toString(new Date().getTime()); - - alertinfo.setStartTime(time.substring(0,time.length()-3)); - alertinfo.setHb(jsonObject.getIntValue("hb")); + alertinfo.setStartTime(jsonObject.get("timestamp").toString()); + alertinfo.setHb(jsonObject.getInteger("hb").intValue()); } private boolean checkHight(String basefloor,double start){ @@ -137,7 +129,9 @@ Information information = new Information(); information.setFence_type(r.getType()); information.setName(r.getFence_name()); - information.setStartTime(r.getStartTime()); + //information.setStartTime(r.getStartTime()); + //閬垮厤鏃堕棿鍚屾闂 + information.setStartTime((new Date()).getTime()+""); information.setStatus(r.getStatus()); information.setUserId(r.getUserId()); information.setWtId(r.getWtId()); -- Gitblit v1.9.3