From 25986067f5299235f99290d23811d85a7772b48c Mon Sep 17 00:00:00 2001 From: huangfeng Date: Mon, 29 Apr 2024 16:00:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A2=9E=E5=8A=A0devtype=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/shxy/xymanager_common/vo/TerminalSelectVo.java | 9 ++++++--- .../shxy/xymanager_service/impl/TerminalServiceImpl.java | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalSelectVo.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalSelectVo.java index 0ec8e13..9584124 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalSelectVo.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/vo/TerminalSelectVo.java @@ -24,17 +24,20 @@ public class TerminalSelectVo { @ApiModelProperty(value = "搜索内容", example = "搜索内容") private String search; - @ApiModelProperty(value = "在线离线", example = "0--掉线 1--在线") + @ApiModelProperty(value = "在线离线", example = "") private Integer isonline; - @ApiModelProperty(value = "在线离线", example = "0--掉线 1--在线") + @ApiModelProperty(value = "规约", example = "") private Integer protocol; + @ApiModelProperty(value = "设备类型", example = "") + private Integer devType; + @Min(value = 1, message = "分页位置最小从1开始") @ApiModelProperty(value = "分页位置从1开始", required = true, example = "1") private int pageindex; @Min(value = 1, message = "分页大小最小为1") - @ApiModelProperty(value = "分页大小", required = true, example = "1") + @ApiModelProperty(value = "分页大小", required = true, example = "10") private int pagesize; } 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 bc9f8ec..7f39d78 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 @@ -191,6 +191,9 @@ public class TerminalServiceImpl implements TerminalService { View_Dy_Line_Tower_TerminalsExample.Criteria or2 = example.or(); or2.andProtocolEqualTo(protocolsearch); } + if (vo.getDevType() != null) { + example.or().andDevTypeLike("%" + vo.getDevType() + "%"); + } int pageindex = vo.getPageindex(); int pagesize = vo.getPagesize(); PageUtils.SetPage(pageindex, pagesize);