diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java index 9b571a3..55a3ffa 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalVo.java @@ -68,10 +68,7 @@ public class TerminalVo { @ApiModelProperty(value = "装置编号", example = "123455") private Integer id; - @NotNull(message = "通道编号不能缺少") - @ApiModelProperty(value = "通道编号", example = "123455") - private String channelName; - - + @ApiModelProperty(value = "别名", example = "123455") + private String alias; } } 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 b960d0e..c52fc2b 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 @@ -73,9 +73,8 @@ public class UpdateTerminalVo { @ApiModelProperty(value = "装置编号", example = "123455") private Integer id; - @NotNull(message = "通道编号不能缺少") - @ApiModelProperty(value = "通道编号", example = "123455") - private String channelName; + @ApiModelProperty(value = "别名", example = "123455") + private String alias; } 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 608d5e7..c9ec83e 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 @@ -120,7 +120,7 @@ public class TerminalServiceImpl implements TerminalService { for (TerminalVo.Item item : channelId) { TerminalChannelMapper record = new TerminalChannelMapper(); record.setChannelId(item.getId()); - record.setAlias(item.getChannelName()); + record.setAlias(item.getAlias()); record.setTermId(termid); list.add(record); } @@ -153,7 +153,7 @@ public class TerminalServiceImpl implements TerminalService { for (UpdateTerminalVo.Item item : channelId) { TerminalChannelMapper record = new TerminalChannelMapper(); record.setChannelId(item.getId()); - record.setAlias(item.getChannelName()); + record.setAlias(item.getAlias()); record.setTermId(termid); list.add(record); }