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 |   16 ++++++++++++----
 1 files changed, 12 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 d6e13ba..13d7c43 100644
--- a/src/main/java/com/skyline/electricity/timer/Consumer.java
+++ b/src/main/java/com/skyline/electricity/timer/Consumer.java
@@ -101,9 +101,9 @@
             list.add(alertinfo) ;
         }
         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)+"]" );
+        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)+"]" );
     }
 
     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