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 ++++++++++++----
src/main/java/com/skyline/electricity/timer/SchedulerTask.java | 13 ++-----------
src/main/resources/application-dev.yml | 5 +++++
3 files changed, 19 insertions(+), 15 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 ;
}
diff --git a/src/main/java/com/skyline/electricity/timer/SchedulerTask.java b/src/main/java/com/skyline/electricity/timer/SchedulerTask.java
index 1e83b54..a1a1e7c 100644
--- a/src/main/java/com/skyline/electricity/timer/SchedulerTask.java
+++ b/src/main/java/com/skyline/electricity/timer/SchedulerTask.java
@@ -1,15 +1,5 @@
package com.skyline.electricity.timer;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.config.RequestConfig;
-import org.apache.http.client.entity.UrlEncodedFormEntity;
-import org.apache.http.client.methods.CloseableHttpResponse;
-import org.apache.http.client.methods.HttpPost;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.message.BasicNameValuePair;
-import org.apache.http.protocol.HTTP;
-import org.apache.http.util.EntityUtils;
import org.springframework.stereotype.*;
import org.springframework.context.annotation.*;
import org.springframework.beans.factory.annotation.*;
@@ -93,11 +83,12 @@
List<RetInfo> rlist = new ArrayList<>();
list.stream().forEach(r->rlist.add(JSONObject.parseObject(r,RetInfo.class))) ;
if( list != null && list.size() > 0){
+ System.out.println("scheduled....push size:"+list.size());
webSocketController.sendAllMessage(JSONObject.toJSONString(rlist));
}
// System.out.println( "websocket status ..["+JSONObject.toJSONString(rlist)+"]" );
//鎺ㄩ�佹姤璀︿俊鎭�
- pushIM(rlist);
+ //pushIM(rlist);
}
/**
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 4e9e503..6960c67 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -24,6 +24,11 @@
jdbc-url: jdbc:postgresql://10.69.206.79:5432/HBLFDC
username: postgres
password: Terra2024!
+# type: org.apache.commons.dbcp.BasicDataSource
+# driverClassName: org.postgresql.Driver
+# jdbc-url: jdbc:postgresql://192.168.11.28:5433/HBLFDC
+# username: postgres
+# password: 123456
#杩炴帴姹犻厤缃�
dbcp2:
maxWait: 120000
--
Gitblit v1.9.3