From 4697cc0d49242bf7c24f4d30d522d853f0b2618a Mon Sep 17 00:00:00 2001 From: huangfeng Date: Wed, 8 Jan 2025 14:18:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A1=A5=E4=B8=8A=E8=A3=85=E7=BD=AE?= =?UTF-8?q?=E7=9A=84=E9=80=9A=E9=81=93ype=E5=B1=9E=E6=80=A7=E7=94=A8?= =?UTF-8?q?=E5=88=B0=E7=9A=84=E5=A4=9A=E4=B8=AA=E5=9C=B0=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shxy/xymanager_common/dto/TermChannelAndMapperDto.java | 2 ++ .../java/com/shxy/xymanager_common/entity/TerminalChannels.java | 2 ++ .../src/main/resources/mappers/TerminalChannelsDao.xml | 1 + .../com/shxy/xymanager_service/impl/TerminalServiceImpl.java | 1 + 4 files changed, 6 insertions(+) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermChannelAndMapperDto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermChannelAndMapperDto.java index b222b39..22eae64 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermChannelAndMapperDto.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/dto/TermChannelAndMapperDto.java @@ -18,6 +18,8 @@ public class TermChannelAndMapperDto { private String alias; + private Integer type; + private Integer status; private Integer maxResolutionWidth; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannels.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannels.java index 11dcb82..5c7aa25 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannels.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalChannels.java @@ -14,6 +14,8 @@ public class TerminalChannels implements Serializable { private String alias; + private Integer type; + private Integer maxResolutionWidth; private Integer maxResolutionHeight; diff --git a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml index a735641..e57618f 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalChannelsDao.xml @@ -304,6 +304,7 @@ x.id as id, x.term_id as termid, x.alias as alias, + x.type as type, x.channel_id as channel_id, y.channel_name as channel_name, y.max_resolution_width as max_resolution_width, diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java index a2c9988..b293b04 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalServiceImpl.java @@ -225,6 +225,7 @@ public class TerminalServiceImpl implements TerminalService { terminalChannels1.setAlias(items.getAlias()); terminalChannels1.setChannelName(items.getChannelname()); terminalChannels1.setId(items.getChannelid()); + terminalChannels1.setType(items.getType()); terminalChannels1.setMaxResolutionHeight(items.getMaxResolutionHeight()); terminalChannels1.setMaxResolutionWidth(items.getMaxResolutionWidth()); list1.add(terminalChannels1);