From b44ca6e533aee43f8659c51af1e45d06e14a2e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E7=84=B1?= Date: Mon, 29 Jun 2020 21:55:50 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A6=BB=E7=BA=BF=E6=8E=A8=E9=80=81=E6=94=B9?= =?UTF-8?q?=E4=B8=BA10=E5=88=86=E9=92=9F,=E6=96=B0=E5=A2=9E=E9=AB=98?= =?UTF-8?q?=E6=B8=A9=E4=BD=8E=E6=B8=A9=E9=A2=84=E8=AD=A6=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ifish/socketNew/MinaServerHandler.java | 4 ++-- src/main/java/com/ifish/socketNew/SomeServer.java | 2 ++ .../com/ifish/socketNew/codeFactory/ServerDecode.java | 1 + .../socketNew/model/send/OrderFunctionCode9.java | 11 +++++++++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ifish/socketNew/MinaServerHandler.java b/src/main/java/com/ifish/socketNew/MinaServerHandler.java index a3f4dbb..0c13c5f 100644 --- a/src/main/java/com/ifish/socketNew/MinaServerHandler.java +++ b/src/main/java/com/ifish/socketNew/MinaServerHandler.java @@ -90,8 +90,8 @@ public class MinaServerHandler extends IoHandlerAdapter { //离线时间 jobGroup.setTimestamp(IfishUtil.format(new Date())); //10分钟后推送 update 30分钟 - jobGroup.setStartTime(new Date(System.currentTimeMillis() + 600000L * 3)); -// jobGroup.setStartTime(new Date(System.currentTimeMillis() + 60000L)); +// jobGroup.setStartTime(new Date(System.currentTimeMillis() + 600000L * 3)); + jobGroup.setStartTime(new Date(System.currentTimeMillis() + 600000L)); scheduleJob.addJob(jobGroup); } diff --git a/src/main/java/com/ifish/socketNew/SomeServer.java b/src/main/java/com/ifish/socketNew/SomeServer.java index f18f06a..71346a2 100644 --- a/src/main/java/com/ifish/socketNew/SomeServer.java +++ b/src/main/java/com/ifish/socketNew/SomeServer.java @@ -161,9 +161,11 @@ public class SomeServer { //推送类型 Integer warnType = receive.getWarn_type() & 0xff; if(warnType==0){ + log.info("mac : " + strSrc + ", 低温预警 : " + receive); pushNotifcation(strSrc,PushTypeEnum.wendu_warn.getValue(),"温度达到"+(float)receive.getWendu()/10f+"℃，已低于"+(float)receive.getWarn_wendu()/10f+"℃，请及时查看！"); } else if(warnType==1){ + log.info("mac : " + strSrc + ", 高温预警 : " + receive); pushNotifcation(strSrc,PushTypeEnum.wendu_warn.getValue(),"温度达到"+(float)receive.getWendu()/10f+"℃，已高于"+(float)receive.getWarn_wendu()/10f+"℃，请及时查看！"); } else{ diff --git a/src/main/java/com/ifish/socketNew/codeFactory/ServerDecode.java b/src/main/java/com/ifish/socketNew/codeFactory/ServerDecode.java index ab1178a..094a820 100644 --- a/src/main/java/com/ifish/socketNew/codeFactory/ServerDecode.java +++ b/src/main/java/com/ifish/socketNew/codeFactory/ServerDecode.java @@ -122,6 +122,7 @@ public class ServerDecode implements ProtocolDecoder { } //设备报警 else if(check_code==9){ + log.info("length:[" + length + "];limit:[" + buf.limit() + "],HexDump:[" + buf.getHexDump() + "]"); functionCode9(buf, out); } //模块版本指令 diff --git a/src/main/java/com/ifish/socketNew/model/send/OrderFunctionCode9.java b/src/main/java/com/ifish/socketNew/model/send/OrderFunctionCode9.java index 71021e5..461396b 100644 --- a/src/main/java/com/ifish/socketNew/model/send/OrderFunctionCode9.java +++ b/src/main/java/com/ifish/socketNew/model/send/OrderFunctionCode9.java @@ -37,6 +37,13 @@ public class OrderFunctionCode9 extends HeadModel implements Serializable { public void setWarn_wendu(short warn_wendu) { this.warn_wendu = warn_wendu; } - - + + @Override + public String toString() { + return "OrderFunctionCode9{" + + "warn_type=" + warn_type + + ", wendu=" + wendu + + ", warn_wendu=" + warn_wendu + + '}'; + } }