From 75e50e0966d7165e04100a713267ece438482e19 Mon Sep 17 00:00:00 2001
From: leutu <leutu@qq.com>
Date: 星期二, 13 八月 2024 18:17:27 +0800
Subject: [PATCH] 推送代码忘记去掉注释，另外schederTask注意时间戳同步
---
src/main/java/com/skyline/electricity/timer/Consumer.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 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..13d7c43 100644
--- a/src/main/java/com/skyline/electricity/timer/Consumer.java
+++ b/src/main/java/com/skyline/electricity/timer/Consumer.java
@@ -41,7 +41,7 @@
InformationService informationService ;
@Override
public void onMessage(String message) {
- System.out.println("recv msg: "+message);
+ //System.out.println("recv msg: "+message);
sendAllMessage(message);
}
@@ -64,13 +64,13 @@
*/
public void sendAllMessage(String message) {
- System.out.println("銆恮ebsocket娑堟伅銆戝箍鎾秷鎭�:"+message);
+ //System.out.println("銆恮ebsocket娑堟伅銆戝箍鎾秷鎭�:"+message);
JSONObject jsonObject = JSONObject.parseObject(message);
String personNo = jsonObject.getString("personNo");
SysUser sysUser = infoSynchService.selectUserInfoById(personNo) ;
- System.out.println("銆恥ser]:"+JSONObject.toJSONString(sysUser));
+ //System.out.println("銆恥ser]:"+JSONObject.toJSONString(sysUser));
List<RetInfo> list = new ArrayList<>();
//鏌ヨ鐢ㄦ埛鎵�澶勫洿鏍�
List<FencePosition> fencePositionList = null ;
@@ -79,7 +79,7 @@
}catch (Exception e){
System.out.println(e.getMessage());
}
- System.out.println("銆怓encePosition]:"+JSONObject.toJSONString(fencePositionList));
+ //System.out.println("銆怓encePosition]:"+JSONObject.toJSONString(fencePositionList));
RetInfo alertinfo = new RetInfo();
initAlertInfos(jsonObject, personNo, sysUser, alertinfo);
if( fencePositionList != null && fencePositionList.size() > 0){
@@ -102,8 +102,8 @@
}
insertInformation(list);
System.out.println( "list:"+jsonObject.toJSONString(list));
-// if( list != null && list.size() > 0)
-// System.out.println( "websocket status ..["+webSocketController.sendAllMessage(JSONObject.toJSONString(list))+"["+JSONObject.toJSONString(list)+"]" );
+ if( list != null && list.size() > 0)
+ System.out.println( "websocket status ..["+webSocketController.sendAllMessage(JSONObject.toJSONString(list))+"["+JSONObject.toJSONString(list)+"]" );
}
private void initAlertInfos(JSONObject jsonObject, String personNo, SysUser sysUser, RetInfo alertinfo) {
@@ -126,8 +126,16 @@
alertinfo.setHb(jsonObject.getIntValue("hb"));
}
+ /**
+ * 鍒ゆ柇鍥存爮妤煎眰涓庝笂鎶ヤ綅缃ゼ灞備竴鑷达紝鍚﹀垯涓嶆姤璀�
+ * @param basefloor
+ * @param start
+ * @return
+ */
private boolean checkHight(String basefloor,double start){
- return (Integer.parseInt(basefloor)-2)*6.3 >=start ;
+ double f = start/6.3;
+ int ff = (int)f+2;
+ return (ff-Integer.parseInt(basefloor)) >= 0 ;
}
--
Gitblit v1.9.3