From 076bd3893261e35bf61c5e5a8f7bcddd6f247595 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Sun, 13 Aug 2023 11:49:52 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E6=9B=B4=E6=96=B0=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../zjyr/beidouservice/adapter/impl/netty/ISocketServer.java | 5 ++--- .../beidouservice/adapter/impl/netty/MessageHandler.java | 2 -- .../adapter/impl/netty/notify/SocketNotifyEvent.java | 2 -- src/main/java/com/zjyr/beidouservice/misc/HelperUtils.java | 2 -- .../service/impl/BeidouSocketProtocolServiceImpl.java | 4 ++-- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/ISocketServer.java b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/ISocketServer.java index 8c8da13..fd25f8c 100644 --- a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/ISocketServer.java +++ b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/ISocketServer.java @@ -17,9 +17,8 @@ public interface ISocketServer { /** * Send data int. * - * @param the type parameter - * @param data the data - * @param devId the dev id + * @param ch the ch + * @param data the data */ void sendData(Channel ch, Object data); diff --git a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/MessageHandler.java b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/MessageHandler.java index 74b6766..817e9ff 100644 --- a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/MessageHandler.java +++ b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/MessageHandler.java @@ -3,8 +3,6 @@ package com.zjyr.beidouservice.adapter.impl.netty; import com.zjyr.beidouservice.adapter.impl.netty.notify.SocketNotifyEvent; import com.zjyr.beidouservice.common.impl.SocketEventName; import com.zjyr.beidouservice.pojo.vo.binary.BaseBinaryProtocol; -import com.zjyr.beidouservice.pojo.vo.binary.HeartProtocol; -import com.zjyr.beidouservice.pojo.vo.binary.MessageContent; import io.netty.channel.Channel; import io.netty.channel.ChannelHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/notify/SocketNotifyEvent.java b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/notify/SocketNotifyEvent.java index 2d06ba2..5748a47 100644 --- a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/notify/SocketNotifyEvent.java +++ b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/notify/SocketNotifyEvent.java @@ -6,8 +6,6 @@ import lombok.Getter; import lombok.Setter; import org.springframework.context.ApplicationEvent; -import java.util.List; - /** * The type Socket notify event. */ diff --git a/src/main/java/com/zjyr/beidouservice/misc/HelperUtils.java b/src/main/java/com/zjyr/beidouservice/misc/HelperUtils.java index aa2c260..ee80618 100644 --- a/src/main/java/com/zjyr/beidouservice/misc/HelperUtils.java +++ b/src/main/java/com/zjyr/beidouservice/misc/HelperUtils.java @@ -1,7 +1,5 @@ package com.zjyr.beidouservice.misc; -import com.zjyr.beidouservice.pojo.vo.binary.BaseBinaryProtocol; - /** * The type Helper utils. */ diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/BeidouSocketProtocolServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/BeidouSocketProtocolServiceImpl.java index a2feebf..fa3c380 100644 --- a/src/main/java/com/zjyr/beidouservice/service/impl/BeidouSocketProtocolServiceImpl.java +++ b/src/main/java/com/zjyr/beidouservice/service/impl/BeidouSocketProtocolServiceImpl.java @@ -28,13 +28,13 @@ public class BeidouSocketProtocolServiceImpl implements AdapterProtocolService { public List createSensorCtrlInfo(List ctxList) { List list = new ArrayList<>(); - ctxList.forEach(v -> { + for (BeidouAdapterControlContent v : ctxList) { list.add(SensorControllContent.builder() .districtsCode(v.getDistrictsCode().byteValue()) .controlAction(v.getControlAction()) .sensorId(v.getSensorId().shortValue()) .build()); - }); + } return list; }