|
@@ -1,5 +1,6 @@
|
|
package com.tidecloud.dataacceptance.service.impl;
|
|
package com.tidecloud.dataacceptance.service.impl;
|
|
|
|
|
|
|
|
+import com.tidecloud.dataacceptance.DataAcceptanceApplication;
|
|
import com.tidecloud.dataacceptance.common.DateUtil;
|
|
import com.tidecloud.dataacceptance.common.DateUtil;
|
|
import com.tidecloud.dataacceptance.entity.Advice;
|
|
import com.tidecloud.dataacceptance.entity.Advice;
|
|
import com.tidecloud.dataacceptance.service.HexBinaryAcceptanceHandlerAdapter;
|
|
import com.tidecloud.dataacceptance.service.HexBinaryAcceptanceHandlerAdapter;
|
|
@@ -13,10 +14,12 @@ import org.apache.commons.lang.StringUtils;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.MDC;
|
|
import org.slf4j.MDC;
|
|
|
|
+import org.springframework.boot.SpringApplication;
|
|
import org.springframework.context.annotation.Scope;
|
|
import org.springframework.context.annotation.Scope;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import javax.xml.bind.DatatypeConverter;
|
|
import javax.xml.bind.DatatypeConverter;
|
|
|
|
+import java.text.SimpleDateFormat;
|
|
import java.util.Date;
|
|
import java.util.Date;
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -81,8 +84,7 @@ public class WatchJWServerHandler extends HexBinaryAcceptanceHandlerAdapter {
|
|
if (!deviceId.equals(deviceIdInMap)) {
|
|
if (!deviceId.equals(deviceIdInMap)) {
|
|
manageChannel(channel, deviceId);
|
|
manageChannel(channel, deviceId);
|
|
}
|
|
}
|
|
- // BP00,20150101125223,8#
|
|
|
|
- String date = DateUtil.formatDate2String(new Date(), "yyyyMMddHHmmss");
|
|
|
|
|
|
+ String date =DateUtil.getForamtDateUtc0();// DateUtil.formatDate2String(new Date(), "yyyyMMddHHmmss");
|
|
normalReply(factory, channel, "BP00," + date + ",8");
|
|
normalReply(factory, channel, "BP00," + date + ",8");
|
|
}
|
|
}
|
|
|
|
|
|
@@ -107,4 +109,6 @@ public class WatchJWServerHandler extends HexBinaryAcceptanceHandlerAdapter {
|
|
ChannelFuture channelFuture = channel.writeAndFlush(buffer);
|
|
ChannelFuture channelFuture = channel.writeAndFlush(buffer);
|
|
channelFuture.addListener(future -> logger.info("Normal reply :" + replyCommandStr));
|
|
channelFuture.addListener(future -> logger.info("Normal reply :" + replyCommandStr));
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+
|
|
}
|
|
}
|