diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java index 8f4c1e7..79e13d7 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/View_Dy_Line_Tower_Terminals.java @@ -86,9 +86,10 @@ public class View_Dy_Line_Tower_Terminals implements Serializable { @ApiModelProperty(value = "sim卡号", example = "123456") private String sim; - @ApiModelProperty(value = "网络类型", example = "1") + @ApiModelProperty(value = "网络运营商类型") private Integer netType; + private String iccid; @ApiModelProperty(value = "网络类型", example = "1") private String devType; diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java index 38f0e68..338a6b0 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/UpdateTerminalVo.java @@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; @@ -14,78 +13,81 @@ import java.util.List; @ApiModel(value = "修改装置信息对象", description = "修改设备信息对象描述") public class UpdateTerminalVo { - @ApiModelProperty(value = "装置编号", example = "123456") + @ApiModelProperty(value = "装置编号") @NotNull(message = "装置编号不能缺少") private Integer id; - @ApiModelProperty(value = "线路编号", example = "123456") + @ApiModelProperty(value = "线路编号") private Integer lineId; - @ApiModelProperty(value = "杆塔编号", example = "123456") + @ApiModelProperty(value = "杆塔编号") private Integer towerId; - @ApiModelProperty(value = "通道编号", example = "123456") + @ApiModelProperty(value = "通道编号") private List list; - @ApiModelProperty(value = "sim卡号", example = "123456") + @ApiModelProperty(value = "sim卡号") private String sim; - @ApiModelProperty(value = "图像监测装置 ID(17 位编码)", example = "12345678") + @ApiModelProperty(value = "图像监测装置 ID(17 位编码)") @NotBlank(message = "图像监测装置不能缺少") private String cmdid; - @ApiModelProperty(value = "原始 ID,各厂家内部识别号", example = "12345678") + @ApiModelProperty(value = "原始 ID,各厂家内部识别号") private Short orgId; - @ApiModelProperty(value = "装置名称", example = "名称名称") + @ApiModelProperty(value = "装置名称") private String equipName; - @ApiModelProperty(value = "显示名", example = "名称名称") + @ApiModelProperty(value = "显示名") private String displayName; - @ApiModelProperty(value = "装置型号", example = "型号型号") + @ApiModelProperty(value = "装置型号") private String model; - @ApiModelProperty(value = "装置基本信息版本号", example = "型号型号") + @ApiModelProperty(value = "装置基本信息版本号") private String essentialInfoVersion; - @ApiModelProperty(value = "是否带云台", example = " 0: 不带云台 1:带云台") + @ApiModelProperty(value = "是否带云台") private Integer hasPan; - @ApiModelProperty(value = "生产厂家", example = "生产厂家") + @ApiModelProperty(value = "生产厂家") private String bsManufacturer; - @ApiModelProperty(value = "规约版本", example = "规约版本") + @ApiModelProperty(value = "规约版本") private Integer protocol; - @ApiModelProperty(value = "网络类型", example = "网络类型") + @ApiModelProperty(value = "网络运营商类型") private Integer netType; - @ApiModelProperty(value = "设备类型", example = "网络类型") + @ApiModelProperty(value = "iccid") + private String iccid; + + @ApiModelProperty(value = "设备类型") private Integer devType; - @ApiModelProperty(value = "投运日期", example = "2022-06-12") + @ApiModelProperty(value = "投运日期") private Date workingDate; - @ApiModelProperty(value = "生产日期", example = "2022-06-12") + @ApiModelProperty(value = "生产日期") private Date bsProductionDate; - @ApiModelProperty(value = "出厂编号", example = "123456") + @ApiModelProperty(value = "出厂编号") private String bsIdentifier; - @ApiModelProperty(value = "纬度", example = "21321") + @ApiModelProperty(value = "纬度") private Double latitude; - @ApiModelProperty(value = "经度", example = "213") + @ApiModelProperty(value = "经度") private Double longitude; @Data public static class Item { @NotNull(message = "通道编号") - @ApiModelProperty(value = "装置编号", example = "123455") + @ApiModelProperty(value = "装置编号") private Integer id; - @ApiModelProperty(value = "别名", example = "123455") + @ApiModelProperty(value = "别名") private String alias; diff --git a/xymanager_dao/src/main/resources/mappers/View_Dy_Line_Tower_TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/View_Dy_Line_Tower_TerminalsDao.xml index 7fdeaeb..3ce65bb 100644 --- a/xymanager_dao/src/main/resources/mappers/View_Dy_Line_Tower_TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/View_Dy_Line_Tower_TerminalsDao.xml @@ -31,6 +31,7 @@ + @@ -103,7 +104,7 @@ id, dy_id, dy_name, dy_create_time, dy_update_time, line_id, line_name, line_bs_manufacturer, tower_id, tower_name, address, `order`, cmdid, org_id, equip_name, display_name, model, essential_info_version, has_pan, bs_manufacturer, bs_production_date, bs_identifier, - latitude, longitude, status, protocol, sim, working_date, net_type, dev_type, phase, + latitude, longitude, status, protocol, sim, working_date, net_type, iccid, dev_type, phase, equipment_type, last_heartbeat