fix: 增加devtype查询参数

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;
 }

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);