From bbd50cf91c9a8c7cfe48b3c00dde205b7049ae3b Mon Sep 17 00:00:00 2001
From: leutu <leutu@qq.com>
Date: 星期二, 20 八月 2024 14:50:32 +0800
Subject: [PATCH] 时间戳/1000 成为秒，围栏采用楼层判断
---
src/main/java/com/skyline/electricity/timer/Consumer.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/skyline/electricity/timer/Consumer.java b/src/main/java/com/skyline/electricity/timer/Consumer.java
index ca48a60..46c6146 100644
--- a/src/main/java/com/skyline/electricity/timer/Consumer.java
+++ b/src/main/java/com/skyline/electricity/timer/Consumer.java
@@ -82,7 +82,7 @@
Fence_User fence_user = detectService.checkInAlert(f.getWorkId(),sysUser.getId());
alertinfo.setFence_name(f.getFname());
alertinfo.setWtId(f.getWorkId());
- if( fence_user == null && checkHight(alertinfo.getBaseFloor(),f.getStartaltitude())){
+ if( fence_user == null && checkHight(alertinfo.getBaseFloor(),f)){
alertinfo.setStatus("alert");
}else{
@@ -118,8 +118,10 @@
alertinfo.setHb(jsonObject.getInteger("hb").intValue());
}
- private boolean checkHight(String basefloor,double start){
- return (Integer.parseInt(basefloor)-2)*6.3 >=start ;
+ private boolean checkHight(String basefloor,FencePosition f){
+ int fl = (int)(f.getEndaltitude()/7)+1 ;
+ System.out.println("鎺ユ敹锛�"+basefloor+" 鍥存爮妤煎眰:"+f.getFname()+":"+fl);
+ return (Integer.parseInt(basefloor)-1) ==fl ;
}
@@ -131,7 +133,7 @@
information.setName(r.getFence_name());
//information.setStartTime(r.getStartTime());
//閬垮厤鏃堕棿鍚屾闂
- information.setStartTime((new Date()).getTime()+"");
+ information.setStartTime((new Date()).getTime()/1000+"");
information.setStatus(r.getStatus());
information.setUserId(r.getUserId());
information.setWtId(r.getWtId());
--
Gitblit v1.9.3