设备

zoniot-water/zoniot-water-api/src/main/java/com/zcxk/water/api/dto/query/DevicePageDto.java

@@ -16,6 +16,9 @@ public class DevicePageDto extends BasePageDto {
     @ApiModelProperty(value = "设备编号/名称")
     private String condition;
 
+    @ApiModelProperty(value = "设备类型")
+    private Integer deviceTypeId;
+
     @ApiModelProperty(value = "所属公司")
     private Integer companyOrgId;
 

zoniot-water/zoniot-water-core/src/main/java/com/zcxk/water/core/mapper/DeviceMapper.xml

@@ -88,10 +88,12 @@
         <if test="deviceDto.deptOrgId != null and deviceDto.deptOrgId != 0 ">
             and d.DEPT_ORG_ID =#{deviceDto.deptOrgId}
         </if>
+        <if test="deviceDto.deviceTypeId != null and deviceDto.deviceTypeId != 0 ">
+            and d.DEVICE_TYPE_ID =#{deviceDto.deviceTypeId}
+        </if>
         <if test="deviceDto.enableState != null ">
             and d.ENABLE_STATE =#{deviceDto.enableState}
         </if>
-
         <if test="deviceDto.userType!=null and deviceDto.userType!=-999 and deviceDto.userType!=-9999 and  deviceDto.programItems != null and deviceDto.programItems.size() > 0">
             <if test="deviceDto.permissonType == 5 or deviceDto.permissonType == 2">
                 and ( d.DEPT_ORG_ID in