diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java index dff3199ab..8905bcab4 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDeviceConfig.java @@ -219,7 +219,7 @@ public class JTDeviceConfig { @ConfigAttribute(id = 0x76, type="ChannelListParam", description = "音视频通道列表设置") private JTChannelListParam channelListParam; - @ConfigAttribute(id = 0x77, type="ChannelParam", description = "音视频通道列表设置") + @ConfigAttribute(id = 0x77, type="ChannelParam", description = "单独视频通道参数设置") private JTChannelParam channelParam; @ConfigAttribute(id = 0x79, type="AlarmRecordingParam", description = "特殊报警录像参数设置") diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java index dea732442..32486836e 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078ServiceImpl.java @@ -105,20 +105,20 @@ public class jt1078ServiceImpl implements Ijt1078Service { @EventListener public void onApplicationEvent(RegisterEvent event) { // 首次注册设备根据终端参数获取 - JTDevice device = event.getDevice(); - List channelList = jtChannelMapper.selectAllByDevicePhoneNumber(device.getPhoneNumber()); - if (!channelList.isEmpty()) { - return; - } - JTDeviceConfig jtDeviceConfig = queryConfig(device.getPhoneNumber(), null); - JTChannelParam channelParam = jtDeviceConfig.getChannelParam(); - if (channelParam != null && channelParam.getJtAloneChanelList() != null && !channelParam.getJtAloneChanelList().isEmpty()) { - // 写入通道 - List jtAloneChanelList = channelParam.getJtAloneChanelList(); - for (JTAloneChanel jtAloneChanel : jtAloneChanelList) { - - } - } +// JTDevice device = event.getDevice(); +// List channelList = jtChannelMapper.selectAllByDevicePhoneNumber(device.getPhoneNumber()); +// if (!channelList.isEmpty()) { +// return; +// } +// JTDeviceConfig jtDeviceConfig = queryConfig(device.getPhoneNumber(), null); +// JTChannelParam channelParam = jtDeviceConfig.getChannelParam(); +// if (channelParam != null && channelParam.getJtAloneChanelList() != null && !channelParam.getJtAloneChanelList().isEmpty()) { +// // 写入通道 +// List jtAloneChanelList = channelParam.getJtAloneChanelList(); +// for (JTAloneChanel jtAloneChanel : jtAloneChanelList) { +// +// } +// } } diff --git a/web/src/views/jtDevice/deviceParam/alarm.vue b/web/src/views/jtDevice/deviceParam/alarm.vue index e2c79b454..fdce276d5 100755 --- a/web/src/views/jtDevice/deviceParam/alarm.vue +++ b/web/src/views/jtDevice/deviceParam/alarm.vue @@ -1,24 +1,24 @@