From d29ed06a94f34c1ef449531df509c035c8a08e73 Mon Sep 17 00:00:00 2001 From: HuangXin Date: Fri, 1 Sep 2023 17:53:34 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=8C=87=E5=AE=9A?= =?UTF-8?q?=E8=AD=A6=E6=8A=A5=E6=92=AD=E6=94=BE=E9=87=8D=E5=A4=8D=E6=AC=A1?= =?UTF-8?q?=E6=95=B0=202.=20=E5=A2=9E=E5=8A=A0=E6=94=AF=E6=8C=81=E4=B8=8B?= =?UTF-8?q?=E5=8F=91TTS=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../netty/encode/YuanRongProtocolEncode.java | 25 +++++++++++++++++-- .../beidouservice/controller/AuthUser.java | 2 ++ .../pojo/vo/binary/SensorControlProtocol.java | 2 ++ .../service/AdapterProtocolService.java | 2 ++ .../service/impl/AlarmTaskServiceImpl.java | 1 + .../impl/BeidouSocketProtocolServiceImpl.java | 4 +++ 6 files changed, 34 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java index acf0c22..def7e16 100644 --- a/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java +++ b/src/main/java/com/zjyr/beidouservice/adapter/impl/netty/encode/YuanRongProtocolEncode.java @@ -13,12 +13,17 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; + @Component @RequiredArgsConstructor @Slf4j public class YuanRongProtocolEncode extends MessageToByteEncoder> { @Override - protected void encode(ChannelHandlerContext channelHandlerContext, BaseBinaryProtocol baseBinaryProtocol, ByteBuf byteBuf) { + protected void encode(ChannelHandlerContext channelHandlerContext, + BaseBinaryProtocol baseBinaryProtocol, + ByteBuf byteBuf) throws UnsupportedEncodingException { if (baseBinaryProtocol == null || baseBinaryProtocol.getMsgContent() == null || baseBinaryProtocol.getMsgContent().getMsgBody() == null) { @@ -37,15 +42,31 @@ public class YuanRongProtocolEncode extends MessageToByteEncoder 0) { + byteBuf.writeBytes(ttsArray); + } if (msg.getCityCode().isEmpty()) { byteBuf.writeByte(0); diff --git a/src/main/java/com/zjyr/beidouservice/controller/AuthUser.java b/src/main/java/com/zjyr/beidouservice/controller/AuthUser.java index dd2f381..9afb6e2 100644 --- a/src/main/java/com/zjyr/beidouservice/controller/AuthUser.java +++ b/src/main/java/com/zjyr/beidouservice/controller/AuthUser.java @@ -56,6 +56,8 @@ public class AuthUser { SensorControlTunnelName.TUNNEL_BEIDOU.getValue() | SensorControlTunnelName.TUNNEL_WIRELESS.getValue(), strtodate, + 0, + null, new ArrayList<>(), new ArrayList<>(), new ArrayList<>(Arrays.asList(0, 1, 2, 3))); diff --git a/src/main/java/com/zjyr/beidouservice/pojo/vo/binary/SensorControlProtocol.java b/src/main/java/com/zjyr/beidouservice/pojo/vo/binary/SensorControlProtocol.java index c576c25..d7af5e4 100644 --- a/src/main/java/com/zjyr/beidouservice/pojo/vo/binary/SensorControlProtocol.java +++ b/src/main/java/com/zjyr/beidouservice/pojo/vo/binary/SensorControlProtocol.java @@ -17,6 +17,8 @@ public class SensorControlProtocol { private AlarmTypeName alarmType; private Integer controlTunnel; private Integer timeStamp; + private Integer repeatTimes; + private String ttsContent; private List cityCode; private List districtsCode; private List sensorId; diff --git a/src/main/java/com/zjyr/beidouservice/service/AdapterProtocolService.java b/src/main/java/com/zjyr/beidouservice/service/AdapterProtocolService.java index 2673203..b60022b 100644 --- a/src/main/java/com/zjyr/beidouservice/service/AdapterProtocolService.java +++ b/src/main/java/com/zjyr/beidouservice/service/AdapterProtocolService.java @@ -18,6 +18,8 @@ public interface AdapterProtocolService { AlarmTypeName alarmType, int tunnelName, Date alarmDt, + int repeatTimes, + String ttsText, List citys, List areas, List sensors); diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java index 0b41c58..6c99a5c 100644 --- a/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java +++ b/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java @@ -121,6 +121,7 @@ public class AlarmTaskServiceImpl implements AlarmTaskService { CommonEnumHandler.codeOf(AlarmTypeName.class, alarmTaskReqDTO.getAlarmKind()), alarmTaskReqDTO.getControlChannel(), alarmTaskReqDTO.getSendTime(), + 0, null, deviceInfo.getCityCodes(), deviceInfo.getCountyCodes(), deviceInfo.getBeidouIds() 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 7f74472..4b37c61 100644 --- a/src/main/java/com/zjyr/beidouservice/service/impl/BeidouSocketProtocolServiceImpl.java +++ b/src/main/java/com/zjyr/beidouservice/service/impl/BeidouSocketProtocolServiceImpl.java @@ -33,6 +33,8 @@ public class BeidouSocketProtocolServiceImpl implements AdapterProtocolService { AlarmTypeName alarmType, int tunnelName, Date alarmDt, + int repeatTimes, + String ttsText, List citys, List areas, List sensors) { @@ -44,6 +46,8 @@ public class BeidouSocketProtocolServiceImpl implements AdapterProtocolService { .alarmType(alarmType) .controlTunnel(tunnelName) .timeStamp((int) timestamp) + .repeatTimes(repeatTimes) + .ttsContent(ttsText) .cityCode(citys == null ? new ArrayList<>() : citys) .districtsCode(areas == null ? new ArrayList<>() : citys) .sensorId(sensors == null ? new ArrayList<>() : citys)