From 95c61f26796cf8effacc9c86f4f5ec37b2af7205 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com> Date: Mon, 1 Jul 2024 17:02:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bellmann/common/enums/CapabilityEnum.java | 23 +++++++++ .../common/enums/FePortNumberEnum.java | 25 +++++++++ .../common/enums/GePortNumberEnum.java | 25 +++++++++ .../bellmann/common/enums/Ipv6EnableEnum.java | 21 ++++++++ .../bellmann/common/enums/LanNumberEnum.java | 24 +++++++++ .../com/bellmann/common/enums/MeshEnum.java | 21 ++++++++ .../com/bellmann/common/enums/RebootEnum.java | 21 ++++++++ .../com/bellmann/common/enums/Tr143Enum.java | 22 ++++++++ .../common/enums/VoipPortNumberEnum.java | 27 ++++++++++ .../common/enums/VoipProtocolEnum.java | 22 ++++++++ .../bellmann/common/enums/WifiConfigEnum.java | 22 ++++++++ .../bellmann/common/enums/WifiTypeEnum.java | 23 +++++++++ .../com/bellmann/common/enums/YwgEnum.java | 21 ++++++++ .../controller/TypeVerExtController.java | 8 +++ .../bellmann/model/bo/RemoteEquipmentBO.java | 2 + .../bellmann/model/form/CapabilityForm.java | 26 +++++----- .../com/bellmann/model/vo/CapabilityVO.java | 51 +++++++++++++++++++ .../bellmann/model/vo/RemoteDevInfoVO.java | 2 + .../bellmann/model/vo/RemoteEquipmentVO.java | 2 + .../bellmann/service/DeviceStaticService.java | 1 + .../bellmann/service/TypeVerExtService.java | 3 ++ .../service/impl/DeviceStaticServiceImpl.java | 1 + .../service/impl/TypeVerExtServiceImpl.java | 39 +++++++++++++- .../resources/mapper/DeviceStaticMapper.xml | 1 + 24 files changed, 419 insertions(+), 14 deletions(-) create mode 100644 src/main/java/com/bellmann/common/enums/CapabilityEnum.java create mode 100644 src/main/java/com/bellmann/common/enums/FePortNumberEnum.java create mode 100644 src/main/java/com/bellmann/common/enums/GePortNumberEnum.java create mode 100644 src/main/java/com/bellmann/common/enums/Ipv6EnableEnum.java create mode 100644 src/main/java/com/bellmann/common/enums/LanNumberEnum.java create mode 100644 src/main/java/com/bellmann/common/enums/MeshEnum.java create mode 100644 src/main/java/com/bellmann/common/enums/RebootEnum.java create mode 100644 src/main/java/com/bellmann/common/enums/Tr143Enum.java create mode 100644 src/main/java/com/bellmann/common/enums/VoipPortNumberEnum.java create mode 100644 src/main/java/com/bellmann/common/enums/VoipProtocolEnum.java create mode 100644 src/main/java/com/bellmann/common/enums/WifiConfigEnum.java create mode 100644 src/main/java/com/bellmann/common/enums/WifiTypeEnum.java create mode 100644 src/main/java/com/bellmann/common/enums/YwgEnum.java create mode 100644 src/main/java/com/bellmann/model/vo/CapabilityVO.java diff --git a/src/main/java/com/bellmann/common/enums/CapabilityEnum.java b/src/main/java/com/bellmann/common/enums/CapabilityEnum.java new file mode 100644 index 0000000..f950aa0 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/CapabilityEnum.java @@ -0,0 +1,23 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum CapabilityEnum implements IBaseEnum { + + M_100("100", "100M"), + M_1000("1000", "1000M"), + M_500("500", "500M"), + M_2000("2000", "2000M"), + CAPABILITY_NULL("", ""); + @Getter + private String value; + + @Getter + private String label; + + CapabilityEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/FePortNumberEnum.java b/src/main/java/com/bellmann/common/enums/FePortNumberEnum.java new file mode 100644 index 0000000..01f1e69 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/FePortNumberEnum.java @@ -0,0 +1,25 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum FePortNumberEnum implements IBaseEnum { + + FE_0("fe_0", "0个"), + FE_1("fe_1", "1个"), + FE_2("fe_2", "2个"), + FE_3("fe_3", "3个"), + FE_4("fe_4", "4个"), + FE_8("fe_8", "8个"), + FE_NULL("", ""); + @Getter + private String value; + + @Getter + private String label; + + FePortNumberEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/GePortNumberEnum.java b/src/main/java/com/bellmann/common/enums/GePortNumberEnum.java new file mode 100644 index 0000000..a14aa93 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/GePortNumberEnum.java @@ -0,0 +1,25 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum GePortNumberEnum implements IBaseEnum { + + GE_0("ge_0", "0个"), + GE_1("ge_1", "1个"), + GE_2("ge_2", "2个"), + GE_3("ge_3", "3个"), + GE_4("ge_4", "4个"), + GE_8("ge_8", "8个"), + GE_NULL("", ""); + @Getter + private String value; + + @Getter + private String label; + + GePortNumberEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/Ipv6EnableEnum.java b/src/main/java/com/bellmann/common/enums/Ipv6EnableEnum.java new file mode 100644 index 0000000..f78ed74 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/Ipv6EnableEnum.java @@ -0,0 +1,21 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum Ipv6EnableEnum implements IBaseEnum { + + IPV6ENABLE_1("ipv6enable_1", "是"), + IPV6ENABLE_0("ipv6enable_0", "否"), + IPV6ENABLE_NULL("", ""); + @Getter + private String value; + + @Getter + private String label; + + Ipv6EnableEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/LanNumberEnum.java b/src/main/java/com/bellmann/common/enums/LanNumberEnum.java new file mode 100644 index 0000000..4b57198 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/LanNumberEnum.java @@ -0,0 +1,24 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum LanNumberEnum implements IBaseEnum { + + LAN_1("lan_1", "1口"), + LAN_2("lan_2", "2口"), + LAN_4("lan_4", "4口"), + LAN_8("lan_8", "8口"), + LAN_9("lan_9", "9口"), + LAN_NULL("", ""); + @Getter + private String value; + + @Getter + private String label; + + LanNumberEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/MeshEnum.java b/src/main/java/com/bellmann/common/enums/MeshEnum.java new file mode 100644 index 0000000..727aee0 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/MeshEnum.java @@ -0,0 +1,21 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum MeshEnum implements IBaseEnum { + + MESH_1("mesh_1", "是"), + MESH_0("mesh_0", "否"), + MESH_NULL("", ""); + @Getter + private String value; + + @Getter + private String label; + + MeshEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/RebootEnum.java b/src/main/java/com/bellmann/common/enums/RebootEnum.java new file mode 100644 index 0000000..95e9017 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/RebootEnum.java @@ -0,0 +1,21 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum RebootEnum implements IBaseEnum { + + REBOOT_YES("reboot_yes", "是"), + REBOOT_NO("reboot_no", "否"), + REBOOT_NULL("", ""); + @Getter + private String value; + + @Getter + private String label; + + RebootEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/Tr143Enum.java b/src/main/java/com/bellmann/common/enums/Tr143Enum.java new file mode 100644 index 0000000..c361d04 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/Tr143Enum.java @@ -0,0 +1,22 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum Tr143Enum implements IBaseEnum { + + TR143_1("TR143_1", "是"), + TR143_0("TR143_0", "否"), + TR143_2("TR143_2", "路由支持"), + TR143_NULL("",""); + @Getter + private String value; + + @Getter + private String label; + + Tr143Enum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/VoipPortNumberEnum.java b/src/main/java/com/bellmann/common/enums/VoipPortNumberEnum.java new file mode 100644 index 0000000..5f26eff --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/VoipPortNumberEnum.java @@ -0,0 +1,27 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum VoipPortNumberEnum implements IBaseEnum { + + VOIP_0("voip_0", "不支持语音"), + VOIP_32("voip_32", "32口语音"), + VOIP_16("voip_16", "16口语音"), + VOIP_8("voip_8", "8口语音"), + VOIP_4("voip_4", "4口语音"), + VOIP_2("voip_2", "2口语音"), + VOIP_1("voip_1", "1口语音"), + + VOIP_NULL("", ""); + @Getter + private String value; + + @Getter + private String label; + + VoipPortNumberEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/VoipProtocolEnum.java b/src/main/java/com/bellmann/common/enums/VoipProtocolEnum.java new file mode 100644 index 0000000..b0c48b7 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/VoipProtocolEnum.java @@ -0,0 +1,22 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum VoipProtocolEnum implements IBaseEnum { + + VOIP_PROTOCOL_0("voipprotocol_0", "无"), + SIP("voipprotocol_1", "SIP"), + SIP_AND_H_248("voipprotocol_2", "SIP及H.248"), + VOIP_PROTOCOL_NULL("", ""); + @Getter + private String value; + + @Getter + private String label; + + VoipProtocolEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/WifiConfigEnum.java b/src/main/java/com/bellmann/common/enums/WifiConfigEnum.java new file mode 100644 index 0000000..f7586cd --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/WifiConfigEnum.java @@ -0,0 +1,22 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum WifiConfigEnum implements IBaseEnum { + + WIFI_0("wifi_0", "无频"), + WIFI_1("wifi_1", "单频"), + WIFI_2("wifi_2", "双频"), + WIFI_NULL("", ""); + @Getter + private String value; + + @Getter + private String label; + + WifiConfigEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/WifiTypeEnum.java b/src/main/java/com/bellmann/common/enums/WifiTypeEnum.java new file mode 100644 index 0000000..d1fb058 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/WifiTypeEnum.java @@ -0,0 +1,23 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum WifiTypeEnum implements IBaseEnum { + + WIFI_TYPE_0("wifitype_0", "无WIFI"), + WIFI_TYPE_1("wifitype_1", "WIFI4"), + WIFI_TYPE_2("wifitype_2", "WIFI5"), + WIFI_TYPE_3("wifitype_3", "WIFI6"), + WIFI_TYPE_NULL("",""); + @Getter + private String value; + + @Getter + private String label; + + WifiTypeEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/common/enums/YwgEnum.java b/src/main/java/com/bellmann/common/enums/YwgEnum.java new file mode 100644 index 0000000..90fe440 --- /dev/null +++ b/src/main/java/com/bellmann/common/enums/YwgEnum.java @@ -0,0 +1,21 @@ +package com.bellmann.common.enums; + +import com.bellmann.common.base.IBaseEnum; +import lombok.Getter; + +public enum YwgEnum implements IBaseEnum { + + YWG_1("ywg_1", "是"), + YWG_0("ywg_0", "否"), + YWG_NULL("", ""); + @Getter + private String value; + + @Getter + private String label; + + YwgEnum(String value, String label) { + this.value = value; + this.label = label; + } +} diff --git a/src/main/java/com/bellmann/controller/TypeVerExtController.java b/src/main/java/com/bellmann/controller/TypeVerExtController.java index 5719bdc..e99f6b2 100644 --- a/src/main/java/com/bellmann/controller/TypeVerExtController.java +++ b/src/main/java/com/bellmann/controller/TypeVerExtController.java @@ -2,6 +2,7 @@ package com.bellmann.controller; import com.bellmann.common.result.Result; import com.bellmann.model.form.CapabilityForm; +import com.bellmann.model.vo.CapabilityVO; import com.bellmann.service.TypeVerExtService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -28,4 +29,11 @@ public class TypeVerExtController { public Result editCapabilityForm(@RequestBody CapabilityForm form){ return typeVerExtService.editCapabilityForm(form); } + + @GetMapping("/remote/capability/{typeAndVerId}") + @Operation(summary = "远程操作-设备能力信息") + public Result devCapabilityInfo(@PathVariable Long typeAndVerId){ + + return typeVerExtService.devCapabilityInfo(typeAndVerId); + } } diff --git a/src/main/java/com/bellmann/model/bo/RemoteEquipmentBO.java b/src/main/java/com/bellmann/model/bo/RemoteEquipmentBO.java index 6cc7396..bcbe44c 100644 --- a/src/main/java/com/bellmann/model/bo/RemoteEquipmentBO.java +++ b/src/main/java/com/bellmann/model/bo/RemoteEquipmentBO.java @@ -9,6 +9,8 @@ public class RemoteEquipmentBO { private Long devId; + private Long typeAndVerId; + private String devSno; private String devAdNo; diff --git a/src/main/java/com/bellmann/model/form/CapabilityForm.java b/src/main/java/com/bellmann/model/form/CapabilityForm.java index 31cec30..66b692d 100644 --- a/src/main/java/com/bellmann/model/form/CapabilityForm.java +++ b/src/main/java/com/bellmann/model/form/CapabilityForm.java @@ -11,41 +11,41 @@ public class CapabilityForm { private String typeAndVerId; @Schema(description = "LAN口数量") - private String lanNumber; + private String lanNumber=""; @Schema(description = "VOIP端口数量") - private String voipPortNumber; + private String voipPortNumber=""; @Schema(description = "GE端口数") - private String gePortNumber; + private String gePortNumber=""; @Schema(description = "FE端口数") - private String fePortNumber; + private String fePortNumber=""; @Schema(description = "WIFI类型") - private String wifiType; + private String wifiType=""; @Schema(description = "WIFI配置") - private String wifiConfig; + private String wifiConfig=""; @Schema(description = "语音协议") - private String voipProtocol; + private String voipProtocol=""; @Schema(description = "设备能力") - private String capability; + private String capability=""; @Schema(description = "是否支持MESH组网") - private String mesh; + private String mesh=""; @Schema(description = "是否支持云网关") - private String ywg; + private String ywg=""; @Schema(description = "是否支持测速") - private String tr143; + private String tr143=""; @Schema(description = "是否支持IPV6") - private String ipv6Enable; + private String ipv6Enable=""; @Schema(description = "是否重启生效") - private String reboot; + private String reboot=""; } diff --git a/src/main/java/com/bellmann/model/vo/CapabilityVO.java b/src/main/java/com/bellmann/model/vo/CapabilityVO.java new file mode 100644 index 0000000..fdb5073 --- /dev/null +++ b/src/main/java/com/bellmann/model/vo/CapabilityVO.java @@ -0,0 +1,51 @@ +package com.bellmann.model.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +@Schema(description = "设备能力信息视图") +public class CapabilityVO { + + @Schema(description = "设备类型软件版本ID") + private String typeAndVerId; + + @Schema(description = "LAN口数量") + private String lanNumber; + + @Schema(description = "VOIP端口数量") + private String voipPortNumber; + + @Schema(description = "GE端口数") + private String gePortNumber; + + @Schema(description = "FE端口数") + private String fePortNumber; + + @Schema(description = "WIFI类型") + private String wifiType; + + @Schema(description = "WIFI配置") + private String wifiConfig; + + @Schema(description = "语音协议") + private String voipProtocol; + + @Schema(description = "设备能力") + private String capability; + + @Schema(description = "是否支持MESH组网") + private String mesh; + + @Schema(description = "是否支持云网关") + private String ywg; + + @Schema(description = "是否支持测速") + private String tr143; + + @Schema(description = "是否支持IPV6") + private String ipv6Enable; + + @Schema(description = "是否重启生效") + private String reboot; +} diff --git a/src/main/java/com/bellmann/model/vo/RemoteDevInfoVO.java b/src/main/java/com/bellmann/model/vo/RemoteDevInfoVO.java index 6f3da47..871c44f 100644 --- a/src/main/java/com/bellmann/model/vo/RemoteDevInfoVO.java +++ b/src/main/java/com/bellmann/model/vo/RemoteDevInfoVO.java @@ -13,6 +13,8 @@ public class RemoteDevInfoVO { private Long devId; + private Long typeAndVerId; + private String devAdNo; private String devSno; diff --git a/src/main/java/com/bellmann/model/vo/RemoteEquipmentVO.java b/src/main/java/com/bellmann/model/vo/RemoteEquipmentVO.java index 0820a7d..a284e66 100644 --- a/src/main/java/com/bellmann/model/vo/RemoteEquipmentVO.java +++ b/src/main/java/com/bellmann/model/vo/RemoteEquipmentVO.java @@ -14,6 +14,8 @@ public class RemoteEquipmentVO { private String devSno; + private Long typeAndVerId; + private String devAdNo; private String devPppoe; diff --git a/src/main/java/com/bellmann/service/DeviceStaticService.java b/src/main/java/com/bellmann/service/DeviceStaticService.java index a86fe5f..830b361 100644 --- a/src/main/java/com/bellmann/service/DeviceStaticService.java +++ b/src/main/java/com/bellmann/service/DeviceStaticService.java @@ -40,4 +40,5 @@ public interface DeviceStaticService { Result remoteDevInfo(Long devId); Result unbindingLogicId(UnBindingForm form); + } diff --git a/src/main/java/com/bellmann/service/TypeVerExtService.java b/src/main/java/com/bellmann/service/TypeVerExtService.java index 9dbbda4..831fec8 100644 --- a/src/main/java/com/bellmann/service/TypeVerExtService.java +++ b/src/main/java/com/bellmann/service/TypeVerExtService.java @@ -2,9 +2,12 @@ package com.bellmann.service; import com.bellmann.common.result.Result; import com.bellmann.model.form.CapabilityForm; +import com.bellmann.model.vo.CapabilityVO; public interface TypeVerExtService { CapabilityForm getCapabilityForm(String typeAndVerId); Result editCapabilityForm(CapabilityForm form); + + Result devCapabilityInfo(Long typeAndVerId); } diff --git a/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java b/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java index bfa6754..ad2effd 100644 --- a/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/DeviceStaticServiceImpl.java @@ -78,6 +78,7 @@ public class DeviceStaticServiceImpl implements DeviceStaticService { private final DeviceServiceMapMapper deviceServiceMapMapper; + @Override public Page resourcePage(SelectQuery query) { int pageNum = query.getPageNum(); diff --git a/src/main/java/com/bellmann/service/impl/TypeVerExtServiceImpl.java b/src/main/java/com/bellmann/service/impl/TypeVerExtServiceImpl.java index 717a389..cc39ccf 100644 --- a/src/main/java/com/bellmann/service/impl/TypeVerExtServiceImpl.java +++ b/src/main/java/com/bellmann/service/impl/TypeVerExtServiceImpl.java @@ -2,17 +2,19 @@ package com.bellmann.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.bellmann.common.base.IBaseEnum; +import com.bellmann.common.enums.*; import com.bellmann.common.result.Result; import com.bellmann.mapper.TypeVerExtMapper; import com.bellmann.model.entity.TypeVerExt; import com.bellmann.model.form.CapabilityForm; +import com.bellmann.model.vo.CapabilityVO; import com.bellmann.service.TypeVerExtService; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.List; @Service @@ -77,6 +79,9 @@ public class TypeVerExtServiceImpl implements TypeVerExtService { case "设备能力": capabilityForm.setCapability(propertyId); break; + case "是否重启生效": + capabilityForm.setReboot(propertyId); + break; } }); return capabilityForm; @@ -134,9 +139,41 @@ public class TypeVerExtServiceImpl implements TypeVerExtService { if (StringUtils.isNotBlank(form.getCapability())) { insertAndUpdate(new TypeVerExt(form.getTypeAndVerId(), "设备能力", form.getCapability())); } + if (StringUtils.isNotBlank(form.getReboot())) { + insertAndUpdate(new TypeVerExt(form.getTypeAndVerId(), "是否重启生效", form.getReboot())); + } } private void insertAndUpdate(TypeVerExt typeVerExt) { typeVerExtMapper.insert(typeVerExt); } + + @Override + public Result devCapabilityInfo(Long typeAndVerId) { + CapabilityForm capabilityForm = getCapabilityForm(typeAndVerId.toString()); + if (capabilityForm==null){ + return Result.success(new CapabilityVO()); + } + CapabilityVO capabilityVO = form2V0(capabilityForm); + return Result.success(capabilityVO); + } + + private CapabilityVO form2V0(CapabilityForm form){ + CapabilityVO capabilityVO = new CapabilityVO(); + capabilityVO.setLanNumber(IBaseEnum.getLabelByValue(form.getLanNumber(), LanNumberEnum.class)); + capabilityVO.setReboot(IBaseEnum.getLabelByValue(form.getReboot(), RebootEnum.class)); + capabilityVO.setMesh(IBaseEnum.getLabelByValue(form.getMesh(), MeshEnum.class)); + capabilityVO.setCapability(IBaseEnum.getLabelByValue(form.getCapability(), CapabilityEnum.class)); + capabilityVO.setYwg(IBaseEnum.getLabelByValue(form.getYwg(), YwgEnum.class)); + capabilityVO.setTr143(IBaseEnum.getLabelByValue(form.getTr143(), Tr143Enum.class)); + capabilityVO.setVoipProtocol(IBaseEnum.getLabelByValue(form.getVoipProtocol(), VoipProtocolEnum.class)); + capabilityVO.setWifiConfig(IBaseEnum.getLabelByValue(form.getWifiConfig(),WifiConfigEnum.class)); + capabilityVO.setWifiType(IBaseEnum.getLabelByValue(form.getWifiType(), WifiTypeEnum.class)); + capabilityVO.setFePortNumber(IBaseEnum.getLabelByValue(form.getFePortNumber(), FePortNumberEnum.class)); + capabilityVO.setGePortNumber(IBaseEnum.getLabelByValue(form.getGePortNumber(),GePortNumberEnum.class)); + capabilityVO.setIpv6Enable(IBaseEnum.getLabelByValue(form.getIpv6Enable(), Ipv6EnableEnum.class)); + capabilityVO.setVoipPortNumber(IBaseEnum.getLabelByValue(form.getVoipPortNumber(), VoipPortNumberEnum.class)); + capabilityVO.setTypeAndVerId(form.getTypeAndVerId()); + return capabilityVO; + } } diff --git a/src/main/resources/mapper/DeviceStaticMapper.xml b/src/main/resources/mapper/DeviceStaticMapper.xml index 0bf2a73..ca79f50 100644 --- a/src/main/resources/mapper/DeviceStaticMapper.xml +++ b/src/main/resources/mapper/DeviceStaticMapper.xml @@ -212,6 +212,7 @@ s.dev_sno, s.dev_ad_no, s.dev_pppoe, + s.type_and_ver_id, s.dev_status, v.soft_ver, T.dev_hard_ver,