diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseResponse.class b/target/classes/org/well/well/resp/NoiseResponse.class index d080000..0e32d19 100644 --- a/target/classes/org/well/well/resp/NoiseResponse.class +++ b/target/classes/org/well/well/resp/NoiseResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseResponse.class b/target/classes/org/well/well/resp/NoiseResponse.class index d080000..0e32d19 100644 --- a/target/classes/org/well/well/resp/NoiseResponse.class +++ b/target/classes/org/well/well/resp/NoiseResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempHumiResponse.class b/target/classes/org/well/well/resp/TempHumiResponse.class index 038c9b7..186e904 100644 --- a/target/classes/org/well/well/resp/TempHumiResponse.class +++ b/target/classes/org/well/well/resp/TempHumiResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseResponse.class b/target/classes/org/well/well/resp/NoiseResponse.class index d080000..0e32d19 100644 --- a/target/classes/org/well/well/resp/NoiseResponse.class +++ b/target/classes/org/well/well/resp/NoiseResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempHumiResponse.class b/target/classes/org/well/well/resp/TempHumiResponse.class index 038c9b7..186e904 100644 --- a/target/classes/org/well/well/resp/TempHumiResponse.class +++ b/target/classes/org/well/well/resp/TempHumiResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempPressureResponse.class b/target/classes/org/well/well/resp/TempPressureResponse.class index db9199d..ecccac4 100644 --- a/target/classes/org/well/well/resp/TempPressureResponse.class +++ b/target/classes/org/well/well/resp/TempPressureResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseResponse.class b/target/classes/org/well/well/resp/NoiseResponse.class index d080000..0e32d19 100644 --- a/target/classes/org/well/well/resp/NoiseResponse.class +++ b/target/classes/org/well/well/resp/NoiseResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempHumiResponse.class b/target/classes/org/well/well/resp/TempHumiResponse.class index 038c9b7..186e904 100644 --- a/target/classes/org/well/well/resp/TempHumiResponse.class +++ b/target/classes/org/well/well/resp/TempHumiResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempPressureResponse.class b/target/classes/org/well/well/resp/TempPressureResponse.class index db9199d..ecccac4 100644 --- a/target/classes/org/well/well/resp/TempPressureResponse.class +++ b/target/classes/org/well/well/resp/TempPressureResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TubeResponse.class b/target/classes/org/well/well/resp/TubeResponse.class index dc2a360..19e700d 100644 --- a/target/classes/org/well/well/resp/TubeResponse.class +++ b/target/classes/org/well/well/resp/TubeResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseResponse.class b/target/classes/org/well/well/resp/NoiseResponse.class index d080000..0e32d19 100644 --- a/target/classes/org/well/well/resp/NoiseResponse.class +++ b/target/classes/org/well/well/resp/NoiseResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempHumiResponse.class b/target/classes/org/well/well/resp/TempHumiResponse.class index 038c9b7..186e904 100644 --- a/target/classes/org/well/well/resp/TempHumiResponse.class +++ b/target/classes/org/well/well/resp/TempHumiResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempPressureResponse.class b/target/classes/org/well/well/resp/TempPressureResponse.class index db9199d..ecccac4 100644 --- a/target/classes/org/well/well/resp/TempPressureResponse.class +++ b/target/classes/org/well/well/resp/TempPressureResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TubeResponse.class b/target/classes/org/well/well/resp/TubeResponse.class index dc2a360..19e700d 100644 --- a/target/classes/org/well/well/resp/TubeResponse.class +++ b/target/classes/org/well/well/resp/TubeResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WasteGasResponse.class b/target/classes/org/well/well/resp/WasteGasResponse.class index 0651526..aba41d7 100644 --- a/target/classes/org/well/well/resp/WasteGasResponse.class +++ b/target/classes/org/well/well/resp/WasteGasResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseResponse.class b/target/classes/org/well/well/resp/NoiseResponse.class index d080000..0e32d19 100644 --- a/target/classes/org/well/well/resp/NoiseResponse.class +++ b/target/classes/org/well/well/resp/NoiseResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempHumiResponse.class b/target/classes/org/well/well/resp/TempHumiResponse.class index 038c9b7..186e904 100644 --- a/target/classes/org/well/well/resp/TempHumiResponse.class +++ b/target/classes/org/well/well/resp/TempHumiResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempPressureResponse.class b/target/classes/org/well/well/resp/TempPressureResponse.class index db9199d..ecccac4 100644 --- a/target/classes/org/well/well/resp/TempPressureResponse.class +++ b/target/classes/org/well/well/resp/TempPressureResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TubeResponse.class b/target/classes/org/well/well/resp/TubeResponse.class index dc2a360..19e700d 100644 --- a/target/classes/org/well/well/resp/TubeResponse.class +++ b/target/classes/org/well/well/resp/TubeResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WasteGasResponse.class b/target/classes/org/well/well/resp/WasteGasResponse.class index 0651526..aba41d7 100644 --- a/target/classes/org/well/well/resp/WasteGasResponse.class +++ b/target/classes/org/well/well/resp/WasteGasResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WellResponse.class b/target/classes/org/well/well/resp/WellResponse.class index bc88b36..eea9cee 100644 --- a/target/classes/org/well/well/resp/WellResponse.class +++ b/target/classes/org/well/well/resp/WellResponse.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseResponse.class b/target/classes/org/well/well/resp/NoiseResponse.class index d080000..0e32d19 100644 --- a/target/classes/org/well/well/resp/NoiseResponse.class +++ b/target/classes/org/well/well/resp/NoiseResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempHumiResponse.class b/target/classes/org/well/well/resp/TempHumiResponse.class index 038c9b7..186e904 100644 --- a/target/classes/org/well/well/resp/TempHumiResponse.class +++ b/target/classes/org/well/well/resp/TempHumiResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempPressureResponse.class b/target/classes/org/well/well/resp/TempPressureResponse.class index db9199d..ecccac4 100644 --- a/target/classes/org/well/well/resp/TempPressureResponse.class +++ b/target/classes/org/well/well/resp/TempPressureResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TubeResponse.class b/target/classes/org/well/well/resp/TubeResponse.class index dc2a360..19e700d 100644 --- a/target/classes/org/well/well/resp/TubeResponse.class +++ b/target/classes/org/well/well/resp/TubeResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WasteGasResponse.class b/target/classes/org/well/well/resp/WasteGasResponse.class index 0651526..aba41d7 100644 --- a/target/classes/org/well/well/resp/WasteGasResponse.class +++ b/target/classes/org/well/well/resp/WasteGasResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WellResponse.class b/target/classes/org/well/well/resp/WellResponse.class index bc88b36..eea9cee 100644 --- a/target/classes/org/well/well/resp/WellResponse.class +++ b/target/classes/org/well/well/resp/WellResponse.class Binary files differ diff --git a/target/classes/org/well/well/scheduler/DeviceCheckingJob.class b/target/classes/org/well/well/scheduler/DeviceCheckingJob.class index f0beb5f..23eeb0c 100644 --- a/target/classes/org/well/well/scheduler/DeviceCheckingJob.class +++ b/target/classes/org/well/well/scheduler/DeviceCheckingJob.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseResponse.class b/target/classes/org/well/well/resp/NoiseResponse.class index d080000..0e32d19 100644 --- a/target/classes/org/well/well/resp/NoiseResponse.class +++ b/target/classes/org/well/well/resp/NoiseResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempHumiResponse.class b/target/classes/org/well/well/resp/TempHumiResponse.class index 038c9b7..186e904 100644 --- a/target/classes/org/well/well/resp/TempHumiResponse.class +++ b/target/classes/org/well/well/resp/TempHumiResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempPressureResponse.class b/target/classes/org/well/well/resp/TempPressureResponse.class index db9199d..ecccac4 100644 --- a/target/classes/org/well/well/resp/TempPressureResponse.class +++ b/target/classes/org/well/well/resp/TempPressureResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TubeResponse.class b/target/classes/org/well/well/resp/TubeResponse.class index dc2a360..19e700d 100644 --- a/target/classes/org/well/well/resp/TubeResponse.class +++ b/target/classes/org/well/well/resp/TubeResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WasteGasResponse.class b/target/classes/org/well/well/resp/WasteGasResponse.class index 0651526..aba41d7 100644 --- a/target/classes/org/well/well/resp/WasteGasResponse.class +++ b/target/classes/org/well/well/resp/WasteGasResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WellResponse.class b/target/classes/org/well/well/resp/WellResponse.class index bc88b36..eea9cee 100644 --- a/target/classes/org/well/well/resp/WellResponse.class +++ b/target/classes/org/well/well/resp/WellResponse.class Binary files differ diff --git a/target/classes/org/well/well/scheduler/DeviceCheckingJob.class b/target/classes/org/well/well/scheduler/DeviceCheckingJob.class index f0beb5f..23eeb0c 100644 --- a/target/classes/org/well/well/scheduler/DeviceCheckingJob.class +++ b/target/classes/org/well/well/scheduler/DeviceCheckingJob.class Binary files differ diff --git a/target/classes/org/well/well/util/Configure.class b/target/classes/org/well/well/util/Configure.class index 63f724e..afe3666 100644 --- a/target/classes/org/well/well/util/Configure.class +++ b/target/classes/org/well/well/util/Configure.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseResponse.class b/target/classes/org/well/well/resp/NoiseResponse.class index d080000..0e32d19 100644 --- a/target/classes/org/well/well/resp/NoiseResponse.class +++ b/target/classes/org/well/well/resp/NoiseResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempHumiResponse.class b/target/classes/org/well/well/resp/TempHumiResponse.class index 038c9b7..186e904 100644 --- a/target/classes/org/well/well/resp/TempHumiResponse.class +++ b/target/classes/org/well/well/resp/TempHumiResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempPressureResponse.class b/target/classes/org/well/well/resp/TempPressureResponse.class index db9199d..ecccac4 100644 --- a/target/classes/org/well/well/resp/TempPressureResponse.class +++ b/target/classes/org/well/well/resp/TempPressureResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TubeResponse.class b/target/classes/org/well/well/resp/TubeResponse.class index dc2a360..19e700d 100644 --- a/target/classes/org/well/well/resp/TubeResponse.class +++ b/target/classes/org/well/well/resp/TubeResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WasteGasResponse.class b/target/classes/org/well/well/resp/WasteGasResponse.class index 0651526..aba41d7 100644 --- a/target/classes/org/well/well/resp/WasteGasResponse.class +++ b/target/classes/org/well/well/resp/WasteGasResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WellResponse.class b/target/classes/org/well/well/resp/WellResponse.class index bc88b36..eea9cee 100644 --- a/target/classes/org/well/well/resp/WellResponse.class +++ b/target/classes/org/well/well/resp/WellResponse.class Binary files differ diff --git a/target/classes/org/well/well/scheduler/DeviceCheckingJob.class b/target/classes/org/well/well/scheduler/DeviceCheckingJob.class index f0beb5f..23eeb0c 100644 --- a/target/classes/org/well/well/scheduler/DeviceCheckingJob.class +++ b/target/classes/org/well/well/scheduler/DeviceCheckingJob.class Binary files differ diff --git a/target/classes/org/well/well/util/Configure.class b/target/classes/org/well/well/util/Configure.class index 63f724e..afe3666 100644 --- a/target/classes/org/well/well/util/Configure.class +++ b/target/classes/org/well/well/util/Configure.class Binary files differ diff --git a/target/classes/org/well/well/util/PropertiesUtil.class b/target/classes/org/well/well/util/PropertiesUtil.class index 120812a..aa8ddec 100644 --- a/target/classes/org/well/well/util/PropertiesUtil.class +++ b/target/classes/org/well/well/util/PropertiesUtil.class Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseResponse.class b/target/classes/org/well/well/resp/NoiseResponse.class index d080000..0e32d19 100644 --- a/target/classes/org/well/well/resp/NoiseResponse.class +++ b/target/classes/org/well/well/resp/NoiseResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempHumiResponse.class b/target/classes/org/well/well/resp/TempHumiResponse.class index 038c9b7..186e904 100644 --- a/target/classes/org/well/well/resp/TempHumiResponse.class +++ b/target/classes/org/well/well/resp/TempHumiResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempPressureResponse.class b/target/classes/org/well/well/resp/TempPressureResponse.class index db9199d..ecccac4 100644 --- a/target/classes/org/well/well/resp/TempPressureResponse.class +++ b/target/classes/org/well/well/resp/TempPressureResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TubeResponse.class b/target/classes/org/well/well/resp/TubeResponse.class index dc2a360..19e700d 100644 --- a/target/classes/org/well/well/resp/TubeResponse.class +++ b/target/classes/org/well/well/resp/TubeResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WasteGasResponse.class b/target/classes/org/well/well/resp/WasteGasResponse.class index 0651526..aba41d7 100644 --- a/target/classes/org/well/well/resp/WasteGasResponse.class +++ b/target/classes/org/well/well/resp/WasteGasResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WellResponse.class b/target/classes/org/well/well/resp/WellResponse.class index bc88b36..eea9cee 100644 --- a/target/classes/org/well/well/resp/WellResponse.class +++ b/target/classes/org/well/well/resp/WellResponse.class Binary files differ diff --git a/target/classes/org/well/well/scheduler/DeviceCheckingJob.class b/target/classes/org/well/well/scheduler/DeviceCheckingJob.class index f0beb5f..23eeb0c 100644 --- a/target/classes/org/well/well/scheduler/DeviceCheckingJob.class +++ b/target/classes/org/well/well/scheduler/DeviceCheckingJob.class Binary files differ diff --git a/target/classes/org/well/well/util/Configure.class b/target/classes/org/well/well/util/Configure.class index 63f724e..afe3666 100644 --- a/target/classes/org/well/well/util/Configure.class +++ b/target/classes/org/well/well/util/Configure.class Binary files differ diff --git a/target/classes/org/well/well/util/PropertiesUtil.class b/target/classes/org/well/well/util/PropertiesUtil.class index 120812a..aa8ddec 100644 --- a/target/classes/org/well/well/util/PropertiesUtil.class +++ b/target/classes/org/well/well/util/PropertiesUtil.class Binary files differ diff --git a/target/classes/org/well/well/util/PushList.class b/target/classes/org/well/well/util/PushList.class deleted file mode 100644 index 98de9b0..0000000 --- a/target/classes/org/well/well/util/PushList.class +++ /dev/null Binary files differ diff --git a/src/main/java/org/well/mysql/sink/WellSink.java b/src/main/java/org/well/mysql/sink/WellSink.java index 88567ff..58617f8 100644 --- a/src/main/java/org/well/mysql/sink/WellSink.java +++ b/src/main/java/org/well/mysql/sink/WellSink.java @@ -125,17 +125,19 @@ // temp="{\"mType\":\"Event\",\"devType\":\"Concentrator\",\"devCode\":\"00003\",\"mBody\":{\"logTime\":\"20190605002024\",\"bType\":\"ConcentratorOnline\"},\"ts\":1559665224343}"; - temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"datas\":[{\"value\":\"00\",\"uptime\":\"20210624000000\"}],\"logTime\":\"20210624000000\",\"bType\":\"WellData\"},\"ts\":1559665802828}"; // temp="{\"mType\":\"Data\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"cell\":9.9,\"datas\":[{\"level\":1.1892,\"uptime\":\"20191213000000\"}],\"logTime\":\"20190502000125\",\"bType\":\"LiquidData\"},\"ts\":1556726485336}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidPressureError\"],\"logTime\":\"20190510134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; - temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; +// temp="{\"mType\":\"Event\",\"devType\":\"Well\",\"devCode\":\"412020110001\",\"mBody\":{\"eventType\":[\"WellOpenAlarm\"],\"logTime\":\"20190624114710\",\"bType\":\"WellEvent\"},\"ts\":1560484030810}"; // temp="{\"mType\":\"Data\",\"devType\":\"Locator\",\"devCode\":\"71201900001\",\"mBody\":{\"datas\":[{\"longitude\":126.243324343,\"latitude\":39.2546546546,\"uptime\":\"20190809140900\"}],\"logTime\":\"20190809141012\",\"bType\":\"LocatorData\"},\"ts\":1565331012453}"; // temp="{\"mType\":\"Data\",\"devType\":\"NoiseDig\",\"devCode\":\"14141414146\",\"mBody\":{\"cell\":99,\"datas\":[{\"noiseVal\":84.7926,\"noiseFreq\":1421,\"uptime\":\"20191017141000\"},{\"noiseVal\":48.1797,\"noiseFreq\":212,\"uptime\":\"20190822141300\"},{\"noiseVal\":33.1398,\"noiseFreq\":553,\"uptime\":\"20190822141600\"},{\"noiseVal\":0.85,\"noiseFreq\":1049,\"uptime\":\"20190822141900\"},{\"noiseVal\":0.86,\"noiseFreq\":1545,\"uptime\":\"20191017142200\"}],\"logTime\":\"20190822141337\",\"bType\":\"NoiseDigData\"},\"ts\":1566454417130}"; // temp="{\"mType\":\"Data\",\"devType\":\"WasteGas\",\"devCode\":\"21201900001\",\"mBody\":{\"datas\":[{\"CO\":60,\"O2\":25,\"H2S\":15,\"CH4\":7,\"liquidSwitch\":true,\"uptime\":\"20191018163319\"}],\"logTime\":\"20191018151844\",\"bType\":\"WasteGasData\"},\"ts\":1571296724288}"; // temp="{\"mType\":\"Data\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"cell\":99,\"datas\":[{\"temperature\":.55,\"humidity\":0.2,\"uptime\":\"20191017150000\"}],\"logTime\":\"20191017150225\",\"bType\":\"TempHumiData\"},\"ts\":1571295745881}"; // temp="{\"mType\":\"Event\",\"devType\":\"Liquid\",\"devCode\":\"11201900001\",\"mBody\":{\"eventType\":[\"LiquidUltrasonicError\"],\"logTime\":\"20190710134635\",\"bType\":\"LiquidEvent\"},\"ts\":1557467195358}"; -// temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"31201900001\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":10.8701172,\"uptime\":\"20191017135400\"}],\"logTime\":\"20191017140124\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; + + temp="{\"mType\":\"Data\",\"devType\":\"Methane\",\"devCode\":\"312021040005\",\"mBody\":{\"cell\":84,\"pci\":279,\"rsrp\":-115,\"snr\":11,\"datas\":[{\"gas\":98.0,\"uptime\":\"20220915115800\"}],\"logTime\":\"20220915115332\",\"bType\":\"MethaneData\"},\"ts\":1663125512779}"; // temp="{\"mType\":\"Event\",\"devType\":\"TempHumi\",\"devCode\":\"51201900001\",\"mBody\":{\"eventType\":[\"TemperatureFail\",\"TemperatureError\",\"HumidityFail\",\"HumidityError\"],\"logTime\":\"20191021140118\",\"bType\":\"TempHumiEvent\"},\"ts\":1571292078959}"; // temp="{\"mType\":\"SetResponse\",\"devType\":\"NoiseDig\",\"devCode\":\"88888888881\",\"mBody\":{\"bType\":\"NoiseDigConfigSuccess\"},\"ts\":1556182310514}"; @@ -155,7 +157,7 @@ // List arr= new ArrayList(); // - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"1111111111\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":26.8701172,\"uptime\":\"20210813115400\"}],\"logTime\":\"20210813105400\",\"bType\":\"MethaneData\"},\"ts\":1571292084960}"; // arr.add(temp); // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"3123421342314\",\"mBody\":{\"cell\":95,\"datas\":[{\"gas\":0.064453125,\"uptime\":\"20191017085400\"},{\"gas\":0.080566406,\"uptime\":\"20191017095400\"},{\"gas\":10,\"uptime\":\"20191017105400\"},{\"gas\":0.09990235,\"uptime\":\"20191017115400\"},{\"gas\":0.070898436,\"uptime\":\"20191017125400\"},{\"gas\":50.8701172,\"uptime\":\"20210813105700\"}],\"logTime\":\"20210813105400\",\"bType\":\"LGData\"},\"ts\":1571292084960}"; // arr.add(temp); @@ -165,10 +167,10 @@ // temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322019010222\",\"mBody\":{\"cell\":92,\"pci\":60,\"rsrp\":-87,\"snr\":14,\"datas\":[{\"gas\":0.0,\"uptime\":\"20210819000900\"}],\"logTime\":\"20210819001029\",\"bType\":\"LGData\"},\"ts\":1629303029014}"; // arr.add(temp); - temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; - - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; - temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; +// temp="{\"mType\":\"Data\",\"devType\":\"Tube\",\"devCode\":\"342020030014\",\"mBody\":{\"cell\":15,\"pci\":94,\"rsrp\":-103,\"snr\":7,\"datas\":[{\"gas\":0.0,\"uptime\":\"20211128000000\"}],\"logTime\":\"20211210174648\",\"bType\":\"TubeData\"},\"ts\":1639129608475}"; +// +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050010\",\"mBody\":{\"cell\":91,\"pci\":279,\"rsrp\":-105,\"snr\":10,\"datas\":[{\"gas\":40.0,\"uptime\":\"20220113175000\"},{\"liquid\":1040.07336,\"uptime\":\"20220113175000\"}],\"logTime\":\"20220113175144\",\"bType\":\"LGData\"},\"ts\":1642067504321}"; +// temp="{\"mType\":\"Data\",\"devType\":\"LG\",\"devCode\":\"322021050019\",\"mBody\":{\"cell\":83,\"pci\":100,\"rsrp\":-85,\"snr\":24,\"datas\":[{\"gas\":0.599999964,\"uptime\":\"20220513020200\"},{\"gas\":0.599999964,\"uptime\":\"20220513030200\"},{\"liquid\":1108.392,\"uptime\":\"20220513020200\"},{\"liquid\":1112.47058,\"uptime\":\"20220513030200\"}],\"logTime\":\"20220513030400\",\"bType\":\"LGData\"},\"ts\":1652382240656}"; AbstractResponse resp = ResponseResolver.makeResponse(temp); resp.setAc(ac); // for(String dd:arr){ diff --git a/src/main/java/org/well/well/core/util/SmsPushUtil.java b/src/main/java/org/well/well/core/util/SmsPushUtil.java index 7fe7eca..b4a091f 100644 --- a/src/main/java/org/well/well/core/util/SmsPushUtil.java +++ b/src/main/java/org/well/well/core/util/SmsPushUtil.java @@ -28,11 +28,11 @@ @Override public void run() { try { - String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_single", smsBody); + String retMsg = HttpClientUtils.post(smsUrl + "/sms/v2/std/send_batch", smsBody); Map msgMap = (HashMap) JSON.parse(retMsg); if (String.valueOf(msgMap.get("result")).equals("0")) { Thread.sleep(500); - System.out.println("--------消息推送消息平台，推送成功,成功消息" + retMsg + ",消息内容：" + message); + System.out.println("--------消息推送消息平台，推送成功,手机号为" + phone + ",消息内容：" + message); } else { System.out.println("--------消息推送消息平台失败，手机号：" + phone + ",消息内容：" + message); } diff --git a/src/main/java/org/well/well/manager/MethaneManager.java b/src/main/java/org/well/well/manager/MethaneManager.java index 7e7039c..df94ec7 100644 --- a/src/main/java/org/well/well/manager/MethaneManager.java +++ b/src/main/java/org/well/well/manager/MethaneManager.java @@ -84,6 +84,7 @@ alarmRecordManager.clearAlarmByNormalData(devCode, ""); //获取报警阈值 List ruleRankList = alarmRuleManager.getRuleRank(devCode); + float rankThresh = 0; String isAlarm = "1"; if (ruleRankList.size() > 0 && ruleRankList.get(0)[0] != null) { @@ -123,13 +124,11 @@ devCode, busWell != null ? busWell.getWellCode() : "", upTime, alarmContent); //3.toDo:向app推送报警消息 ThreadUtil.excuteMsg(jobId, alarmContent); - if (!StringUtils.isEmpty(busWell.getTel())) { - final String pushMsgContent = "在" + new Timestamp((new Date()).getTime()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + ",为" + alarmLevel + "级报警"; + final String pushMsgContent = "在" + DateUtils.sdf4.format(new Date()) + ",设备" + devCode + "在" + busWell.getPosition() + "发生" + alarmContent + "，浓度值为"+gas; //4.toDO:向济南港华推送消息 SmsPushUtil.excutePushMsg(busWell.getTel(), pushMsgContent); } - } else { alarmJobManager.updateAlarmJobByDevCode(devCode, "数据正常，系统自动结束工单"); } diff --git a/src/main/java/org/well/well/manager/TempHumiManager.java b/src/main/java/org/well/well/manager/TempHumiManager.java index 9bbec2b..c7ec546 100644 --- a/src/main/java/org/well/well/manager/TempHumiManager.java +++ b/src/main/java/org/well/well/manager/TempHumiManager.java @@ -14,7 +14,6 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; diff --git a/src/main/java/org/well/well/manager/WasteGasManager.java b/src/main/java/org/well/well/manager/WasteGasManager.java index 3fc7d40..e0bda7f 100644 --- a/src/main/java/org/well/well/manager/WasteGasManager.java +++ b/src/main/java/org/well/well/manager/WasteGasManager.java @@ -13,12 +13,10 @@ import org.well.well.core.util.StringUtils; import org.well.well.core.util.ThreadUtil; import org.well.well.domain.*; -import org.well.well.util.PushList; import org.well.well.util.SnowFlakeUtil; import javax.annotation.Resource; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/main/java/org/well/well/util/Configure.java b/src/main/java/org/well/well/util/Configure.java index 10dbe18..2667ad1 100644 --- a/src/main/java/org/well/well/util/Configure.java +++ b/src/main/java/org/well/well/util/Configure.java @@ -2,40 +2,71 @@ import java.io.IOException; import java.io.InputStream; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.Date; import java.util.Properties; public class Configure { - private static Properties properties = new Properties(); + private static Properties properties = new Properties(); - static { - try { - ClassLoader cl = Configure.class.getClassLoader(); - InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); - properties.load(is); - } catch (IOException e) { - e.printStackTrace(); - } - } + static { + try { + ClassLoader cl = Configure.class.getClassLoader(); + InputStream is = cl.getResourceAsStream("wellSensor/application.properties"); + properties.load(is); + } catch (IOException e) { + e.printStackTrace(); + } + } - public static String getProperty(String key) { - return properties.getProperty(key); - } + public static String getProperty(String key) { + return properties.getProperty(key); + } - public static String getProperty(String key, String defaultValue) { - String value = properties.getProperty(key); - if (null == value) { - return defaultValue; - } else { - return value; - } - } + public static String getProperty(String key, String defaultValue) { + String value = properties.getProperty(key); + if (null == value) { + return defaultValue; + } else { + return value; + } + } - public static Object setProperty(String key,String value) { - return properties.setProperty(key,value); - } - public static void main(String[] args) { + public static Object setProperty(String key, String value) { + return properties.setProperty(key, value); + } - } + public static void main(String[] args) { + + String prefix = new SimpleDateFormat("yyyyMMdd"). + format(new Date(Long.valueOf("1658592000000"))); + System.out.println(prefix); + try { + Date time = new SimpleDateFormat("yyyyMMdd"). + parse("20220905"); + System.out.println("09-05-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220912"); + System.out.println("09-12-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220919"); + System.out.println("09-19-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20220926"); + System.out.println("09-26-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221003"); + System.out.println("10-03-"+time.getTime()); + time = new SimpleDateFormat("yyyyMMdd"). + parse("20221010"); + System.out.println("10-10-"+time.getTime()); + + } catch (Exception e) { + + } + + } } diff --git a/src/main/java/org/well/well/util/PropertiesUtil.java b/src/main/java/org/well/well/util/PropertiesUtil.java index 06514a6..9772d8e 100644 --- a/src/main/java/org/well/well/util/PropertiesUtil.java +++ b/src/main/java/org/well/well/util/PropertiesUtil.java @@ -1,43 +1,55 @@ package org.well.well.util; +import org.well.well.core.util.SmsPushUtil; + import java.io.IOException; import java.io.InputStream; -import java.util.HashMap; -import java.util.InvalidPropertiesFormatException; -import java.util.Map; -import java.util.Properties; +import java.sql.Timestamp; +import java.text.SimpleDateFormat; +import java.util.*; public class PropertiesUtil { - private Properties properties; - private String propName; - private Map memoryPropMap = new HashMap(); + private Properties properties; + private String propName; + private Map memoryPropMap = new HashMap(); - public PropertiesUtil(String propFileName) { - properties=new Properties(); - this.propName = propFileName; - } + public PropertiesUtil(String propFileName) { + properties = new Properties(); + this.propName = propFileName; + } - public String getProperty(String key) - throws InvalidPropertiesFormatException, IOException { - String retVal = ""; - InputStream in = this.getClass().getResourceAsStream("/" + propName); - properties.load(in); - retVal = properties.getProperty(key).trim(); - in.close(); - return retVal; - } - public static void main(String[] args) { - - PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); - try { - String csvfileurl = putil.getProperty("debug"); - System.out.println(csvfileurl); - } catch (InvalidPropertiesFormatException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (IOException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - } + public String getProperty(String key) + throws InvalidPropertiesFormatException, IOException { + String retVal = ""; + InputStream in = this.getClass().getResourceAsStream("/" + propName); + properties.load(in); + retVal = properties.getProperty(key).trim(); + in.close(); + return retVal; + } + + + public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static void main(String[] args) { + + try{ + final String pushMsgContent = "在" + sdf4.format(new Date()) + "时间,设备" + "312021040006" + "在"+"省委党校进站阀" + "发生" + "浓度超限"; + //4.toDO:向济南港华推送消息 + SmsPushUtil.excutePushMsg("13269155322,15011199140,13651065090", pushMsgContent); + }catch (IOException ie){ + + } + +// PropertiesUtil putil = new PropertiesUtil("wellSensor/application.properties"); +// try { +// String csvfileurl = putil.getProperty("debug"); +// System.out.println(csvfileurl); +// } catch (InvalidPropertiesFormatException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } catch (IOException e) { +// // TODO Auto-generated catch block +// e.printStackTrace(); +// } + } } diff --git a/src/main/java/org/well/well/util/PushList.java b/src/main/java/org/well/well/util/PushList.java index 74568fe..ba5e1af 100644 --- a/src/main/java/org/well/well/util/PushList.java +++ b/src/main/java/org/well/well/util/PushList.java @@ -1,85 +1,85 @@ -package org.well.well.util; - -import java.util.ArrayList; -import java.util.List; - -import com.gexin.rp.sdk.base.IPushResult; -import com.gexin.rp.sdk.base.impl.ListMessage; -import com.gexin.rp.sdk.base.impl.Target; -import com.gexin.rp.sdk.http.IGtPush; -import com.gexin.rp.sdk.template.NotificationTemplate; -import com.gexin.rp.sdk.template.style.Style0; - -/** - * Created by test203 on 2019/6/11. - */ - - -public class PushList { - //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; - - private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); - private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); - private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); - - //别名推送方式 - // static String Alias1 = ""; - // static String Alias2 = ""; - static String host = "http://sdk.open.api.igexin.com/apiex.htm"; - - public static void pushToUser(List cids, String title, String content){ - // 配置返回每个用户返回用户状态，可选 - System.setProperty("gexin_pushList_needDetails", "true"); - // 配置返回每个别名及其对应cid的用户状态，可选 - // System.setProperty("gexin_pushList_needAliasDetails", "true"); - IGtPush push = new IGtPush(host, appKey, masterSecret); - // 通知透传模板 - NotificationTemplate template = notificationTemplateDemo(title,content); - ListMessage message = new ListMessage(); - message.setData(template); - // 设置消息离线，并设置离线时间 - message.setOffline(true); - // 离线有效时间，单位为毫秒，可选 - message.setOfflineExpireTime(24 * 1000 * 3600); - // 配置推送目标 - List targets = new ArrayList(); - for (String cid : cids) { - Target target = new Target(); - target.setAppId(appId); - target.setClientId(cid); - targets.add(target); - } - - // taskId用于在推送时去查找对应的message - String taskId = push.getContentId(message); - IPushResult ret = push.pushMessageToList(taskId, targets); - System.out.println(ret.getResponse().toString()); - } - - public static NotificationTemplate notificationTemplateDemo(String title,String content) { - NotificationTemplate template = new NotificationTemplate(); - // 设置APPID与APPKEY - template.setAppId(appId); - template.setAppkey(appKey); - - Style0 style = new Style0(); - // 设置通知栏标题与内容 - style.setTitle(title); - style.setText(content); - // 配置通知栏图标 - style.setLogo("icon.png"); - // 配置通知栏网络图标 - style.setLogoUrl(""); - // 设置通知是否响铃，震动，或者可清除 - style.setRing(true); - style.setVibrate(true); - style.setClearable(true); - template.setStyle(style); - - // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 - template.setTransmissionType(2); - template.setTransmissionContent("请输入您要透传的内容"); - return template; - } -} - +//package org.well.well.util; +// +//import java.util.ArrayList; +//import java.util.List; +// +//import com.gexin.rp.sdk.base.IPushResult; +//import com.gexin.rp.sdk.base.impl.ListMessage; +//import com.gexin.rp.sdk.base.impl.Target; +//import com.gexin.rp.sdk.http.IGtPush; +//import com.gexin.rp.sdk.template.NotificationTemplate; +//import com.gexin.rp.sdk.template.style.Style0; +// +///** +// * Created by test203 on 2019/6/11. +// */ +// +// +//public class PushList { +// //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换; +// +// private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4"); +// private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5"); +// private static String masterSecret = Configure.getProperty("gt.masterSecret","TZRYQknkxLAJ58uH56PeS6"); +// +// //别名推送方式 +// // static String Alias1 = ""; +// // static String Alias2 = ""; +// static String host = "http://sdk.open.api.igexin.com/apiex.htm"; +// +// public static void pushToUser(List cids, String title, String content){ +// // 配置返回每个用户返回用户状态，可选 +// System.setProperty("gexin_pushList_needDetails", "true"); +// // 配置返回每个别名及其对应cid的用户状态，可选 +// // System.setProperty("gexin_pushList_needAliasDetails", "true"); +// IGtPush push = new IGtPush(host, appKey, masterSecret); +// // 通知透传模板 +// NotificationTemplate template = notificationTemplateDemo(title,content); +// ListMessage message = new ListMessage(); +// message.setData(template); +// // 设置消息离线，并设置离线时间 +// message.setOffline(true); +// // 离线有效时间，单位为毫秒，可选 +// message.setOfflineExpireTime(24 * 1000 * 3600); +// // 配置推送目标 +// List targets = new ArrayList(); +// for (String cid : cids) { +// Target target = new Target(); +// target.setAppId(appId); +// target.setClientId(cid); +// targets.add(target); +// } +// +// // taskId用于在推送时去查找对应的message +// String taskId = push.getContentId(message); +// IPushResult ret = push.pushMessageToList(taskId, targets); +// System.out.println(ret.getResponse().toString()); +// } +// +// public static NotificationTemplate notificationTemplateDemo(String title,String content) { +// NotificationTemplate template = new NotificationTemplate(); +// // 设置APPID与APPKEY +// template.setAppId(appId); +// template.setAppkey(appKey); +// +// Style0 style = new Style0(); +// // 设置通知栏标题与内容 +// style.setTitle(title); +// style.setText(content); +// // 配置通知栏图标 +// style.setLogo("icon.png"); +// // 配置通知栏网络图标 +// style.setLogoUrl(""); +// // 设置通知是否响铃，震动，或者可清除 +// style.setRing(true); +// style.setVibrate(true); +// style.setClearable(true); +// template.setStyle(style); +// +// // 透传消息设置，1为强制启动应用，客户端接收到消息后就会立即启动应用；2为等待应用启动 +// template.setTransmissionType(2); +// template.setTransmissionContent("请输入您要透传的内容"); +// return template; +// } +//} +// diff --git a/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar new file mode 100644 index 0000000..75e07c3 --- /dev/null +++ b/src/main/resources/lib/gexin-rp-sdk-base-4.0.0.30.jar Binary files differ diff --git a/target/classes/org/well/mysql/sink/WellSink.class b/target/classes/org/well/mysql/sink/WellSink.class index 2a8aed6..f65df4b 100644 --- a/target/classes/org/well/mysql/sink/WellSink.class +++ b/target/classes/org/well/mysql/sink/WellSink.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class index b2349bd..b5a208e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/AlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class index 84ec65e..cc1c15f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionEnvironmentAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class index 3a8a5fc..6a80e08 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/CorrosionRateAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class index f4e5865..1cdc43f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/FireHydrantAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class index 87f5d0e..9a3d5a3 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/GasLiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class index ecdf8da..5edad9e 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class index 486b952..0735c01 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LampHouseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class index baec2f9..183648f 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/LiquidAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class index ad99973..5535a72 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MethaneAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class index 24d97ce..96de2bb 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/MultiLeakAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class index b94ad79..8b05773 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class index 228b353..8211e2d 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/NoiseDigAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class index 58493d5..dbd61d6 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TempHumiAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class index 4eab75c..c310736 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TemperaturePressAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class index 3597a61..f1f105c 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/TubeAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class index 1497ce8..2b9a612 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WasteGasAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class index 2808526..5c0cad8 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WaterMeterAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class index 1cce7a4..34ad7ab 100644 --- a/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class +++ b/target/classes/org/well/well/AlarmEnumDTO/WellAlarmEnum.class Binary files differ diff --git a/target/classes/org/well/well/base/DeviceTypeEnum.class b/target/classes/org/well/well/base/DeviceTypeEnum.class index 520047e..9c61a21 100644 --- a/target/classes/org/well/well/base/DeviceTypeEnum.class +++ b/target/classes/org/well/well/base/DeviceTypeEnum.class Binary files differ diff --git a/target/classes/org/well/well/core/auth/AuthFilter.class b/target/classes/org/well/well/core/auth/AuthFilter.class index 7a41f8f..3ff6fe4 100644 --- a/target/classes/org/well/well/core/auth/AuthFilter.class +++ b/target/classes/org/well/well/core/auth/AuthFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class index 5fe52bb..162df41 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateBasicDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class index ad4ce51..ad580bf 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateEntityDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class index 902b600..559cd39 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernateGenericDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class index 94e1984..ee24528 100644 --- a/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class +++ b/target/classes/org/well/well/core/hibernate/HibernatePagingDao.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class index 85f12dd..70816f3 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/HibernateUtils.class b/target/classes/org/well/well/core/hibernate/HibernateUtils.class index d3e845c..61845f4 100644 --- a/target/classes/org/well/well/core/hibernate/HibernateUtils.class +++ b/target/classes/org/well/well/core/hibernate/HibernateUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/MatchType.class b/target/classes/org/well/well/core/hibernate/MatchType.class index 086dbec..27692c9 100644 --- a/target/classes/org/well/well/core/hibernate/MatchType.class +++ b/target/classes/org/well/well/core/hibernate/MatchType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilter.class b/target/classes/org/well/well/core/hibernate/PropertyFilter.class index 634893d..7945a82 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilter.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class index 2f75d4f..ac9df01 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils$1.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class index 45a1188..bfbba9e 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class +++ b/target/classes/org/well/well/core/hibernate/PropertyFilterUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/PropertyType.class b/target/classes/org/well/well/core/hibernate/PropertyType.class index 029ebbc..6657182 100644 --- a/target/classes/org/well/well/core/hibernate/PropertyType.class +++ b/target/classes/org/well/well/core/hibernate/PropertyType.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class index 964a218..d0bdf9f 100644 --- a/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class +++ b/target/classes/org/well/well/core/hibernate/ReadOnlyTransactionManager.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class index cbe9af9..3a1c619 100644 --- a/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class +++ b/target/classes/org/well/well/core/hibernate/RecoverableSessionFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class index 668aa55..1afd9d6 100644 --- a/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class +++ b/target/classes/org/well/well/core/hibernate/SessionFactoryWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class index c394e39..60bd418 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionContext.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionContext.class Binary files differ diff --git a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class index 4707602..dc13f9d 100644 --- a/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class +++ b/target/classes/org/well/well/core/hibernate/SpringSessionSynchronization.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionInfo.class b/target/classes/org/well/well/core/http/HttpConnectionInfo.class index 8c4111c..54835f2 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionInfo.class +++ b/target/classes/org/well/well/core/http/HttpConnectionInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpConnectionPool.class b/target/classes/org/well/well/core/http/HttpConnectionPool.class index 8d3b634..b408130 100644 --- a/target/classes/org/well/well/core/http/HttpConnectionPool.class +++ b/target/classes/org/well/well/core/http/HttpConnectionPool.class Binary files differ diff --git a/target/classes/org/well/well/core/http/HttpHandlerImpl.class b/target/classes/org/well/well/core/http/HttpHandlerImpl.class index 121f981..a1c3602 100644 --- a/target/classes/org/well/well/core/http/HttpHandlerImpl.class +++ b/target/classes/org/well/well/core/http/HttpHandlerImpl.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class index 86db433..4a3214d 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceChecker.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceChecker.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceService.class b/target/classes/org/well/well/core/jdbc/DataSourceService.class index 029507a..a67bc38 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceService.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceService.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class index b978700..af4bc83 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceServiceFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class index 3bb3587..e1b7ef2 100644 --- a/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class +++ b/target/classes/org/well/well/core/jdbc/DataSourceWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class index 97d4704..6d6447f 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfo.class Binary files differ diff --git a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class index 4c758ee..7b21e15 100644 --- a/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class +++ b/target/classes/org/well/well/core/jdbc/DbcpDataSourceInfoBuilder.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/BeanMapper.class b/target/classes/org/well/well/core/mapper/BeanMapper.class index f496cbe..17514fe 100644 --- a/target/classes/org/well/well/core/mapper/BeanMapper.class +++ b/target/classes/org/well/well/core/mapper/BeanMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/mapper/JsonMapper.class b/target/classes/org/well/well/core/mapper/JsonMapper.class index 6097671..bcd154d 100644 --- a/target/classes/org/well/well/core/mapper/JsonMapper.class +++ b/target/classes/org/well/well/core/mapper/JsonMapper.class Binary files differ diff --git a/target/classes/org/well/well/core/page/Page.class b/target/classes/org/well/well/core/page/Page.class index d71a2e9..441d801 100644 --- a/target/classes/org/well/well/core/page/Page.class +++ b/target/classes/org/well/well/core/page/Page.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class index a08e137..8c98baa 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$1.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$1.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class index d27c3a6..31ed1ee 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter$VirtualFilterChain.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/CompositeFilter.class b/target/classes/org/well/well/core/servlet/CompositeFilter.class index 288aafb..5bbe57e 100644 --- a/target/classes/org/well/well/core/servlet/CompositeFilter.class +++ b/target/classes/org/well/well/core/servlet/CompositeFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class index 9f4cc75..beb4cd7 100644 --- a/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class +++ b/target/classes/org/well/well/core/servlet/PathHttpServletRequestWrapper.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyFilter.class b/target/classes/org/well/well/core/servlet/ProxyFilter.class index 29e78d6..a94c663 100644 --- a/target/classes/org/well/well/core/servlet/ProxyFilter.class +++ b/target/classes/org/well/well/core/servlet/ProxyFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ProxyServlet.class b/target/classes/org/well/well/core/servlet/ProxyServlet.class index 5e3ddb9..fe3f8de 100644 --- a/target/classes/org/well/well/core/servlet/ProxyServlet.class +++ b/target/classes/org/well/well/core/servlet/ProxyServlet.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/ServletFilter.class b/target/classes/org/well/well/core/servlet/ServletFilter.class index 541ba71..1c346f5 100644 --- a/target/classes/org/well/well/core/servlet/ServletFilter.class +++ b/target/classes/org/well/well/core/servlet/ServletFilter.class Binary files differ diff --git a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class index c7d31ac..15382c4 100644 --- a/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class +++ b/target/classes/org/well/well/core/servlet/UrlPatternMatcher.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class index cb2cfa1..54d8838 100644 --- a/target/classes/org/well/well/core/spring/ApplicationContextHelper.class +++ b/target/classes/org/well/well/core/spring/ApplicationContextHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class index bae9235..bd74b55 100644 --- a/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class +++ b/target/classes/org/well/well/core/spring/ApplicationPropertiesFactoryBean.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/DateConverter.class b/target/classes/org/well/well/core/spring/DateConverter.class index cdf5808..b0b0137 100644 --- a/target/classes/org/well/well/core/spring/DateConverter.class +++ b/target/classes/org/well/well/core/spring/DateConverter.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/MessageHelper.class b/target/classes/org/well/well/core/spring/MessageHelper.class index ac7d92a..9f82468 100644 --- a/target/classes/org/well/well/core/spring/MessageHelper.class +++ b/target/classes/org/well/well/core/spring/MessageHelper.class Binary files differ diff --git a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class index 8211f6e..12ef11c 100644 --- a/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class +++ b/target/classes/org/well/well/core/spring/ProxyTaskScheduler.class Binary files differ diff --git a/target/classes/org/well/well/core/util/BeanUtils.class b/target/classes/org/well/well/core/util/BeanUtils.class index c0fe316..f48ce31 100644 --- a/target/classes/org/well/well/core/util/BeanUtils.class +++ b/target/classes/org/well/well/core/util/BeanUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ConvertUtils.class b/target/classes/org/well/well/core/util/ConvertUtils.class index f096b4e..2ca9f6e 100644 --- a/target/classes/org/well/well/core/util/ConvertUtils.class +++ b/target/classes/org/well/well/core/util/ConvertUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/EncodeUtils.class b/target/classes/org/well/well/core/util/EncodeUtils.class index 1bf408b..6a13f16 100644 --- a/target/classes/org/well/well/core/util/EncodeUtils.class +++ b/target/classes/org/well/well/core/util/EncodeUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/GenericsUtils.class b/target/classes/org/well/well/core/util/GenericsUtils.class index ce62403..5f79ab4 100644 --- a/target/classes/org/well/well/core/util/GenericsUtils.class +++ b/target/classes/org/well/well/core/util/GenericsUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/HttpClientUtils.class b/target/classes/org/well/well/core/util/HttpClientUtils.class index 078a4a0..15aa900 100644 --- a/target/classes/org/well/well/core/util/HttpClientUtils.class +++ b/target/classes/org/well/well/core/util/HttpClientUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/IoUtils.class b/target/classes/org/well/well/core/util/IoUtils.class index 73f03e6..383f868 100644 --- a/target/classes/org/well/well/core/util/IoUtils.class +++ b/target/classes/org/well/well/core/util/IoUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/MeterDecoderUtil.class b/target/classes/org/well/well/core/util/MeterDecoderUtil.class index 9b72842..6f54c43 100644 --- a/target/classes/org/well/well/core/util/MeterDecoderUtil.class +++ b/target/classes/org/well/well/core/util/MeterDecoderUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PointConvertUtility.class b/target/classes/org/well/well/core/util/PointConvertUtility.class index ef68997..72dbd5a 100644 --- a/target/classes/org/well/well/core/util/PointConvertUtility.class +++ b/target/classes/org/well/well/core/util/PointConvertUtility.class Binary files differ diff --git a/target/classes/org/well/well/core/util/PropertiesUtils.class b/target/classes/org/well/well/core/util/PropertiesUtils.class index eb3b95d..7524fa6 100644 --- a/target/classes/org/well/well/core/util/PropertiesUtils.class +++ b/target/classes/org/well/well/core/util/PropertiesUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ReflectUtils.class b/target/classes/org/well/well/core/util/ReflectUtils.class index f070454..56aa995 100644 --- a/target/classes/org/well/well/core/util/ReflectUtils.class +++ b/target/classes/org/well/well/core/util/ReflectUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class index ebe1f27..1618eab 100644 --- a/target/classes/org/well/well/core/util/RsHttpRequestUtil.class +++ b/target/classes/org/well/well/core/util/RsHttpRequestUtil.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ServletUtils.class b/target/classes/org/well/well/core/util/ServletUtils.class index e4a2e22..043b525 100644 --- a/target/classes/org/well/well/core/util/ServletUtils.class +++ b/target/classes/org/well/well/core/util/ServletUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/StringUtils.class b/target/classes/org/well/well/core/util/StringUtils.class index c6b233e..974a312 100644 --- a/target/classes/org/well/well/core/util/StringUtils.class +++ b/target/classes/org/well/well/core/util/StringUtils.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil$1.class b/target/classes/org/well/well/core/util/ThreadUtil$1.class index e651ecf..01a4789 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil$1.class +++ b/target/classes/org/well/well/core/util/ThreadUtil$1.class Binary files differ diff --git a/target/classes/org/well/well/core/util/ThreadUtil.class b/target/classes/org/well/well/core/util/ThreadUtil.class index 69128e1..811472b 100644 --- a/target/classes/org/well/well/core/util/ThreadUtil.class +++ b/target/classes/org/well/well/core/util/ThreadUtil.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmJobManager.class b/target/classes/org/well/well/manager/AlarmJobManager.class index 1be08bd..2bf58d8 100644 --- a/target/classes/org/well/well/manager/AlarmJobManager.class +++ b/target/classes/org/well/well/manager/AlarmJobManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRecordManager.class b/target/classes/org/well/well/manager/AlarmRecordManager.class index 68530d3..80d2e31 100644 --- a/target/classes/org/well/well/manager/AlarmRecordManager.class +++ b/target/classes/org/well/well/manager/AlarmRecordManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/AlarmRuleManager.class b/target/classes/org/well/well/manager/AlarmRuleManager.class index 5d4182f..757b3e2 100644 --- a/target/classes/org/well/well/manager/AlarmRuleManager.class +++ b/target/classes/org/well/well/manager/AlarmRuleManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/ConcentratorManager.class b/target/classes/org/well/well/manager/ConcentratorManager.class index 8068a3e..4169a5e 100644 --- a/target/classes/org/well/well/manager/ConcentratorManager.class +++ b/target/classes/org/well/well/manager/ConcentratorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeptManager.class b/target/classes/org/well/well/manager/DeptManager.class index c213dd5..1e305f0 100644 --- a/target/classes/org/well/well/manager/DeptManager.class +++ b/target/classes/org/well/well/manager/DeptManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceConfigManager.class b/target/classes/org/well/well/manager/DeviceConfigManager.class index 7be74aa..e4ecf3b 100644 --- a/target/classes/org/well/well/manager/DeviceConfigManager.class +++ b/target/classes/org/well/well/manager/DeviceConfigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceManager.class b/target/classes/org/well/well/manager/DeviceManager.class index d1dd1c4..727954b 100644 --- a/target/classes/org/well/well/manager/DeviceManager.class +++ b/target/classes/org/well/well/manager/DeviceManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/DeviceWellManager.class b/target/classes/org/well/well/manager/DeviceWellManager.class index 6cfa6e6..3846b83 100644 --- a/target/classes/org/well/well/manager/DeviceWellManager.class +++ b/target/classes/org/well/well/manager/DeviceWellManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGGasManager.class b/target/classes/org/well/well/manager/LGGasManager.class index 182bb6f..4d0aec3 100644 --- a/target/classes/org/well/well/manager/LGGasManager.class +++ b/target/classes/org/well/well/manager/LGGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManager.class b/target/classes/org/well/well/manager/LGLiquidManager.class index fd72aac..ac98440 100644 --- a/target/classes/org/well/well/manager/LGLiquidManager.class +++ b/target/classes/org/well/well/manager/LGLiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LGLiquidManagerbak.class b/target/classes/org/well/well/manager/LGLiquidManagerbak.class index d4bf3f2..d864fd5 100644 --- a/target/classes/org/well/well/manager/LGLiquidManagerbak.class +++ b/target/classes/org/well/well/manager/LGLiquidManagerbak.class Binary files differ diff --git a/target/classes/org/well/well/manager/LiquidManager.class b/target/classes/org/well/well/manager/LiquidManager.class index 86f2bd2..f93d038 100644 --- a/target/classes/org/well/well/manager/LiquidManager.class +++ b/target/classes/org/well/well/manager/LiquidManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/LocatorManager.class b/target/classes/org/well/well/manager/LocatorManager.class index 85ecac7..f6b865d 100644 --- a/target/classes/org/well/well/manager/LocatorManager.class +++ b/target/classes/org/well/well/manager/LocatorManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MeterManager.class b/target/classes/org/well/well/manager/MeterManager.class index fca81d3..c69cedf 100644 --- a/target/classes/org/well/well/manager/MeterManager.class +++ b/target/classes/org/well/well/manager/MeterManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/MethaneManager.class b/target/classes/org/well/well/manager/MethaneManager.class index c4da2c7..667a0f7 100644 --- a/target/classes/org/well/well/manager/MethaneManager.class +++ b/target/classes/org/well/well/manager/MethaneManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseDigManager.class b/target/classes/org/well/well/manager/NoiseDigManager.class index 68a54da..4d0ebae 100644 --- a/target/classes/org/well/well/manager/NoiseDigManager.class +++ b/target/classes/org/well/well/manager/NoiseDigManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/NoiseManager.class b/target/classes/org/well/well/manager/NoiseManager.class index 6c8bc4d..a1e5d29 100644 --- a/target/classes/org/well/well/manager/NoiseManager.class +++ b/target/classes/org/well/well/manager/NoiseManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempHumiManager.class b/target/classes/org/well/well/manager/TempHumiManager.class index 4dcac90..0f0f25c 100644 --- a/target/classes/org/well/well/manager/TempHumiManager.class +++ b/target/classes/org/well/well/manager/TempHumiManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TempPressureManager.class b/target/classes/org/well/well/manager/TempPressureManager.class index 416311f..9ab1829 100644 --- a/target/classes/org/well/well/manager/TempPressureManager.class +++ b/target/classes/org/well/well/manager/TempPressureManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/TubeManager.class b/target/classes/org/well/well/manager/TubeManager.class index 2f3b3bc..b3a8024 100644 --- a/target/classes/org/well/well/manager/TubeManager.class +++ b/target/classes/org/well/well/manager/TubeManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserClientManager.class b/target/classes/org/well/well/manager/UserClientManager.class index fde9801..965ac56 100644 --- a/target/classes/org/well/well/manager/UserClientManager.class +++ b/target/classes/org/well/well/manager/UserClientManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/UserManager.class b/target/classes/org/well/well/manager/UserManager.class index 8b09a72..b648a6b 100644 --- a/target/classes/org/well/well/manager/UserManager.class +++ b/target/classes/org/well/well/manager/UserManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WasteGasManager.class b/target/classes/org/well/well/manager/WasteGasManager.class index ad1ac3b..7ea6bf2 100644 --- a/target/classes/org/well/well/manager/WasteGasManager.class +++ b/target/classes/org/well/well/manager/WasteGasManager.class Binary files differ diff --git a/target/classes/org/well/well/manager/WellManager.class b/target/classes/org/well/well/manager/WellManager.class index 471a663..4a950de 100644 --- a/target/classes/org/well/well/manager/WellManager.class +++ b/target/classes/org/well/well/manager/WellManager.class Binary files differ diff --git a/target/classes/org/well/well/resp/ConcentratorResponse.class b/target/classes/org/well/well/resp/ConcentratorResponse.class index fac3c4e..97f5092 100644 --- a/target/classes/org/well/well/resp/ConcentratorResponse.class +++ b/target/classes/org/well/well/resp/ConcentratorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LGResponse.class b/target/classes/org/well/well/resp/LGResponse.class index 7588ec3..4f4c516 100644 --- a/target/classes/org/well/well/resp/LGResponse.class +++ b/target/classes/org/well/well/resp/LGResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LiquidResponse.class b/target/classes/org/well/well/resp/LiquidResponse.class index b67ebcc..ac4a585 100644 --- a/target/classes/org/well/well/resp/LiquidResponse.class +++ b/target/classes/org/well/well/resp/LiquidResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/LocatorResponse.class b/target/classes/org/well/well/resp/LocatorResponse.class index dca4045..1687f0a 100644 --- a/target/classes/org/well/well/resp/LocatorResponse.class +++ b/target/classes/org/well/well/resp/LocatorResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/MethaneResponse.class b/target/classes/org/well/well/resp/MethaneResponse.class index 773871d..cc9445e 100644 --- a/target/classes/org/well/well/resp/MethaneResponse.class +++ b/target/classes/org/well/well/resp/MethaneResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseDigResponse.class b/target/classes/org/well/well/resp/NoiseDigResponse.class index 44d5172..76c07ca 100644 --- a/target/classes/org/well/well/resp/NoiseDigResponse.class +++ b/target/classes/org/well/well/resp/NoiseDigResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/NoiseResponse.class b/target/classes/org/well/well/resp/NoiseResponse.class index d080000..0e32d19 100644 --- a/target/classes/org/well/well/resp/NoiseResponse.class +++ b/target/classes/org/well/well/resp/NoiseResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempHumiResponse.class b/target/classes/org/well/well/resp/TempHumiResponse.class index 038c9b7..186e904 100644 --- a/target/classes/org/well/well/resp/TempHumiResponse.class +++ b/target/classes/org/well/well/resp/TempHumiResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TempPressureResponse.class b/target/classes/org/well/well/resp/TempPressureResponse.class index db9199d..ecccac4 100644 --- a/target/classes/org/well/well/resp/TempPressureResponse.class +++ b/target/classes/org/well/well/resp/TempPressureResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/TubeResponse.class b/target/classes/org/well/well/resp/TubeResponse.class index dc2a360..19e700d 100644 --- a/target/classes/org/well/well/resp/TubeResponse.class +++ b/target/classes/org/well/well/resp/TubeResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WasteGasResponse.class b/target/classes/org/well/well/resp/WasteGasResponse.class index 0651526..aba41d7 100644 --- a/target/classes/org/well/well/resp/WasteGasResponse.class +++ b/target/classes/org/well/well/resp/WasteGasResponse.class Binary files differ diff --git a/target/classes/org/well/well/resp/WellResponse.class b/target/classes/org/well/well/resp/WellResponse.class index bc88b36..eea9cee 100644 --- a/target/classes/org/well/well/resp/WellResponse.class +++ b/target/classes/org/well/well/resp/WellResponse.class Binary files differ diff --git a/target/classes/org/well/well/scheduler/DeviceCheckingJob.class b/target/classes/org/well/well/scheduler/DeviceCheckingJob.class index f0beb5f..23eeb0c 100644 --- a/target/classes/org/well/well/scheduler/DeviceCheckingJob.class +++ b/target/classes/org/well/well/scheduler/DeviceCheckingJob.class Binary files differ diff --git a/target/classes/org/well/well/util/Configure.class b/target/classes/org/well/well/util/Configure.class index 63f724e..afe3666 100644 --- a/target/classes/org/well/well/util/Configure.class +++ b/target/classes/org/well/well/util/Configure.class Binary files differ diff --git a/target/classes/org/well/well/util/PropertiesUtil.class b/target/classes/org/well/well/util/PropertiesUtil.class index 120812a..aa8ddec 100644 --- a/target/classes/org/well/well/util/PropertiesUtil.class +++ b/target/classes/org/well/well/util/PropertiesUtil.class Binary files differ diff --git a/target/classes/org/well/well/util/PushList.class b/target/classes/org/well/well/util/PushList.class deleted file mode 100644 index 98de9b0..0000000 --- a/target/classes/org/well/well/util/PushList.class +++ /dev/null Binary files differ diff --git a/target/classes/wellSensor/application.properties b/target/classes/wellSensor/application.properties index d2dd078..2411a26 100644 --- a/target/classes/wellSensor/application.properties +++ b/target/classes/wellSensor/application.properties @@ -169,6 +169,13 @@ sendURL = http://119.254.103.80:14537/job/updateSinkJob + +# ============================================================================ +# 港华燃气报警短信推送 +# ============================================================================ +GH_SMS_URL = http://61.145.229.28:8803 +GH_USER_ID = JU5802 +GH_PWD = 761060 # ============================================================================ # 天气获取接口 # ============================================================================