|
|
@@ -1,6 +1,5 @@
|
|
|
package com.tidecloud.dataacceptance.service.impl;
|
|
|
|
|
|
-import com.tidecloud.dataacceptance.common.DateUtil;
|
|
|
import com.tidecloud.dataacceptance.entity.Advice;
|
|
|
import com.tidecloud.dataacceptance.service.HexBinaryAcceptanceHandlerAdapter;
|
|
|
import io.netty.bootstrap.ServerBootstrap;
|
|
|
@@ -19,7 +18,10 @@ import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.context.annotation.Scope;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
+import java.text.DateFormat;
|
|
|
+import java.text.SimpleDateFormat;
|
|
|
import java.util.Date;
|
|
|
+import java.util.TimeZone;
|
|
|
import java.util.concurrent.ExecutorService;
|
|
|
import java.util.concurrent.Executors;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
@@ -43,8 +45,8 @@ public class WatchHenShengServerHandler extends HexBinaryAcceptanceHandlerAdapte
|
|
|
String msg = new String(req, "UTF-8");
|
|
|
logger.info("传入数据：》》》》》》》》》" + msg);
|
|
|
Advice advice = setAdvice(msg);
|
|
|
- if(advice == null){
|
|
|
- return ;
|
|
|
+ if (advice == null) {
|
|
|
+ return;
|
|
|
}
|
|
|
switch (advice.getAdviceType()) {
|
|
|
case "INIT": // 初始化
|
|
|
@@ -53,11 +55,7 @@ public class WatchHenShengServerHandler extends HexBinaryAcceptanceHandlerAdapte
|
|
|
setUpload(advice, channel);
|
|
|
break;
|
|
|
case "LK": // 连接
|
|
|
- Date date = new Date();
|
|
|
- String ymd = DateUtil.formatDate2StringYMD(date);
|
|
|
- String hms = DateUtil.formatDate2StringHms(date);
|
|
|
- StringBuilder sb = new StringBuilder("LK,").append(ymd).append(",").append(hms);
|
|
|
- normalReply(advice, channel, sb.toString());
|
|
|
+ normalReply(advice, channel, getLinkTime());
|
|
|
break;
|
|
|
case "UD": // 位置信息
|
|
|
sendMsg2Kafka(msg.getBytes(), advice.getDeviceId(), channel);
|
|
|
@@ -79,6 +77,16 @@ public class WatchHenShengServerHandler extends HexBinaryAcceptanceHandlerAdapte
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ protected String getLinkTime() {
|
|
|
+ DateFormat dateFormatter = new SimpleDateFormat("yyyy-MM-dd,HH:mm:ss");
|
|
|
+ Date date = new Date();
|
|
|
+ TimeZone pst = TimeZone.getTimeZone("Etc/GMT+0");// 0时区
|
|
|
+ dateFormatter.setTimeZone(pst);
|
|
|
+ String lk_time = dateFormatter.format(date);
|
|
|
+ StringBuilder sb = new StringBuilder("LK,").append(lk_time);
|
|
|
+ return sb.toString();
|
|
|
+ }
|
|
|
+
|
|
|
protected void printAcceptanceData(ByteBuf dataByteBuf, ChannelHandlerContext ctx) {
|
|
|
ByteBuf dataByteBufCopy = dataByteBuf.copy();
|
|
|
byte[] dataByteArray = new byte[dataByteBufCopy.readableBytes()];
|
|
|
@@ -177,7 +185,7 @@ public class WatchHenShengServerHandler extends HexBinaryAcceptanceHandlerAdapte
|
|
|
advice.setAdviceType(contents[0]);// 标记
|
|
|
return advice;
|
|
|
} catch (Exception e) {
|
|
|
- logger.error(e.getMessage(),e);
|
|
|
+ logger.error(e.getMessage(), e);
|
|
|
}
|
|
|
}
|
|
|
return null;
|
jianghouwei