|
@@ -8,13 +8,11 @@ import java.text.SimpleDateFormat;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
-import java.util.Iterator;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
|
import org.slf4j.Logger;
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
-import org.slf4j.Marker;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import com.tidecloud.dataacceptance.entity.Advice;
|
|
@@ -49,6 +47,7 @@ public class DiscardServerHandler extends ChannelInboundHandlerAdapter {
|
|
|
}
|
|
|
|
|
|
private void reply(ChannelHandlerContext ctx, String msg) throws Exception {
|
|
|
+ logger.info("设备上传数据:" + msg);
|
|
|
Advice advice = getAdevice(msg);
|
|
|
String deviceId = advice.getDeviceId();
|
|
|
String adviceType = advice.getAdviceType();
|
|
@@ -109,7 +108,7 @@ public class DiscardServerHandler extends ChannelInboundHandlerAdapter {
|
|
|
advice.setDeviceId(headersBodys[1]);
|
|
|
advice.setAdvicelength(headersBodys[2]);
|
|
|
advice.setAdviceType(headersBodys[3]);
|
|
|
- logger.info(advice.toString());
|
|
|
+ logger.info("设备上传头信息:" + advice.toString());
|
|
|
return advice;
|
|
|
} catch (Exception e) {
|
|
|
e.printStackTrace();
|
|
@@ -138,7 +137,7 @@ public class DiscardServerHandler extends ChannelInboundHandlerAdapter {
|
|
|
device.setElectric(getDouble(bodys[13]));
|
|
|
device.setStep(getInteger(bodys[14]));
|
|
|
// getDouble()
|
|
|
- logger.info(device.toString());
|
|
|
+ logger.info("设备上传具体监控项信息:" + device.toString());
|
|
|
return device;
|
|
|
}
|
|
|
|