推送代码忘记去掉注释，另外schederTask注意时间戳同步

leutu

2024-08-13 75e50e0966d7165e04100a713267ece438482e19

推送代码忘记去掉注释，另外schederTask注意时间戳同步

 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 ;
    }



 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);
    }

    /**

 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