Skip to content

F
fill-system
Commit 090cf87b authored by 赵啸非's avatar 赵啸非
Browse files
Options

设备添加楼层与楼栋

parent b14277d8
Pipeline #2739 failed with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 1674 additions and 997 deletions
      fill-manager/db/add.sql
      View file @ 090cf87b
      ...@@ -36,4 +36,13 @@ ALTER TABLE mortals_xhx_device ...@@ -36,4 +36,13 @@ ALTER TABLE mortals_xhx_device
      ALTER TABLE mortals_xhx_device ALTER TABLE mortals_xhx_device
      ADD COLUMN `onlineTime` datetime DEFAULT NULL COMMENT '最近上线时间' AFTER enabled; ADD COLUMN `onlineTime` datetime DEFAULT NULL COMMENT '最近上线时间' AFTER enabled;
      ALTER TABLE mortals_xhx_device ALTER TABLE mortals_xhx_device
      ADD COLUMN `offlineTime` datetime DEFAULT NULL COMMENT '最近离线时间' AFTER onlineTime; ADD COLUMN `offlineTime` datetime DEFAULT NULL COMMENT '最近离线时间' AFTER onlineTime;
      \ No newline at end of file
      -- ----------------------------
      2024-01-15
      -- ----------------------------
      ALTER TABLE mortals_xhx_device
      ADD COLUMN `deviceInBuilding` tinyint(4) COMMENT '所属楼栋';
      ALTER TABLE mortals_xhx_device
      ADD COLUMN `deviceInFloor` tinyint(4) COMMENT '所属楼层';
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
      View file @ 090cf87b
      ...@@ -2,6 +2,9 @@ package com.mortals.xhx.module.device.model; ...@@ -2,6 +2,9 @@ package com.mortals.xhx.module.device.model;
      import java.util.Date; import java.util.Date;
      import java.util.List; import java.util.List;
      import java.util.ArrayList; import java.util.ArrayList;
      import java.math.BigDecimal;
      import cn.hutool.core.date.DateUtil;
      import java.util.Date;
      import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
      import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
      import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
      ...@@ -11,7 +14,7 @@ import lombok.Data; ...@@ -11,7 +14,7 @@ import lombok.Data;
      * 设备实体对象 * 设备实体对象
      * *
      * @author zxfei * @author zxfei
      * @date 2023-06-21 * @date 2024-01-15
      */ */
      @Data @Data
      public class DeviceEntity extends DeviceVo { public class DeviceEntity extends DeviceVo {
      ...@@ -45,6 +48,26 @@ public class DeviceEntity extends DeviceVo { ...@@ -45,6 +48,26 @@ public class DeviceEntity extends DeviceVo {
      * 站点名称 * 站点名称
      */ */
      private String siteName; private String siteName;
      /**
      * 设备生产厂商ID
      */
      private Long deviceFirmId;
      /**
      * 设备生产厂商名称
      */
      private String deviceFirmname;
      /**
      * 设备访问ip
      */
      private String ip;
      /**
      * 端口
      */
      private String port;
      /**
      * 启用状态 (0.停止，1.启用)
      */
      private Integer enabled;
      /** /**
      * 产品编码 * 产品编码
      */ */
      ...@@ -82,29 +105,17 @@ public class DeviceEntity extends DeviceVo { ...@@ -82,29 +105,17 @@ public class DeviceEntity extends DeviceVo {
      */ */
      private String deviceRemark; private String deviceRemark;
      /** /**
      * 设备来源(0.旧设备，1.新设备) * 所属机构
      */ */
      private Integer source; private String belong;
      /** /**
      * 设备生产厂商ID * 所属楼栋
      */ */
      private Long deviceFirmId; private Integer deviceInBuilding;
      /** /**
      * 设备生产厂商名称 * 所属楼层
      */ */
      private String deviceFirmname; private Integer deviceInFloor;
      /**
      * 设备访问ip
      */
      private String ip;
      /**
      * 端口
      */
      private String port;
      /**
      * 启用状态 (0.停止，1.启用)
      */
      private Integer enabled;
      /** /**
      * 最近上线时间 * 最近上线时间
      */ */
      ...@@ -113,6 +124,10 @@ public class DeviceEntity extends DeviceVo { ...@@ -113,6 +124,10 @@ public class DeviceEntity extends DeviceVo {
      * 最近离线时间 * 最近离线时间
      */ */
      private Date offlineTime; private Date offlineTime;
      /**
      * 设备来源(0.旧设备，1.新设备)
      */
      private Integer source;
      @Override @Override
      public int hashCode() { public int hashCode() {
      return this.getId().hashCode(); return this.getId().hashCode();
      ...@@ -130,53 +145,32 @@ public class DeviceEntity extends DeviceVo { ...@@ -130,53 +145,32 @@ public class DeviceEntity extends DeviceVo {
      } }
      public void initAttrValue(){ public void initAttrValue(){
      this.deviceId = null;
      this.deviceId = -1L;
      this.deviceName = ""; this.deviceName = "";
      this.deviceCode = ""; this.deviceCode = "";
      this.deviceMac = ""; this.deviceMac = "";
      this.siteId = null;
      this.siteId = -1L;
      this.siteCode = ""; this.siteCode = "";
      this.siteName = ""; this.siteName = "";
      this.deviceFirmId = null;
      this.deviceFirmname = "";
      this.ip = "";
      this.port = "";
      this.enabled = 0;
      this.productCode = ""; this.productCode = "";
      this.productName = ""; this.productName = "";
      this.deviceSrc = 2; this.deviceSrc = 2;
      this.lon = ""; this.lon = "";
      this.lati = ""; this.lati = "";
      this.leadingOfficial = ""; this.leadingOfficial = "";
      this.leadingOfficialTelephone = ""; this.leadingOfficialTelephone = "";
      this.deviceStatus = 0; this.deviceStatus = 0;
      this.deviceRemark = ""; this.deviceRemark = "";
      this.belong = "";
      this.deviceInBuilding = 0;
      this.deviceInFloor = 0;
      this.onlineTime = new Date();
      this.offlineTime = new Date();
      this.source = 1; this.source = 1;
      this.deviceFirmId = -1L;
      this.deviceFirmname = "";
      this.ip = "";
      this.port = "";
      this.enabled = 0;
      this.onlineTime = null;
      this.offlineTime = null;
      } }
      } }
      \ No newline at end of file
      fill-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java
      View file @ 090cf87b
      ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity; ...@@ -7,7 +7,7 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
      * 设备查询对象 * 设备查询对象
      * *
      * @author zxfei * @author zxfei
      * @date 2023-06-21 * @date 2024-01-15
      */ */
      public class DeviceQuery extends DeviceEntity { public class DeviceQuery extends DeviceEntity {
      /** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
      ...@@ -80,6 +80,51 @@ public class DeviceQuery extends DeviceEntity { ...@@ -80,6 +80,51 @@ public class DeviceQuery extends DeviceEntity {
      /** 站点名称排除列表 */ /** 站点名称排除列表 */
      private List <String> siteNameNotList; private List <String> siteNameNotList;
      /** 开始 设备生产厂商ID */
      private Long deviceFirmIdStart;
      /** 结束 设备生产厂商ID */
      private Long deviceFirmIdEnd;
      /** 增加 设备生产厂商ID */
      private Long deviceFirmIdIncrement;
      /** 设备生产厂商ID列表 */
      private List <Long> deviceFirmIdList;
      /** 设备生产厂商ID排除列表 */
      private List <Long> deviceFirmIdNotList;
      /** 设备生产厂商名称 */
      private List<String> deviceFirmnameList;
      /** 设备生产厂商名称排除列表 */
      private List <String> deviceFirmnameNotList;
      /** 设备访问ip */
      private List<String> ipList;
      /** 设备访问ip排除列表 */
      private List <String> ipNotList;
      /** 端口 */
      private List<String> portList;
      /** 端口排除列表 */
      private List <String> portNotList;
      /** 开始 启用状态 (0.停止，1.启用) */
      private Integer enabledStart;
      /** 结束 启用状态 (0.停止，1.启用) */
      private Integer enabledEnd;
      /** 增加 启用状态 (0.停止，1.启用) */
      private Integer enabledIncrement;
      /** 启用状态 (0.停止，1.启用)列表 */
      private List <Integer> enabledList;
      /** 启用状态 (0.停止，1.启用)排除列表 */
      private List <Integer> enabledNotList;
      /** 产品编码 */ /** 产品编码 */
      private List<String> productCodeList; private List<String> productCodeList;
      ...@@ -145,6 +190,53 @@ public class DeviceQuery extends DeviceEntity { ...@@ -145,6 +190,53 @@ public class DeviceQuery extends DeviceEntity {
      /** 备注排除列表 */ /** 备注排除列表 */
      private List <String> deviceRemarkNotList; private List <String> deviceRemarkNotList;
      /** 所属机构 */
      private List<String> belongList;
      /** 所属机构排除列表 */
      private List <String> belongNotList;
      /** 开始 所属楼栋 */
      private Integer deviceInBuildingStart;
      /** 结束 所属楼栋 */
      private Integer deviceInBuildingEnd;
      /** 增加 所属楼栋 */
      private Integer deviceInBuildingIncrement;
      /** 所属楼栋列表 */
      private List <Integer> deviceInBuildingList;
      /** 所属楼栋排除列表 */
      private List <Integer> deviceInBuildingNotList;
      /** 开始 所属楼层 */
      private Integer deviceInFloorStart;
      /** 结束 所属楼层 */
      private Integer deviceInFloorEnd;
      /** 增加 所属楼层 */
      private Integer deviceInFloorIncrement;
      /** 所属楼层列表 */
      private List <Integer> deviceInFloorList;
      /** 所属楼层排除列表 */
      private List <Integer> deviceInFloorNotList;
      /** 开始 最近上线时间 */
      private String onlineTimeStart;
      /** 结束 最近上线时间 */
      private String onlineTimeEnd;
      /** 开始 最近离线时间 */
      private String offlineTimeStart;
      /** 结束 最近离线时间 */
      private String offlineTimeEnd;
      /** 开始 设备来源(0.旧设备，1.新设备) */ /** 开始 设备来源(0.旧设备，1.新设备) */
      private Integer sourceStart; private Integer sourceStart;
      ...@@ -202,63 +294,6 @@ public class DeviceQuery extends DeviceEntity { ...@@ -202,63 +294,6 @@ public class DeviceQuery extends DeviceEntity {
      /** 结束 更新时间 */ /** 结束 更新时间 */
      private String updateTimeEnd; private String updateTimeEnd;
      /** 开始 设备生产厂商ID */
      private Long deviceFirmIdStart;
      /** 结束 设备生产厂商ID */
      private Long deviceFirmIdEnd;
      /** 增加 设备生产厂商ID */
      private Long deviceFirmIdIncrement;
      /** 设备生产厂商ID列表 */
      private List <Long> deviceFirmIdList;
      /** 设备生产厂商ID排除列表 */
      private List <Long> deviceFirmIdNotList;
      /** 设备生产厂商名称 */
      private List<String> deviceFirmnameList;
      /** 设备生产厂商名称排除列表 */
      private List <String> deviceFirmnameNotList;
      /** 设备访问ip */
      private List<String> ipList;
      /** 设备访问ip排除列表 */
      private List <String> ipNotList;
      /** 端口 */
      private List<String> portList;
      /** 端口排除列表 */
      private List <String> portNotList;
      /** 开始 启用状态 (0.停止，1.启用) */
      private Integer enabledStart;
      /** 结束 启用状态 (0.停止，1.启用) */
      private Integer enabledEnd;
      /** 增加 启用状态 (0.停止，1.启用) */
      private Integer enabledIncrement;
      /** 启用状态 (0.停止，1.启用)列表 */
      private List <Integer> enabledList;
      /** 启用状态 (0.停止，1.启用)排除列表 */
      private List <Integer> enabledNotList;
      /** 开始 最近上线时间 */
      private String onlineTimeStart;
      /** 结束 最近上线时间 */
      private String onlineTimeEnd;
      /** 开始 最近离线时间 */
      private String offlineTimeStart;
      /** 结束 最近离线时间 */
      private String offlineTimeEnd;
      /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */ /** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
      private List<DeviceQuery> orConditionList; private List<DeviceQuery> orConditionList;
      ...@@ -671,136 +706,394 @@ public class DeviceQuery extends DeviceEntity { ...@@ -671,136 +706,394 @@ public class DeviceQuery extends DeviceEntity {
      } }
      /** /**
      * 获取 产品编码 * 获取 开始 设备生产厂商ID
      * @return productCodeList * @return deviceFirmIdStart
      */ */
      public List<String> getProductCodeList(){ public Long getDeviceFirmIdStart(){
      return this.productCodeList; return this.deviceFirmIdStart;
      } }
      /** /**
      * 设置 产品编码 * 设置 开始 设备生产厂商ID
      * @param productCodeList * @param deviceFirmIdStart
      */ */
      public void setProductCodeList(List<String> productCodeList){ public void setDeviceFirmIdStart(Long deviceFirmIdStart){
      this.productCodeList = productCodeList; this.deviceFirmIdStart = deviceFirmIdStart;
      } }
      /** /**
      * 获取 产品编码 * 获取 结束 设备生产厂商ID
      * @return productCodeNotList * @return $deviceFirmIdEnd
      */ */
      public List<String> getProductCodeNotList(){ public Long getDeviceFirmIdEnd(){
      return this.productCodeNotList; return this.deviceFirmIdEnd;
      } }
      /** /**
      * 设置 产品编码 * 设置 结束 设备生产厂商ID
      * @param productCodeNotList * @param deviceFirmIdEnd
      */ */
      public void setProductCodeNotList(List<String> productCodeNotList){ public void setDeviceFirmIdEnd(Long deviceFirmIdEnd){
      this.productCodeNotList = productCodeNotList; this.deviceFirmIdEnd = deviceFirmIdEnd;
      } }
      /** /**
      * 获取 产品名称 * 获取 增加 设备生产厂商ID
      * @return productNameList * @return deviceFirmIdIncrement
      */ */
      public List<String> getProductNameList(){ public Long getDeviceFirmIdIncrement(){
      return this.productNameList; return this.deviceFirmIdIncrement;
      } }
      /** /**
      * 设置 产品名称 * 设置 增加 设备生产厂商ID
      * @param productNameList * @param deviceFirmIdIncrement
      */ */
      public void setProductNameList(List<String> productNameList){ public void setDeviceFirmIdIncrement(Long deviceFirmIdIncrement){
      this.productNameList = productNameList; this.deviceFirmIdIncrement = deviceFirmIdIncrement;
      } }
      /** /**
      * 获取 产品名称 * 获取 设备生产厂商ID
      * @return productNameNotList * @return deviceFirmIdList
      */ */
      public List<String> getProductNameNotList(){ public List<Long> getDeviceFirmIdList(){
      return this.productNameNotList; return this.deviceFirmIdList;
      } }
      /** /**
      * 设置 产品名称 * 设置 设备生产厂商ID
      * @param productNameNotList * @param deviceFirmIdList
      */ */
      public void setProductNameNotList(List<String> productNameNotList){ public void setDeviceFirmIdList(List<Long> deviceFirmIdList){
      this.productNameNotList = productNameNotList; this.deviceFirmIdList = deviceFirmIdList;
      } }
      /** /**
      * 获取 开始 设备来源(0.子设备，1.网关设备，2.直连设备) * 获取 设备生产厂商ID
      * @return deviceSrcStart * @return deviceFirmIdNotList
      */ */
      public Integer getDeviceSrcStart(){ public List<Long> getDeviceFirmIdNotList(){
      return this.deviceSrcStart; return this.deviceFirmIdNotList;
      } }
      /** /**
      * 设置 开始 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 设备生产厂商ID
      * @param deviceSrcStart * @param deviceFirmIdNotList
      */ */
      public void setDeviceSrcStart(Integer deviceSrcStart){ public void setDeviceFirmIdNotList(List<Long> deviceFirmIdNotList){
      this.deviceSrcStart = deviceSrcStart; this.deviceFirmIdNotList = deviceFirmIdNotList;
      } }
      /** /**
      * 获取 结束 设备来源(0.子设备，1.网关设备，2.直连设备) * 获取 设备生产厂商名称
      * @return $deviceSrcEnd * @return deviceFirmnameList
      */ */
      public Integer getDeviceSrcEnd(){ public List<String> getDeviceFirmnameList(){
      return this.deviceSrcEnd; return this.deviceFirmnameList;
      } }
      /** /**
      * 设置 结束 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 设备生产厂商名称
      * @param deviceSrcEnd * @param deviceFirmnameList
      */ */
      public void setDeviceSrcEnd(Integer deviceSrcEnd){ public void setDeviceFirmnameList(List<String> deviceFirmnameList){
      this.deviceSrcEnd = deviceSrcEnd; this.deviceFirmnameList = deviceFirmnameList;
      } }
      /** /**
      * 获取 增加 设备来源(0.子设备，1.网关设备，2.直连设备) * 获取 设备生产厂商名称
      * @return deviceSrcIncrement * @return deviceFirmnameNotList
      */ */
      public Integer getDeviceSrcIncrement(){ public List<String> getDeviceFirmnameNotList(){
      return this.deviceSrcIncrement; return this.deviceFirmnameNotList;
      } }
      /** /**
      * 设置 增加 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 设备生产厂商名称
      * @param deviceSrcIncrement * @param deviceFirmnameNotList
      */ */
      public void setDeviceSrcIncrement(Integer deviceSrcIncrement){ public void setDeviceFirmnameNotList(List<String> deviceFirmnameNotList){
      this.deviceSrcIncrement = deviceSrcIncrement; this.deviceFirmnameNotList = deviceFirmnameNotList;
      } }
      /** /**
      * 获取 设备来源(0.子设备，1.网关设备，2.直连设备) * 获取 设备访问ip
      * @return deviceSrcList * @return ipList
      */ */
      public List<Integer> getDeviceSrcList(){ public List<String> getIpList(){
      return this.deviceSrcList; return this.ipList;
      } }
      /** /**
      * 设置 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 设备访问ip
      * @param deviceSrcList * @param ipList
      */ */
      public void setDeviceSrcList(List<Integer> deviceSrcList){ public void setIpList(List<String> ipList){
      this.deviceSrcList = deviceSrcList; this.ipList = ipList;
      } }
      /** /**
      * 获取 设备来源(0.子设备，1.网关设备，2.直连设备) * 获取 设备访问ip
      * @return deviceSrcNotList * @return ipNotList
      */
      public List<String> getIpNotList(){
      return this.ipNotList;
      }
      /**
      * 设置 设备访问ip
      * @param ipNotList
      */
      public void setIpNotList(List<String> ipNotList){
      this.ipNotList = ipNotList;
      }
      /**
      * 获取 端口
      * @return portList
      */
      public List<String> getPortList(){
      return this.portList;
      }
      /**
      * 设置 端口
      * @param portList
      */
      public void setPortList(List<String> portList){
      this.portList = portList;
      }
      /**
      * 获取 端口
      * @return portNotList
      */
      public List<String> getPortNotList(){
      return this.portNotList;
      }
      /**
      * 设置 端口
      * @param portNotList
      */
      public void setPortNotList(List<String> portNotList){
      this.portNotList = portNotList;
      }
      /**
      * 获取 开始 启用状态 (0.停止，1.启用)
      * @return enabledStart
      */
      public Integer getEnabledStart(){
      return this.enabledStart;
      }
      /**
      * 设置 开始 启用状态 (0.停止，1.启用)
      * @param enabledStart
      */
      public void setEnabledStart(Integer enabledStart){
      this.enabledStart = enabledStart;
      }
      /**
      * 获取 结束 启用状态 (0.停止，1.启用)
      * @return $enabledEnd
      */
      public Integer getEnabledEnd(){
      return this.enabledEnd;
      }
      /**
      * 设置 结束 启用状态 (0.停止，1.启用)
      * @param enabledEnd
      */
      public void setEnabledEnd(Integer enabledEnd){
      this.enabledEnd = enabledEnd;
      }
      /**
      * 获取 增加 启用状态 (0.停止，1.启用)
      * @return enabledIncrement
      */
      public Integer getEnabledIncrement(){
      return this.enabledIncrement;
      }
      /**
      * 设置 增加 启用状态 (0.停止，1.启用)
      * @param enabledIncrement
      */
      public void setEnabledIncrement(Integer enabledIncrement){
      this.enabledIncrement = enabledIncrement;
      }
      /**
      * 获取 启用状态 (0.停止，1.启用)
      * @return enabledList
      */
      public List<Integer> getEnabledList(){
      return this.enabledList;
      }
      /**
      * 设置 启用状态 (0.停止，1.启用)
      * @param enabledList
      */
      public void setEnabledList(List<Integer> enabledList){
      this.enabledList = enabledList;
      }
      /**
      * 获取 启用状态 (0.停止，1.启用)
      * @return enabledNotList
      */
      public List<Integer> getEnabledNotList(){
      return this.enabledNotList;
      }
      /**
      * 设置 启用状态 (0.停止，1.启用)
      * @param enabledNotList
      */
      public void setEnabledNotList(List<Integer> enabledNotList){
      this.enabledNotList = enabledNotList;
      }
      /**
      * 获取 产品编码
      * @return productCodeList
      */
      public List<String> getProductCodeList(){
      return this.productCodeList;
      }
      /**
      * 设置 产品编码
      * @param productCodeList
      */
      public void setProductCodeList(List<String> productCodeList){
      this.productCodeList = productCodeList;
      }
      /**
      * 获取 产品编码
      * @return productCodeNotList
      */
      public List<String> getProductCodeNotList(){
      return this.productCodeNotList;
      }
      /**
      * 设置 产品编码
      * @param productCodeNotList
      */
      public void setProductCodeNotList(List<String> productCodeNotList){
      this.productCodeNotList = productCodeNotList;
      }
      /**
      * 获取 产品名称
      * @return productNameList
      */
      public List<String> getProductNameList(){
      return this.productNameList;
      }
      /**
      * 设置 产品名称
      * @param productNameList
      */
      public void setProductNameList(List<String> productNameList){
      this.productNameList = productNameList;
      }
      /**
      * 获取 产品名称
      * @return productNameNotList
      */
      public List<String> getProductNameNotList(){
      return this.productNameNotList;
      }
      /**
      * 设置 产品名称
      * @param productNameNotList
      */
      public void setProductNameNotList(List<String> productNameNotList){
      this.productNameNotList = productNameNotList;
      }
      /**
      * 获取 开始 设备来源(0.子设备，1.网关设备，2.直连设备)
      * @return deviceSrcStart
      */
      public Integer getDeviceSrcStart(){
      return this.deviceSrcStart;
      }
      /**
      * 设置 开始 设备来源(0.子设备，1.网关设备，2.直连设备)
      * @param deviceSrcStart
      */
      public void setDeviceSrcStart(Integer deviceSrcStart){
      this.deviceSrcStart = deviceSrcStart;
      }
      /**
      * 获取 结束 设备来源(0.子设备，1.网关设备，2.直连设备)
      * @return $deviceSrcEnd
      */
      public Integer getDeviceSrcEnd(){
      return this.deviceSrcEnd;
      }
      /**
      * 设置 结束 设备来源(0.子设备，1.网关设备，2.直连设备)
      * @param deviceSrcEnd
      */
      public void setDeviceSrcEnd(Integer deviceSrcEnd){
      this.deviceSrcEnd = deviceSrcEnd;
      }
      /**
      * 获取 增加 设备来源(0.子设备，1.网关设备，2.直连设备)
      * @return deviceSrcIncrement
      */
      public Integer getDeviceSrcIncrement(){
      return this.deviceSrcIncrement;
      }
      /**
      * 设置 增加 设备来源(0.子设备，1.网关设备，2.直连设备)
      * @param deviceSrcIncrement
      */
      public void setDeviceSrcIncrement(Integer deviceSrcIncrement){
      this.deviceSrcIncrement = deviceSrcIncrement;
      }
      /**
      * 获取 设备来源(0.子设备，1.网关设备，2.直连设备)
      * @return deviceSrcList
      */
      public List<Integer> getDeviceSrcList(){
      return this.deviceSrcList;
      }
      /**
      * 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
      * @param deviceSrcList
      */
      public void setDeviceSrcList(List<Integer> deviceSrcList){
      this.deviceSrcList = deviceSrcList;
      }
      /**
      * 获取 设备来源(0.子设备，1.网关设备，2.直连设备)
      * @return deviceSrcNotList
      */ */
      public List<Integer> getDeviceSrcNotList(){ public List<Integer> getDeviceSrcNotList(){
      return this.deviceSrcNotList; return this.deviceSrcNotList;
      ...@@ -1057,632 +1350,568 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1057,632 +1350,568 @@ public class DeviceQuery extends DeviceEntity {
      } }
      /** /**
      * 获取 开始 设备来源(0.旧设备，1.新设备) * 获取 所属机构
      * @return sourceStart * @return belongList
      */ */
      public Integer getSourceStart(){ public List<String> getBelongList(){
      return this.sourceStart; return this.belongList;
      } }
      /** /**
      * 设置 开始 设备来源(0.旧设备，1.新设备) * 设置 所属机构
      * @param sourceStart * @param belongList
      */ */
      public void setSourceStart(Integer sourceStart){ public void setBelongList(List<String> belongList){
      this.sourceStart = sourceStart; this.belongList = belongList;
      } }
      /** /**
      * 获取 结束 设备来源(0.旧设备，1.新设备) * 获取 所属机构
      * @return $sourceEnd * @return belongNotList
      */ */
      public Integer getSourceEnd(){ public List<String> getBelongNotList(){
      return this.sourceEnd; return this.belongNotList;
      } }
      /** /**
      * 设置 结束 设备来源(0.旧设备，1.新设备) * 设置 所属机构
      * @param sourceEnd * @param belongNotList
      */ */
      public void setSourceEnd(Integer sourceEnd){ public void setBelongNotList(List<String> belongNotList){
      this.sourceEnd = sourceEnd; this.belongNotList = belongNotList;
      } }
      /** /**
      * 获取 增加 设备来源(0.旧设备，1.新设备) * 获取 开始 所属楼栋
      * @return sourceIncrement * @return deviceInBuildingStart
      */ */
      public Integer getSourceIncrement(){ public Integer getDeviceInBuildingStart(){
      return this.sourceIncrement; return this.deviceInBuildingStart;
      } }
      /** /**
      * 设置 增加 设备来源(0.旧设备，1.新设备) * 设置 开始 所属楼栋
      * @param sourceIncrement * @param deviceInBuildingStart
      */ */
      public void setSourceIncrement(Integer sourceIncrement){ public void setDeviceInBuildingStart(Integer deviceInBuildingStart){
      this.sourceIncrement = sourceIncrement; this.deviceInBuildingStart = deviceInBuildingStart;
      }
      /**
      * 获取 设备来源(0.旧设备，1.新设备)
      * @return sourceList
      */
      public List<Integer> getSourceList(){
      return this.sourceList;
      }
      /**
      * 设置 设备来源(0.旧设备，1.新设备)
      * @param sourceList
      */
      public void setSourceList(List<Integer> sourceList){
      this.sourceList = sourceList;
      }
      /**
      * 获取 设备来源(0.旧设备，1.新设备)
      * @return sourceNotList
      */
      public List<Integer> getSourceNotList(){
      return this.sourceNotList;
      }
      /**
      * 设置 设备来源(0.旧设备，1.新设备)
      * @param sourceNotList
      */
      public void setSourceNotList(List<Integer> sourceNotList){
      this.sourceNotList = sourceNotList;
      }
      /**
      * 获取 开始 创建用户
      * @return createUserIdStart
      */
      public Long getCreateUserIdStart(){
      return this.createUserIdStart;
      }
      /**
      * 设置 开始 创建用户
      * @param createUserIdStart
      */
      public void setCreateUserIdStart(Long createUserIdStart){
      this.createUserIdStart = createUserIdStart;
      }
      /**
      * 获取 结束 创建用户
      * @return $createUserIdEnd
      */
      public Long getCreateUserIdEnd(){
      return this.createUserIdEnd;
      } }
      /** /**
      * 设置 结束 创建用户 * 获取 结束 所属楼栋
      * @param createUserIdEnd * @return $deviceInBuildingEnd
      */ */
      public void setCreateUserIdEnd(Long createUserIdEnd){ public Integer getDeviceInBuildingEnd(){
      this.createUserIdEnd = createUserIdEnd; return this.deviceInBuildingEnd;
      } }
      /** /**
      * 获取 增加 创建用户 * 设置 结束 所属楼栋
      * @return createUserIdIncrement * @param deviceInBuildingEnd
      */ */
      public Long getCreateUserIdIncrement(){ public void setDeviceInBuildingEnd(Integer deviceInBuildingEnd){
      return this.createUserIdIncrement; this.deviceInBuildingEnd = deviceInBuildingEnd;
      } }
      /** /**
      * 设置 增加 创建用户 * 获取 增加 所属楼栋
      * @param createUserIdIncrement * @return deviceInBuildingIncrement
      */ */
      public void setCreateUserIdIncrement(Long createUserIdIncrement){ public Integer getDeviceInBuildingIncrement(){
      this.createUserIdIncrement = createUserIdIncrement; return this.deviceInBuildingIncrement;
      } }
      /** /**
      * 获取 创建用户 * 设置 增加 所属楼栋
      * @return createUserIdList * @param deviceInBuildingIncrement
      */ */
      public List<Long> getCreateUserIdList(){ public void setDeviceInBuildingIncrement(Integer deviceInBuildingIncrement){
      return this.createUserIdList; this.deviceInBuildingIncrement = deviceInBuildingIncrement;
      } }
      /** /**
      * 设置 创建用户 * 获取 所属楼栋
      * @param createUserIdList * @return deviceInBuildingList
      */ */
      public void setCreateUserIdList(List<Long> createUserIdList){ public List<Integer> getDeviceInBuildingList(){
      this.createUserIdList = createUserIdList; return this.deviceInBuildingList;
      } }
      /** /**
      * 获取 创建用户 * 设置 所属楼栋
      * @return createUserIdNotList * @param deviceInBuildingList
      */ */
      public List<Long> getCreateUserIdNotList(){ public void setDeviceInBuildingList(List<Integer> deviceInBuildingList){
      return this.createUserIdNotList; this.deviceInBuildingList = deviceInBuildingList;
      } }
      /** /**
      * 设置 创建用户 * 获取 所属楼栋
      * @param createUserIdNotList * @return deviceInBuildingNotList
      */ */
      public void setCreateUserIdNotList(List<Long> createUserIdNotList){ public List<Integer> getDeviceInBuildingNotList(){
      this.createUserIdNotList = createUserIdNotList; return this.deviceInBuildingNotList;
      } }
      /** /**
      * 获取 开始 创建时间 * 设置 所属楼栋
      * @return createTimeStart * @param deviceInBuildingNotList
      */ */
      public String getCreateTimeStart(){ public void setDeviceInBuildingNotList(List<Integer> deviceInBuildingNotList){
      return this.createTimeStart; this.deviceInBuildingNotList = deviceInBuildingNotList;
      } }
      /**
      * 设置 开始 创建时间
      * @param createTimeStart
      */
      public void setCreateTimeStart(String createTimeStart){
      this.createTimeStart = createTimeStart;
      }
      /** /**
      * 获取 结束 创建时间 * 获取 开始 所属楼层
      * @return createTimeEnd * @return deviceInFloorStart
      */ */
      public String getCreateTimeEnd(){ public Integer getDeviceInFloorStart(){
      return this.createTimeEnd; return this.deviceInFloorStart;
      } }
      /** /**
      * 设置 结束 创建时间 * 设置 开始 所属楼层
      * @param createTimeEnd * @param deviceInFloorStart
      */ */
      public void setCreateTimeEnd(String createTimeEnd){ public void setDeviceInFloorStart(Integer deviceInFloorStart){
      this.createTimeEnd = createTimeEnd; this.deviceInFloorStart = deviceInFloorStart;
      } }
      /** /**
      * 获取 开始 更新用户 * 获取 结束 所属楼层
      * @return updateUserIdStart * @return $deviceInFloorEnd
      */ */
      public Long getUpdateUserIdStart(){ public Integer getDeviceInFloorEnd(){
      return this.updateUserIdStart; return this.deviceInFloorEnd;
      } }
      /** /**
      * 设置 开始 更新用户 * 设置 结束 所属楼层
      * @param updateUserIdStart * @param deviceInFloorEnd
      */ */
      public void setUpdateUserIdStart(Long updateUserIdStart){ public void setDeviceInFloorEnd(Integer deviceInFloorEnd){
      this.updateUserIdStart = updateUserIdStart; this.deviceInFloorEnd = deviceInFloorEnd;
      } }
      /** /**
      * 获取 结束 更新用户 * 获取 增加 所属楼层
      * @return $updateUserIdEnd * @return deviceInFloorIncrement
      */ */
      public Long getUpdateUserIdEnd(){ public Integer getDeviceInFloorIncrement(){
      return this.updateUserIdEnd; return this.deviceInFloorIncrement;
      } }
      /** /**
      * 设置 结束 更新用户 * 设置 增加 所属楼层
      * @param updateUserIdEnd * @param deviceInFloorIncrement
      */ */
      public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setDeviceInFloorIncrement(Integer deviceInFloorIncrement){
      this.updateUserIdEnd = updateUserIdEnd; this.deviceInFloorIncrement = deviceInFloorIncrement;
      } }
      /** /**
      * 获取 增加 更新用户 * 获取 所属楼层
      * @return updateUserIdIncrement * @return deviceInFloorList
      */ */
      public Long getUpdateUserIdIncrement(){ public List<Integer> getDeviceInFloorList(){
      return this.updateUserIdIncrement; return this.deviceInFloorList;
      } }
      /** /**
      * 设置 增加 更新用户 * 设置 所属楼层
      * @param updateUserIdIncrement * @param deviceInFloorList
      */ */
      public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setDeviceInFloorList(List<Integer> deviceInFloorList){
      this.updateUserIdIncrement = updateUserIdIncrement; this.deviceInFloorList = deviceInFloorList;
      } }
      /** /**
      * 获取 更新用户 * 获取 所属楼层
      * @return updateUserIdList * @return deviceInFloorNotList
      */ */
      public List<Long> getUpdateUserIdList(){ public List<Integer> getDeviceInFloorNotList(){
      return this.updateUserIdList; return this.deviceInFloorNotList;
      } }
      /** /**
      * 设置 更新用户 * 设置 所属楼层
      * @param updateUserIdList * @param deviceInFloorNotList
      */ */
      public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setDeviceInFloorNotList(List<Integer> deviceInFloorNotList){
      this.updateUserIdList = updateUserIdList; this.deviceInFloorNotList = deviceInFloorNotList;
      } }
      /**
      * 获取 更新用户
      * @return updateUserIdNotList
      */
      public List<Long> getUpdateUserIdNotList(){
      return this.updateUserIdNotList;
      }
      /** /**
      * 设置 更新用户 * 获取 开始 最近上线时间
      * @param updateUserIdNotList * @return onlineTimeStart
      */ */
      public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){ public String getOnlineTimeStart(){
      this.updateUserIdNotList = updateUserIdNotList; return this.onlineTimeStart;
      } }
      /** /**
      * 获取 开始 更新时间 * 设置 开始 最近上线时间
      * @return updateTimeStart * @param onlineTimeStart
      */ */
      public String getUpdateTimeStart(){ public void setOnlineTimeStart(String onlineTimeStart){
      return this.updateTimeStart; this.onlineTimeStart = onlineTimeStart;
      } }
      /** /**
      * 设置 开始 更新时间 * 获取 结束 最近上线时间
      * @param updateTimeStart * @return onlineTimeEnd
      */ */
      public void setUpdateTimeStart(String updateTimeStart){ public String getOnlineTimeEnd(){
      this.updateTimeStart = updateTimeStart; return this.onlineTimeEnd;
      } }
      /** /**
      * 获取 结束 更新时间 * 设置 结束 最近上线时间
      * @return updateTimeEnd * @param onlineTimeEnd
      */ */
      public String getUpdateTimeEnd(){ public void setOnlineTimeEnd(String onlineTimeEnd){
      return this.updateTimeEnd; this.onlineTimeEnd = onlineTimeEnd;
      } }
      /** /**
      * 设置 结束 更新时间 * 获取 开始 最近离线时间
      * @param updateTimeEnd * @return offlineTimeStart
      */ */
      public void setUpdateTimeEnd(String updateTimeEnd){ public String getOfflineTimeStart(){
      this.updateTimeEnd = updateTimeEnd; return this.offlineTimeStart;
      } }
      /** /**
      * 获取 开始 设备生产厂商ID * 设置 开始 最近离线时间
      * @return deviceFirmIdStart * @param offlineTimeStart
      */ */
      public Long getDeviceFirmIdStart(){ public void setOfflineTimeStart(String offlineTimeStart){
      return this.deviceFirmIdStart; this.offlineTimeStart = offlineTimeStart;
      } }
      /** /**
      * 设置 开始 设备生产厂商ID * 获取 结束 最近离线时间
      * @param deviceFirmIdStart * @return offlineTimeEnd
      */ */
      public void setDeviceFirmIdStart(Long deviceFirmIdStart){ public String getOfflineTimeEnd(){
      this.deviceFirmIdStart = deviceFirmIdStart; return this.offlineTimeEnd;
      } }
      /** /**
      * 获取 结束 设备生产厂商ID * 设置 结束 最近离线时间
      * @return $deviceFirmIdEnd * @param offlineTimeEnd
      */ */
      public Long getDeviceFirmIdEnd(){ public void setOfflineTimeEnd(String offlineTimeEnd){
      return this.deviceFirmIdEnd; this.offlineTimeEnd = offlineTimeEnd;
      } }
      /** /**
      * 设置 结束 设备生产厂商ID * 获取 开始 设备来源(0.旧设备，1.新设备)
      * @param deviceFirmIdEnd * @return sourceStart
      */ */
      public void setDeviceFirmIdEnd(Long deviceFirmIdEnd){ public Integer getSourceStart(){
      this.deviceFirmIdEnd = deviceFirmIdEnd; return this.sourceStart;
      } }
      /** /**
      * 获取 增加 设备生产厂商ID * 设置 开始 设备来源(0.旧设备，1.新设备)
      * @return deviceFirmIdIncrement * @param sourceStart
      */ */
      public Long getDeviceFirmIdIncrement(){ public void setSourceStart(Integer sourceStart){
      return this.deviceFirmIdIncrement; this.sourceStart = sourceStart;
      } }
      /** /**
      * 设置 增加 设备生产厂商ID * 获取 结束 设备来源(0.旧设备，1.新设备)
      * @param deviceFirmIdIncrement * @return $sourceEnd
      */ */
      public void setDeviceFirmIdIncrement(Long deviceFirmIdIncrement){ public Integer getSourceEnd(){
      this.deviceFirmIdIncrement = deviceFirmIdIncrement; return this.sourceEnd;
      } }
      /** /**
      * 获取 设备生产厂商ID * 设置 结束 设备来源(0.旧设备，1.新设备)
      * @return deviceFirmIdList * @param sourceEnd
      */ */
      public List<Long> getDeviceFirmIdList(){ public void setSourceEnd(Integer sourceEnd){
      return this.deviceFirmIdList; this.sourceEnd = sourceEnd;
      } }
      /** /**
      * 设置 设备生产厂商ID * 获取 增加 设备来源(0.旧设备，1.新设备)
      * @param deviceFirmIdList * @return sourceIncrement
      */ */
      public void setDeviceFirmIdList(List<Long> deviceFirmIdList){ public Integer getSourceIncrement(){
      this.deviceFirmIdList = deviceFirmIdList; return this.sourceIncrement;
      } }
      /** /**
      * 获取 设备生产厂商ID * 设置 增加 设备来源(0.旧设备，1.新设备)
      * @return deviceFirmIdNotList * @param sourceIncrement
      */ */
      public List<Long> getDeviceFirmIdNotList(){ public void setSourceIncrement(Integer sourceIncrement){
      return this.deviceFirmIdNotList; this.sourceIncrement = sourceIncrement;
      } }
      /** /**
      * 设置 设备生产厂商ID * 获取 设备来源(0.旧设备，1.新设备)
      * @param deviceFirmIdNotList * @return sourceList
      */ */
      public void setDeviceFirmIdNotList(List<Long> deviceFirmIdNotList){ public List<Integer> getSourceList(){
      this.deviceFirmIdNotList = deviceFirmIdNotList; return this.sourceList;
      } }
      /**
      * 设置 设备来源(0.旧设备，1.新设备)
      * @param sourceList
      */
      public void setSourceList(List<Integer> sourceList){
      this.sourceList = sourceList;
      }
      /** /**
      * 获取 设备生产厂商名称 * 获取 设备来源(0.旧设备，1.新设备)
      * @return deviceFirmnameList * @return sourceNotList
      */ */
      public List<String> getDeviceFirmnameList(){ public List<Integer> getSourceNotList(){
      return this.deviceFirmnameList; return this.sourceNotList;
      } }
      /** /**
      * 设置 设备生产厂商名称 * 设置 设备来源(0.旧设备，1.新设备)
      * @param deviceFirmnameList * @param sourceNotList
      */ */
      public void setDeviceFirmnameList(List<String> deviceFirmnameList){ public void setSourceNotList(List<Integer> sourceNotList){
      this.deviceFirmnameList = deviceFirmnameList; this.sourceNotList = sourceNotList;
      } }
      /** /**
      * 获取 设备生产厂商名称 * 获取 开始 创建用户
      * @return deviceFirmnameNotList * @return createUserIdStart
      */ */
      public List<String> getDeviceFirmnameNotList(){ public Long getCreateUserIdStart(){
      return this.deviceFirmnameNotList; return this.createUserIdStart;
      } }
      /** /**
      * 设置 设备生产厂商名称 * 设置 开始 创建用户
      * @param deviceFirmnameNotList * @param createUserIdStart
      */ */
      public void setDeviceFirmnameNotList(List<String> deviceFirmnameNotList){ public void setCreateUserIdStart(Long createUserIdStart){
      this.deviceFirmnameNotList = deviceFirmnameNotList; this.createUserIdStart = createUserIdStart;
      } }
      /** /**
      * 获取 设备访问ip * 获取 结束 创建用户
      * @return ipList * @return $createUserIdEnd
      */ */
      public List<String> getIpList(){ public Long getCreateUserIdEnd(){
      return this.ipList; return this.createUserIdEnd;
      } }
      /** /**
      * 设置 设备访问ip * 设置 结束 创建用户
      * @param ipList * @param createUserIdEnd
      */ */
      public void setIpList(List<String> ipList){ public void setCreateUserIdEnd(Long createUserIdEnd){
      this.ipList = ipList; this.createUserIdEnd = createUserIdEnd;
      } }
      /** /**
      * 获取 设备访问ip * 获取 增加 创建用户
      * @return ipNotList * @return createUserIdIncrement
      */ */
      public List<String> getIpNotList(){ public Long getCreateUserIdIncrement(){
      return this.ipNotList; return this.createUserIdIncrement;
      } }
      /** /**
      * 设置 设备访问ip * 设置 增加 创建用户
      * @param ipNotList * @param createUserIdIncrement
      */ */
      public void setIpNotList(List<String> ipNotList){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
      this.ipNotList = ipNotList; this.createUserIdIncrement = createUserIdIncrement;
      } }
      /** /**
      * 获取 端口 * 获取 创建用户
      * @return portList * @return createUserIdList
      */ */
      public List<String> getPortList(){ public List<Long> getCreateUserIdList(){
      return this.portList; return this.createUserIdList;
      } }
      /** /**
      * 设置 端口 * 设置 创建用户
      * @param portList * @param createUserIdList
      */ */
      public void setPortList(List<String> portList){ public void setCreateUserIdList(List<Long> createUserIdList){
      this.portList = portList; this.createUserIdList = createUserIdList;
      } }
      /** /**
      * 获取 端口 * 获取 创建用户
      * @return portNotList * @return createUserIdNotList
      */ */
      public List<String> getPortNotList(){ public List<Long> getCreateUserIdNotList(){
      return this.portNotList; return this.createUserIdNotList;
      } }
      /** /**
      * 设置 端口 * 设置 创建用户
      * @param portNotList * @param createUserIdNotList
      */ */
      public void setPortNotList(List<String> portNotList){ public void setCreateUserIdNotList(List<Long> createUserIdNotList){
      this.portNotList = portNotList; this.createUserIdNotList = createUserIdNotList;
      } }
      /** /**
      * 获取 开始 启用状态 (0.停止，1.启用) * 获取 开始 创建时间
      * @return enabledStart * @return createTimeStart
      */ */
      public Integer getEnabledStart(){ public String getCreateTimeStart(){
      return this.enabledStart; return this.createTimeStart;
      } }
      /** /**
      * 设置 开始 启用状态 (0.停止，1.启用) * 设置 开始 创建时间
      * @param enabledStart * @param createTimeStart
      */ */
      public void setEnabledStart(Integer enabledStart){ public void setCreateTimeStart(String createTimeStart){
      this.enabledStart = enabledStart; this.createTimeStart = createTimeStart;
      } }
      /** /**
      * 获取 结束 启用状态 (0.停止，1.启用) * 获取 结束 创建时间
      * @return $enabledEnd * @return createTimeEnd
      */ */
      public Integer getEnabledEnd(){ public String getCreateTimeEnd(){
      return this.enabledEnd; return this.createTimeEnd;
      } }
      /** /**
      * 设置 结束 启用状态 (0.停止，1.启用) * 设置 结束 创建时间
      * @param enabledEnd * @param createTimeEnd
      */ */
      public void setEnabledEnd(Integer enabledEnd){ public void setCreateTimeEnd(String createTimeEnd){
      this.enabledEnd = enabledEnd; this.createTimeEnd = createTimeEnd;
      } }
      /** /**
      * 获取 增加 启用状态 (0.停止，1.启用) * 获取 开始 更新用户
      * @return enabledIncrement * @return updateUserIdStart
      */ */
      public Integer getEnabledIncrement(){ public Long getUpdateUserIdStart(){
      return this.enabledIncrement; return this.updateUserIdStart;
      } }
      /** /**
      * 设置 增加 启用状态 (0.停止，1.启用) * 设置 开始 更新用户
      * @param enabledIncrement * @param updateUserIdStart
      */ */
      public void setEnabledIncrement(Integer enabledIncrement){ public void setUpdateUserIdStart(Long updateUserIdStart){
      this.enabledIncrement = enabledIncrement; this.updateUserIdStart = updateUserIdStart;
      } }
      /** /**
      * 获取 启用状态 (0.停止，1.启用) * 获取 结束 更新用户
      * @return enabledList * @return $updateUserIdEnd
      */ */
      public List<Integer> getEnabledList(){ public Long getUpdateUserIdEnd(){
      return this.enabledList; return this.updateUserIdEnd;
      } }
      /** /**
      * 设置 启用状态 (0.停止，1.启用) * 设置 结束 更新用户
      * @param enabledList * @param updateUserIdEnd
      */ */
      public void setEnabledList(List<Integer> enabledList){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
      this.enabledList = enabledList; this.updateUserIdEnd = updateUserIdEnd;
      } }
      /** /**
      * 获取 启用状态 (0.停止，1.启用) * 获取 增加 更新用户
      * @return enabledNotList * @return updateUserIdIncrement
      */ */
      public List<Integer> getEnabledNotList(){ public Long getUpdateUserIdIncrement(){
      return this.enabledNotList; return this.updateUserIdIncrement;
      } }
      /** /**
      * 设置 启用状态 (0.停止，1.启用) * 设置 增加 更新用户
      * @param enabledNotList * @param updateUserIdIncrement
      */ */
      public void setEnabledNotList(List<Integer> enabledNotList){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
      this.enabledNotList = enabledNotList; this.updateUserIdIncrement = updateUserIdIncrement;
      } }
      /** /**
      * 获取 开始 最近上线时间 * 获取 更新用户
      * @return onlineTimeStart * @return updateUserIdList
      */ */
      public String getOnlineTimeStart(){ public List<Long> getUpdateUserIdList(){
      return this.onlineTimeStart; return this.updateUserIdList;
      } }
      /** /**
      * 设置 开始 最近上线时间 * 设置 更新用户
      * @param onlineTimeStart * @param updateUserIdList
      */ */
      public void setOnlineTimeStart(String onlineTimeStart){ public void setUpdateUserIdList(List<Long> updateUserIdList){
      this.onlineTimeStart = onlineTimeStart; this.updateUserIdList = updateUserIdList;
      } }
      /** /**
      * 获取 结束 最近上线时间 * 获取 更新用户
      * @return onlineTimeEnd * @return updateUserIdNotList
      */ */
      public String getOnlineTimeEnd(){ public List<Long> getUpdateUserIdNotList(){
      return this.onlineTimeEnd; return this.updateUserIdNotList;
      } }
      /** /**
      * 设置 结束 最近上线时间 * 设置 更新用户
      * @param onlineTimeEnd * @param updateUserIdNotList
      */ */
      public void setOnlineTimeEnd(String onlineTimeEnd){ public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
      this.onlineTimeEnd = onlineTimeEnd; this.updateUserIdNotList = updateUserIdNotList;
      } }
      /** /**
      * 获取 开始 最近离线时间 * 获取 开始 更新时间
      * @return offlineTimeStart * @return updateTimeStart
      */ */
      public String getOfflineTimeStart(){ public String getUpdateTimeStart(){
      return this.offlineTimeStart; return this.updateTimeStart;
      } }
      /** /**
      * 设置 开始 最近离线时间 * 设置 开始 更新时间
      * @param offlineTimeStart * @param updateTimeStart
      */ */
      public void setOfflineTimeStart(String offlineTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
      this.offlineTimeStart = offlineTimeStart; this.updateTimeStart = updateTimeStart;
      } }
      /** /**
      * 获取 结束 最近离线时间 * 获取 结束 更新时间
      * @return offlineTimeEnd * @return updateTimeEnd
      */ */
      public String getOfflineTimeEnd(){ public String getUpdateTimeEnd(){
      return this.offlineTimeEnd; return this.updateTimeEnd;
      } }
      /** /**
      * 设置 结束 最近离线时间 * 设置 结束 更新时间
      * @param offlineTimeEnd * @param updateTimeEnd
      */ */
      public void setOfflineTimeEnd(String offlineTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
      this.offlineTimeEnd = offlineTimeEnd; this.updateTimeEnd = updateTimeEnd;
      } }
      /** /**
      ...@@ -1923,22 +2152,187 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1923,22 +2152,187 @@ public class DeviceQuery extends DeviceEntity {
      return this; return this;
      } }
      /**
      * 设置 站点名称
      * @param siteName
      */
      public DeviceQuery siteName(String siteName){
      setSiteName(siteName);
      return this;
      }
      /**
      * 设置 站点名称
      * @param siteNameList
      */
      public DeviceQuery siteNameList(List<String> siteNameList){
      this.siteNameList = siteNameList;
      return this;
      }
      /**
      * 设置 设备生产厂商ID
      * @param deviceFirmId
      */
      public DeviceQuery deviceFirmId(Long deviceFirmId){
      setDeviceFirmId(deviceFirmId);
      return this;
      }
      /**
      * 设置 开始 设备生产厂商ID
      * @param deviceFirmIdStart
      */
      public DeviceQuery deviceFirmIdStart(Long deviceFirmIdStart){
      this.deviceFirmIdStart = deviceFirmIdStart;
      return this;
      }
      /**
      * 设置 结束 设备生产厂商ID
      * @param deviceFirmIdEnd
      */
      public DeviceQuery deviceFirmIdEnd(Long deviceFirmIdEnd){
      this.deviceFirmIdEnd = deviceFirmIdEnd;
      return this;
      }
      /**
      * 设置 增加 设备生产厂商ID
      * @param deviceFirmIdIncrement
      */
      public DeviceQuery deviceFirmIdIncrement(Long deviceFirmIdIncrement){
      this.deviceFirmIdIncrement = deviceFirmIdIncrement;
      return this;
      }
      /**
      * 设置 设备生产厂商ID
      * @param deviceFirmIdList
      */
      public DeviceQuery deviceFirmIdList(List<Long> deviceFirmIdList){
      this.deviceFirmIdList = deviceFirmIdList;
      return this;
      }
      /**
      * 设置 设备生产厂商ID
      * @param deviceFirmIdNotList
      */
      public DeviceQuery deviceFirmIdNotList(List<Long> deviceFirmIdNotList){
      this.deviceFirmIdNotList = deviceFirmIdNotList;
      return this;
      }
      /**
      * 设置 设备生产厂商名称
      * @param deviceFirmname
      */
      public DeviceQuery deviceFirmname(String deviceFirmname){
      setDeviceFirmname(deviceFirmname);
      return this;
      }
      /**
      * 设置 设备生产厂商名称
      * @param deviceFirmnameList
      */
      public DeviceQuery deviceFirmnameList(List<String> deviceFirmnameList){
      this.deviceFirmnameList = deviceFirmnameList;
      return this;
      }
      /**
      * 设置 设备访问ip
      * @param ip
      */
      public DeviceQuery ip(String ip){
      setIp(ip);
      return this;
      }
      /**
      * 设置 设备访问ip
      * @param ipList
      */
      public DeviceQuery ipList(List<String> ipList){
      this.ipList = ipList;
      return this;
      }
      /**
      * 设置 端口
      * @param port
      */
      public DeviceQuery port(String port){
      setPort(port);
      return this;
      }
      /**
      * 设置 端口
      * @param portList
      */
      public DeviceQuery portList(List<String> portList){
      this.portList = portList;
      return this;
      }
      /**
      * 设置 启用状态 (0.停止，1.启用)
      * @param enabled
      */
      public DeviceQuery enabled(Integer enabled){
      setEnabled(enabled);
      return this;
      }
      /**
      * 设置 开始 启用状态 (0.停止，1.启用)
      * @param enabledStart
      */
      public DeviceQuery enabledStart(Integer enabledStart){
      this.enabledStart = enabledStart;
      return this;
      }
      /**
      * 设置 结束 启用状态 (0.停止，1.启用)
      * @param enabledEnd
      */
      public DeviceQuery enabledEnd(Integer enabledEnd){
      this.enabledEnd = enabledEnd;
      return this;
      }
      /**
      * 设置 增加 启用状态 (0.停止，1.启用)
      * @param enabledIncrement
      */
      public DeviceQuery enabledIncrement(Integer enabledIncrement){
      this.enabledIncrement = enabledIncrement;
      return this;
      }
      /** /**
      * 设置 站点名称 * 设置 启用状态 (0.停止，1.启用)
      * @param siteName * @param enabledList
      */ */
      public DeviceQuery siteName(String siteName){ public DeviceQuery enabledList(List<Integer> enabledList){
      setSiteName(siteName); this.enabledList = enabledList;
      return this; return this;
      } }
      /** /**
      * 设置 站点名称 * 设置 启用状态 (0.停止，1.启用)
      * @param siteNameList * @param enabledNotList
      */ */
      public DeviceQuery siteNameList(List<String> siteNameList){ public DeviceQuery enabledNotList(List<Integer> enabledNotList){
      this.siteNameList = siteNameList; this.enabledNotList = enabledNotList;
      return this; return this;
      } }
      ...@@ -2183,337 +2577,299 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2183,337 +2577,299 @@ public class DeviceQuery extends DeviceEntity {
      return this; return this;
      } }
      /**
      * 设置 设备来源(0.旧设备，1.新设备)
      * @param source
      */
      public DeviceQuery source(Integer source){
      setSource(source);
      return this;
      }
      /** /**
      * 设置 开始 设备来源(0.旧设备，1.新设备) * 设置 所属机构
      * @param sourceStart * @param belong
      */ */
      public DeviceQuery sourceStart(Integer sourceStart){ public DeviceQuery belong(String belong){
      this.sourceStart = sourceStart; setBelong(belong);
      return this; return this;
      } }
      /** /**
      * 设置 结束 设备来源(0.旧设备，1.新设备) * 设置 所属机构
      * @param sourceEnd * @param belongList
      */ */
      public DeviceQuery sourceEnd(Integer sourceEnd){ public DeviceQuery belongList(List<String> belongList){
      this.sourceEnd = sourceEnd; this.belongList = belongList;
      return this; return this;
      } }
      /** /**
      * 设置 增加 设备来源(0.旧设备，1.新设备) * 设置 所属楼栋
      * @param sourceIncrement * @param deviceInBuilding
      */ */
      public DeviceQuery sourceIncrement(Integer sourceIncrement){ public DeviceQuery deviceInBuilding(Integer deviceInBuilding){
      this.sourceIncrement = sourceIncrement; setDeviceInBuilding(deviceInBuilding);
      return this; return this;
      } }
      /** /**
      * 设置 设备来源(0.旧设备，1.新设备) * 设置 开始 所属楼栋
      * @param sourceList * @param deviceInBuildingStart
      */ */
      public DeviceQuery sourceList(List<Integer> sourceList){ public DeviceQuery deviceInBuildingStart(Integer deviceInBuildingStart){
      this.sourceList = sourceList; this.deviceInBuildingStart = deviceInBuildingStart;
      return this; return this;
      } }
      /** /**
      * 设置 设备来源(0.旧设备，1.新设备) * 设置 结束 所属楼栋
      * @param sourceNotList * @param deviceInBuildingEnd
      */ */
      public DeviceQuery sourceNotList(List<Integer> sourceNotList){ public DeviceQuery deviceInBuildingEnd(Integer deviceInBuildingEnd){
      this.sourceNotList = sourceNotList; this.deviceInBuildingEnd = deviceInBuildingEnd;
      return this; return this;
      } }
      /** /**
      * 设置 创建用户 * 设置 增加 所属楼栋
      * @param createUserId * @param deviceInBuildingIncrement
      */ */
      public DeviceQuery createUserId(Long createUserId){ public DeviceQuery deviceInBuildingIncrement(Integer deviceInBuildingIncrement){
      setCreateUserId(createUserId); this.deviceInBuildingIncrement = deviceInBuildingIncrement;
      return this; return this;
      } }
      /** /**
      * 设置 开始 创建用户 * 设置 所属楼栋
      * @param createUserIdStart * @param deviceInBuildingList
      */ */
      public DeviceQuery createUserIdStart(Long createUserIdStart){ public DeviceQuery deviceInBuildingList(List<Integer> deviceInBuildingList){
      this.createUserIdStart = createUserIdStart; this.deviceInBuildingList = deviceInBuildingList;
      return this; return this;
      } }
      /** /**
      * 设置 结束 创建用户 * 设置 所属楼栋
      * @param createUserIdEnd * @param deviceInBuildingNotList
      */ */
      public DeviceQuery createUserIdEnd(Long createUserIdEnd){ public DeviceQuery deviceInBuildingNotList(List<Integer> deviceInBuildingNotList){
      this.createUserIdEnd = createUserIdEnd; this.deviceInBuildingNotList = deviceInBuildingNotList;
      return this; return this;
      } }
      /** /**
      * 设置 增加 创建用户 * 设置 所属楼层
      * @param createUserIdIncrement * @param deviceInFloor
      */ */
      public DeviceQuery createUserIdIncrement(Long createUserIdIncrement){ public DeviceQuery deviceInFloor(Integer deviceInFloor){
      this.createUserIdIncrement = createUserIdIncrement; setDeviceInFloor(deviceInFloor);
      return this; return this;
      } }
      /** /**
      * 设置 创建用户 * 设置 开始 所属楼层
      * @param createUserIdList * @param deviceInFloorStart
      */ */
      public DeviceQuery createUserIdList(List<Long> createUserIdList){ public DeviceQuery deviceInFloorStart(Integer deviceInFloorStart){
      this.createUserIdList = createUserIdList; this.deviceInFloorStart = deviceInFloorStart;
      return this; return this;
      } }
      /** /**
      * 设置 创建用户 * 设置 结束 所属楼层
      * @param createUserIdNotList * @param deviceInFloorEnd
      */ */
      public DeviceQuery createUserIdNotList(List<Long> createUserIdNotList){ public DeviceQuery deviceInFloorEnd(Integer deviceInFloorEnd){
      this.createUserIdNotList = createUserIdNotList; this.deviceInFloorEnd = deviceInFloorEnd;
      return this; return this;
      } }
      /** /**
      * 设置 更新用户 * 设置 增加 所属楼层
      * @param updateUserId * @param deviceInFloorIncrement
      */ */
      public DeviceQuery updateUserId(Long updateUserId){ public DeviceQuery deviceInFloorIncrement(Integer deviceInFloorIncrement){
      setUpdateUserId(updateUserId); this.deviceInFloorIncrement = deviceInFloorIncrement;
      return this; return this;
      } }
      /** /**
      * 设置 开始 更新用户 * 设置 所属楼层
      * @param updateUserIdStart * @param deviceInFloorList
      */ */
      public DeviceQuery updateUserIdStart(Long updateUserIdStart){ public DeviceQuery deviceInFloorList(List<Integer> deviceInFloorList){
      this.updateUserIdStart = updateUserIdStart; this.deviceInFloorList = deviceInFloorList;
      return this; return this;
      } }
      /** /**
      * 设置 结束 更新用户 * 设置 所属楼层
      * @param updateUserIdEnd * @param deviceInFloorNotList
      */ */
      public DeviceQuery updateUserIdEnd(Long updateUserIdEnd){ public DeviceQuery deviceInFloorNotList(List<Integer> deviceInFloorNotList){
      this.updateUserIdEnd = updateUserIdEnd; this.deviceInFloorNotList = deviceInFloorNotList;
      return this; return this;
      } }
      /**
      * 设置 增加 更新用户
      * @param updateUserIdIncrement
      */
      public DeviceQuery updateUserIdIncrement(Long updateUserIdIncrement){
      this.updateUserIdIncrement = updateUserIdIncrement;
      return this;
      }
      /**
      * 设置 更新用户
      * @param updateUserIdList
      */
      public DeviceQuery updateUserIdList(List<Long> updateUserIdList){
      this.updateUserIdList = updateUserIdList;
      return this;
      }
      /** /**
      * 设置 更新用户 * 设置 设备来源(0.旧设备，1.新设备)
      * @param updateUserIdNotList * @param source
      */ */
      public DeviceQuery updateUserIdNotList(List<Long> updateUserIdNotList){ public DeviceQuery source(Integer source){
      this.updateUserIdNotList = updateUserIdNotList; setSource(source);
      return this; return this;
      } }
      /** /**
      * 设置 设备生产厂商ID * 设置 开始 设备来源(0.旧设备，1.新设备)
      * @param deviceFirmId * @param sourceStart
      */ */
      public DeviceQuery deviceFirmId(Long deviceFirmId){ public DeviceQuery sourceStart(Integer sourceStart){
      setDeviceFirmId(deviceFirmId); this.sourceStart = sourceStart;
      return this; return this;
      } }
      /** /**
      * 设置 开始 设备生产厂商ID * 设置 结束 设备来源(0.旧设备，1.新设备)
      * @param deviceFirmIdStart * @param sourceEnd
      */ */
      public DeviceQuery deviceFirmIdStart(Long deviceFirmIdStart){ public DeviceQuery sourceEnd(Integer sourceEnd){
      this.deviceFirmIdStart = deviceFirmIdStart; this.sourceEnd = sourceEnd;
      return this; return this;
      } }
      /** /**
      * 设置 结束 设备生产厂商ID * 设置 增加 设备来源(0.旧设备，1.新设备)
      * @param deviceFirmIdEnd * @param sourceIncrement
      */ */
      public DeviceQuery deviceFirmIdEnd(Long deviceFirmIdEnd){ public DeviceQuery sourceIncrement(Integer sourceIncrement){
      this.deviceFirmIdEnd = deviceFirmIdEnd; this.sourceIncrement = sourceIncrement;
      return this; return this;
      } }
      /** /**
      * 设置 增加 设备生产厂商ID * 设置 设备来源(0.旧设备，1.新设备)
      * @param deviceFirmIdIncrement * @param sourceList
      */ */
      public DeviceQuery deviceFirmIdIncrement(Long deviceFirmIdIncrement){ public DeviceQuery sourceList(List<Integer> sourceList){
      this.deviceFirmIdIncrement = deviceFirmIdIncrement; this.sourceList = sourceList;
      return this; return this;
      } }
      /** /**
      * 设置 设备生产厂商ID * 设置 设备来源(0.旧设备，1.新设备)
      * @param deviceFirmIdList * @param sourceNotList
      */ */
      public DeviceQuery deviceFirmIdList(List<Long> deviceFirmIdList){ public DeviceQuery sourceNotList(List<Integer> sourceNotList){
      this.deviceFirmIdList = deviceFirmIdList; this.sourceNotList = sourceNotList;
      return this; return this;
      } }
      /** /**
      * 设置 设备生产厂商ID * 设置 创建用户
      * @param deviceFirmIdNotList * @param createUserId
      */ */
      public DeviceQuery deviceFirmIdNotList(List<Long> deviceFirmIdNotList){ public DeviceQuery createUserId(Long createUserId){
      this.deviceFirmIdNotList = deviceFirmIdNotList; setCreateUserId(createUserId);
      return this; return this;
      } }
      /** /**
      * 设置 设备生产厂商名称 * 设置 开始 创建用户
      * @param deviceFirmname * @param createUserIdStart
      */ */
      public DeviceQuery deviceFirmname(String deviceFirmname){ public DeviceQuery createUserIdStart(Long createUserIdStart){
      setDeviceFirmname(deviceFirmname); this.createUserIdStart = createUserIdStart;
      return this; return this;
      } }
      /** /**
      * 设置 设备生产厂商名称 * 设置 结束 创建用户
      * @param deviceFirmnameList * @param createUserIdEnd
      */ */
      public DeviceQuery deviceFirmnameList(List<String> deviceFirmnameList){ public DeviceQuery createUserIdEnd(Long createUserIdEnd){
      this.deviceFirmnameList = deviceFirmnameList; this.createUserIdEnd = createUserIdEnd;
      return this; return this;
      } }
      /** /**
      * 设置 设备访问ip * 设置 增加 创建用户
      * @param ip * @param createUserIdIncrement
      */ */
      public DeviceQuery ip(String ip){ public DeviceQuery createUserIdIncrement(Long createUserIdIncrement){
      setIp(ip); this.createUserIdIncrement = createUserIdIncrement;
      return this; return this;
      } }
      /** /**
      * 设置 设备访问ip * 设置 创建用户
      * @param ipList * @param createUserIdList
      */ */
      public DeviceQuery ipList(List<String> ipList){ public DeviceQuery createUserIdList(List<Long> createUserIdList){
      this.ipList = ipList; this.createUserIdList = createUserIdList;
      return this; return this;
      } }
      /** /**
      * 设置 端口 * 设置 创建用户
      * @param port * @param createUserIdNotList
      */ */
      public DeviceQuery port(String port){ public DeviceQuery createUserIdNotList(List<Long> createUserIdNotList){
      setPort(port); this.createUserIdNotList = createUserIdNotList;
      return this; return this;
      } }
      /**
      * 设置 端口
      * @param portList
      */
      public DeviceQuery portList(List<String> portList){
      this.portList = portList;
      return this;
      }
      /** /**
      * 设置 启用状态 (0.停止，1.启用) * 设置 更新用户
      * @param enabled * @param updateUserId
      */ */
      public DeviceQuery enabled(Integer enabled){ public DeviceQuery updateUserId(Long updateUserId){
      setEnabled(enabled); setUpdateUserId(updateUserId);
      return this; return this;
      } }
      /** /**
      * 设置 开始 启用状态 (0.停止，1.启用) * 设置 开始 更新用户
      * @param enabledStart * @param updateUserIdStart
      */ */
      public DeviceQuery enabledStart(Integer enabledStart){ public DeviceQuery updateUserIdStart(Long updateUserIdStart){
      this.enabledStart = enabledStart; this.updateUserIdStart = updateUserIdStart;
      return this; return this;
      } }
      /** /**
      * 设置 结束 启用状态 (0.停止，1.启用) * 设置 结束 更新用户
      * @param enabledEnd * @param updateUserIdEnd
      */ */
      public DeviceQuery enabledEnd(Integer enabledEnd){ public DeviceQuery updateUserIdEnd(Long updateUserIdEnd){
      this.enabledEnd = enabledEnd; this.updateUserIdEnd = updateUserIdEnd;
      return this; return this;
      } }
      /** /**
      * 设置 增加 启用状态 (0.停止，1.启用) * 设置 增加 更新用户
      * @param enabledIncrement * @param updateUserIdIncrement
      */ */
      public DeviceQuery enabledIncrement(Integer enabledIncrement){ public DeviceQuery updateUserIdIncrement(Long updateUserIdIncrement){
      this.enabledIncrement = enabledIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
      return this; return this;
      } }
      /** /**
      * 设置 启用状态 (0.停止，1.启用) * 设置 更新用户
      * @param enabledList * @param updateUserIdList
      */ */
      public DeviceQuery enabledList(List<Integer> enabledList){ public DeviceQuery updateUserIdList(List<Long> updateUserIdList){
      this.enabledList = enabledList; this.updateUserIdList = updateUserIdList;
      return this; return this;
      } }
      /** /**
      * 设置 启用状态 (0.停止，1.启用) * 设置 更新用户
      * @param enabledNotList * @param updateUserIdNotList
      */ */
      public DeviceQuery enabledNotList(List<Integer> enabledNotList){ public DeviceQuery updateUserIdNotList(List<Long> updateUserIdNotList){
      this.enabledNotList = enabledNotList; this.updateUserIdNotList = updateUserIdNotList;
      return this; return this;
      } }
      /** /**
      * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
      * @return orConditionList * @return orConditionList
      ......
      fill-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml
      View file @ 090cf87b
      ...@@ -13,6 +13,11 @@ ...@@ -13,6 +13,11 @@
      <result property="siteId" column="siteId" /> <result property="siteId" column="siteId" />
      <result property="siteCode" column="siteCode" /> <result property="siteCode" column="siteCode" />
      <result property="siteName" column="siteName" /> <result property="siteName" column="siteName" />
      <result property="deviceFirmId" column="deviceFirmId" />
      <result property="deviceFirmname" column="deviceFirmname" />
      <result property="ip" column="ip" />
      <result property="port" column="port" />
      <result property="enabled" column="enabled" />
      <result property="productCode" column="productCode" /> <result property="productCode" column="productCode" />
      <result property="productName" column="productName" /> <result property="productName" column="productName" />
      <result property="deviceSrc" column="deviceSrc" /> <result property="deviceSrc" column="deviceSrc" />
      ...@@ -22,18 +27,16 @@ ...@@ -22,18 +27,16 @@
      <result property="leadingOfficialTelephone" column="leadingOfficialTelephone" /> <result property="leadingOfficialTelephone" column="leadingOfficialTelephone" />
      <result property="deviceStatus" column="deviceStatus" /> <result property="deviceStatus" column="deviceStatus" />
      <result property="deviceRemark" column="deviceRemark" /> <result property="deviceRemark" column="deviceRemark" />
      <result property="belong" column="belong" />
      <result property="deviceInBuilding" column="deviceInBuilding" />
      <result property="deviceInFloor" column="deviceInFloor" />
      <result property="onlineTime" column="onlineTime" />
      <result property="offlineTime" column="offlineTime" />
      <result property="source" column="source" /> <result property="source" column="source" />
      <result property="createUserId" column="createUserId" /> <result property="createUserId" column="createUserId" />
      <result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
      <result property="updateUserId" column="updateUserId" /> <result property="updateUserId" column="updateUserId" />
      <result property="updateTime" column="updateTime" /> <result property="updateTime" column="updateTime" />
      <result property="deviceFirmId" column="deviceFirmId" />
      <result property="deviceFirmname" column="deviceFirmname" />
      <result property="ip" column="ip" />
      <result property="port" column="port" />
      <result property="enabled" column="enabled" />
      <result property="onlineTime" column="onlineTime" />
      <result property="offlineTime" column="offlineTime" />
      </resultMap> </resultMap>
      ...@@ -65,6 +68,21 @@ ...@@ -65,6 +68,21 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteName') or colPickMode == 1 and data.containsKey('siteName')))">
      a.siteName, a.siteName,
      </if> </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmId') or colPickMode == 1 and data.containsKey('deviceFirmId')))">
      a.deviceFirmId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmname') or colPickMode == 1 and data.containsKey('deviceFirmname')))">
      a.deviceFirmname,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ip') or colPickMode == 1 and data.containsKey('ip')))">
      a.ip,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('port') or colPickMode == 1 and data.containsKey('port')))">
      a.port,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enabled') or colPickMode == 1 and data.containsKey('enabled')))">
      a.enabled,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productCode') or colPickMode == 1 and data.containsKey('productCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productCode') or colPickMode == 1 and data.containsKey('productCode')))">
      a.productCode, a.productCode,
      </if> </if>
      ...@@ -92,6 +110,21 @@ ...@@ -92,6 +110,21 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceRemark') or colPickMode == 1 and data.containsKey('deviceRemark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceRemark') or colPickMode == 1 and data.containsKey('deviceRemark')))">
      a.deviceRemark, a.deviceRemark,
      </if> </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('belong') or colPickMode == 1 and data.containsKey('belong')))">
      a.belong,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceInBuilding') or colPickMode == 1 and data.containsKey('deviceInBuilding')))">
      a.deviceInBuilding,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceInFloor') or colPickMode == 1 and data.containsKey('deviceInFloor')))">
      a.deviceInFloor,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onlineTime') or colPickMode == 1 and data.containsKey('onlineTime')))">
      a.onlineTime,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('offlineTime') or colPickMode == 1 and data.containsKey('offlineTime')))">
      a.offlineTime,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('source') or colPickMode == 1 and data.containsKey('source')))">
      a.source, a.source,
      </if> </if>
      ...@@ -107,44 +140,23 @@ ...@@ -107,44 +140,23 @@
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
      a.updateTime, a.updateTime,
      </if> </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmId') or colPickMode == 1 and data.containsKey('deviceFirmId')))">
      a.deviceFirmId,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmname') or colPickMode == 1 and data.containsKey('deviceFirmname')))">
      a.deviceFirmname,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ip') or colPickMode == 1 and data.containsKey('ip')))">
      a.ip,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('port') or colPickMode == 1 and data.containsKey('port')))">
      a.port,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('enabled') or colPickMode == 1 and data.containsKey('enabled')))">
      a.enabled,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onlineTime') or colPickMode == 1 and data.containsKey('onlineTime')))">
      a.onlineTime,
      </if>
      <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('offlineTime') or colPickMode == 1 and data.containsKey('offlineTime')))">
      a.offlineTime,
      </if>
      </trim> </trim>
      </sql> </sql>
      <!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
      <insert id="insert" parameterType="DeviceEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeviceEntity" useGeneratedKeys="true" keyProperty="id">
      insert into mortals_xhx_device insert into mortals_xhx_device
      (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,source,createUserId,createTime,updateUserId,updateTime,deviceFirmId,deviceFirmname,ip,port,enabled,onlineTime,offlineTime) (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,deviceFirmId,deviceFirmname,ip,port,enabled,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,belong,deviceInBuilding,deviceInFloor,onlineTime,offlineTime,source,createUserId,createTime,updateUserId,updateTime)
      VALUES VALUES
      (#{deviceId},#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{productCode},#{productName},#{deviceSrc},#{lon},#{lati},#{leadingOfficial},#{leadingOfficialTelephone},#{deviceStatus},#{deviceRemark},#{source},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceFirmId},#{deviceFirmname},#{ip},#{port},#{enabled},#{onlineTime},#{offlineTime}) (#{deviceId},#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{deviceFirmId},#{deviceFirmname},#{ip},#{port},#{enabled},#{productCode},#{productName},#{deviceSrc},#{lon},#{lati},#{leadingOfficial},#{leadingOfficialTelephone},#{deviceStatus},#{deviceRemark},#{belong},#{deviceInBuilding},#{deviceInFloor},#{onlineTime},#{offlineTime},#{source},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
      </insert> </insert>
      <!-- 批量新增 --> <!-- 批量新增 -->
      <insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
      insert into mortals_xhx_device insert into mortals_xhx_device
      (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,source,createUserId,createTime,updateUserId,updateTime,deviceFirmId,deviceFirmname,ip,port,enabled,onlineTime,offlineTime) (deviceId,deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,deviceFirmId,deviceFirmname,ip,port,enabled,productCode,productName,deviceSrc,lon,lati,leadingOfficial,leadingOfficialTelephone,deviceStatus,deviceRemark,belong,deviceInBuilding,deviceInFloor,onlineTime,offlineTime,source,createUserId,createTime,updateUserId,updateTime)
      VALUES VALUES
      <foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
      (#{item.deviceId},#{item.deviceName},#{item.deviceCode},#{item.deviceMac},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.productCode},#{item.productName},#{item.deviceSrc},#{item.lon},#{item.lati},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.deviceStatus},#{item.deviceRemark},#{item.source},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceFirmId},#{item.deviceFirmname},#{item.ip},#{item.port},#{item.enabled},#{item.onlineTime},#{item.offlineTime}) (#{item.deviceId},#{item.deviceName},#{item.deviceCode},#{item.deviceMac},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.deviceFirmId},#{item.deviceFirmname},#{item.ip},#{item.port},#{item.enabled},#{item.productCode},#{item.productName},#{item.deviceSrc},#{item.lon},#{item.lati},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.deviceStatus},#{item.deviceRemark},#{item.belong},#{item.deviceInBuilding},#{item.deviceInFloor},#{item.onlineTime},#{item.offlineTime},#{item.source},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
      </foreach> </foreach>
      </insert> </insert>
      ...@@ -181,6 +193,27 @@ ...@@ -181,6 +193,27 @@
      <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))"> <if test="(colPickMode==0 and data.containsKey('siteName')) or (colPickMode==1 and !data.containsKey('siteName'))">
      a.siteName=#{data.siteName}, a.siteName=#{data.siteName},
      </if> </if>
      <if test="(colPickMode==0 and data.containsKey('deviceFirmId')) or (colPickMode==1 and !data.containsKey('deviceFirmId'))">
      a.deviceFirmId=#{data.deviceFirmId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceFirmIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceFirmIdIncrement'))">
      a.deviceFirmId=ifnull(a.deviceFirmId,0) + #{data.deviceFirmIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceFirmname')) or (colPickMode==1 and !data.containsKey('deviceFirmname'))">
      a.deviceFirmname=#{data.deviceFirmname},
      </if>
      <if test="(colPickMode==0 and data.containsKey('ip')) or (colPickMode==1 and !data.containsKey('ip'))">
      a.ip=#{data.ip},
      </if>
      <if test="(colPickMode==0 and data.containsKey('port')) or (colPickMode==1 and !data.containsKey('port'))">
      a.port=#{data.port},
      </if>
      <if test="(colPickMode==0 and data.containsKey('enabled')) or (colPickMode==1 and !data.containsKey('enabled'))">
      a.enabled=#{data.enabled},
      </if>
      <if test="(colPickMode==0 and data.containsKey('enabledIncrement')) or (colPickMode==1 and !data.containsKey('enabledIncrement'))">
      a.enabled=ifnull(a.enabled,0) + #{data.enabledIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('productCode')) or (colPickMode==1 and !data.containsKey('productCode'))"> <if test="(colPickMode==0 and data.containsKey('productCode')) or (colPickMode==1 and !data.containsKey('productCode'))">
      a.productCode=#{data.productCode}, a.productCode=#{data.productCode},
      </if> </if>
      ...@@ -214,6 +247,27 @@ ...@@ -214,6 +247,27 @@
      <if test="(colPickMode==0 and data.containsKey('deviceRemark')) or (colPickMode==1 and !data.containsKey('deviceRemark'))"> <if test="(colPickMode==0 and data.containsKey('deviceRemark')) or (colPickMode==1 and !data.containsKey('deviceRemark'))">
      a.deviceRemark=#{data.deviceRemark}, a.deviceRemark=#{data.deviceRemark},
      </if> </if>
      <if test="(colPickMode==0 and data.containsKey('belong')) or (colPickMode==1 and !data.containsKey('belong'))">
      a.belong=#{data.belong},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceInBuilding')) or (colPickMode==1 and !data.containsKey('deviceInBuilding'))">
      a.deviceInBuilding=#{data.deviceInBuilding},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceInBuildingIncrement')) or (colPickMode==1 and !data.containsKey('deviceInBuildingIncrement'))">
      a.deviceInBuilding=ifnull(a.deviceInBuilding,0) + #{data.deviceInBuildingIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceInFloor')) or (colPickMode==1 and !data.containsKey('deviceInFloor'))">
      a.deviceInFloor=#{data.deviceInFloor},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceInFloorIncrement')) or (colPickMode==1 and !data.containsKey('deviceInFloorIncrement'))">
      a.deviceInFloor=ifnull(a.deviceInFloor,0) + #{data.deviceInFloorIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('onlineTime')) or (colPickMode==1 and !data.containsKey('onlineTime'))">
      a.onlineTime=#{data.onlineTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('offlineTime')) or (colPickMode==1 and !data.containsKey('offlineTime'))">
      a.offlineTime=#{data.offlineTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))"> <if test="(colPickMode==0 and data.containsKey('source')) or (colPickMode==1 and !data.containsKey('source'))">
      a.source=#{data.source}, a.source=#{data.source},
      </if> </if>
      ...@@ -238,33 +292,6 @@ ...@@ -238,33 +292,6 @@
      <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))"> <if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
      a.updateTime=#{data.updateTime}, a.updateTime=#{data.updateTime},
      </if> </if>
      <if test="(colPickMode==0 and data.containsKey('deviceFirmId')) or (colPickMode==1 and !data.containsKey('deviceFirmId'))">
      a.deviceFirmId=#{data.deviceFirmId},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceFirmIdIncrement')) or (colPickMode==1 and !data.containsKey('deviceFirmIdIncrement'))">
      a.deviceFirmId=ifnull(a.deviceFirmId,0) + #{data.deviceFirmIdIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('deviceFirmname')) or (colPickMode==1 and !data.containsKey('deviceFirmname'))">
      a.deviceFirmname=#{data.deviceFirmname},
      </if>
      <if test="(colPickMode==0 and data.containsKey('ip')) or (colPickMode==1 and !data.containsKey('ip'))">
      a.ip=#{data.ip},
      </if>
      <if test="(colPickMode==0 and data.containsKey('port')) or (colPickMode==1 and !data.containsKey('port'))">
      a.port=#{data.port},
      </if>
      <if test="(colPickMode==0 and data.containsKey('enabled')) or (colPickMode==1 and !data.containsKey('enabled'))">
      a.enabled=#{data.enabled},
      </if>
      <if test="(colPickMode==0 and data.containsKey('enabledIncrement')) or (colPickMode==1 and !data.containsKey('enabledIncrement'))">
      a.enabled=ifnull(a.enabled,0) + #{data.enabledIncrement},
      </if>
      <if test="(colPickMode==0 and data.containsKey('onlineTime')) or (colPickMode==1 and !data.containsKey('onlineTime'))">
      a.onlineTime=#{data.onlineTime},
      </if>
      <if test="(colPickMode==0 and data.containsKey('offlineTime')) or (colPickMode==1 and !data.containsKey('offlineTime'))">
      a.offlineTime=#{data.offlineTime},
      </if>
      </trim> </trim>
      <trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
      where where
      ...@@ -336,6 +363,51 @@ ...@@ -336,6 +363,51 @@
      </if> </if>
      </foreach> </foreach>
      </trim> </trim>
      <trim prefix="deviceFirmId=(case" suffix="ELSE deviceFirmId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('deviceFirmId')) or (colPickMode==1 and !item.containsKey('deviceFirmId'))">
      when a.id=#{item.id} then #{item.deviceFirmId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('deviceFirmIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceFirmIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.deviceFirmId,0) + #{item.deviceFirmIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="deviceFirmname=(case" suffix="ELSE deviceFirmname end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('deviceFirmname')) or (colPickMode==1 and !item.containsKey('deviceFirmname'))">
      when a.id=#{item.id} then #{item.deviceFirmname}
      </if>
      </foreach>
      </trim>
      <trim prefix="ip=(case" suffix="ELSE ip end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('ip')) or (colPickMode==1 and !item.containsKey('ip'))">
      when a.id=#{item.id} then #{item.ip}
      </if>
      </foreach>
      </trim>
      <trim prefix="port=(case" suffix="ELSE port end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('port')) or (colPickMode==1 and !item.containsKey('port'))">
      when a.id=#{item.id} then #{item.port}
      </if>
      </foreach>
      </trim>
      <trim prefix="enabled=(case" suffix="ELSE enabled end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('enabled')) or (colPickMode==1 and !item.containsKey('enabled'))">
      when a.id=#{item.id} then #{item.enabled}
      </when>
      <when test="(colPickMode==0 and item.containsKey('enabledIncrement')) or (colPickMode==1 and !item.containsKey('enabledIncrement'))">
      when a.id=#{item.id} then ifnull(a.enabled,0) + #{item.enabledIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="productCode=(case" suffix="ELSE productCode end),"> <trim prefix="productCode=(case" suffix="ELSE productCode end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('productCode')) or (colPickMode==1 and !item.containsKey('productCode'))"> <if test="(colPickMode==0 and item.containsKey('productCode')) or (colPickMode==1 and !item.containsKey('productCode'))">
      ...@@ -409,6 +481,51 @@ ...@@ -409,6 +481,51 @@
      </if> </if>
      </foreach> </foreach>
      </trim> </trim>
      <trim prefix="belong=(case" suffix="ELSE belong end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('belong')) or (colPickMode==1 and !item.containsKey('belong'))">
      when a.id=#{item.id} then #{item.belong}
      </if>
      </foreach>
      </trim>
      <trim prefix="deviceInBuilding=(case" suffix="ELSE deviceInBuilding end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('deviceInBuilding')) or (colPickMode==1 and !item.containsKey('deviceInBuilding'))">
      when a.id=#{item.id} then #{item.deviceInBuilding}
      </when>
      <when test="(colPickMode==0 and item.containsKey('deviceInBuildingIncrement')) or (colPickMode==1 and !item.containsKey('deviceInBuildingIncrement'))">
      when a.id=#{item.id} then ifnull(a.deviceInBuilding,0) + #{item.deviceInBuildingIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="deviceInFloor=(case" suffix="ELSE deviceInFloor end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('deviceInFloor')) or (colPickMode==1 and !item.containsKey('deviceInFloor'))">
      when a.id=#{item.id} then #{item.deviceInFloor}
      </when>
      <when test="(colPickMode==0 and item.containsKey('deviceInFloorIncrement')) or (colPickMode==1 and !item.containsKey('deviceInFloorIncrement'))">
      when a.id=#{item.id} then ifnull(a.deviceInFloor,0) + #{item.deviceInFloorIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="onlineTime=(case" suffix="ELSE onlineTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('onlineTime')) or (colPickMode==1 and !item.containsKey('onlineTime'))">
      when a.id=#{item.id} then #{item.onlineTime}
      </if>
      </foreach>
      </trim>
      <trim prefix="offlineTime=(case" suffix="ELSE offlineTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('offlineTime')) or (colPickMode==1 and !item.containsKey('offlineTime'))">
      when a.id=#{item.id} then #{item.offlineTime}
      </if>
      </foreach>
      </trim>
      <trim prefix="source=(case" suffix="ELSE source end),"> <trim prefix="source=(case" suffix="ELSE source end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose> <choose>
      ...@@ -459,65 +576,6 @@ ...@@ -459,65 +576,6 @@
      </if> </if>
      </foreach> </foreach>
      </trim> </trim>
      <trim prefix="deviceFirmId=(case" suffix="ELSE deviceFirmId end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('deviceFirmId')) or (colPickMode==1 and !item.containsKey('deviceFirmId'))">
      when a.id=#{item.id} then #{item.deviceFirmId}
      </when>
      <when test="(colPickMode==0 and item.containsKey('deviceFirmIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceFirmIdIncrement'))">
      when a.id=#{item.id} then ifnull(a.deviceFirmId,0) + #{item.deviceFirmIdIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="deviceFirmname=(case" suffix="ELSE deviceFirmname end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('deviceFirmname')) or (colPickMode==1 and !item.containsKey('deviceFirmname'))">
      when a.id=#{item.id} then #{item.deviceFirmname}
      </if>
      </foreach>
      </trim>
      <trim prefix="ip=(case" suffix="ELSE ip end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('ip')) or (colPickMode==1 and !item.containsKey('ip'))">
      when a.id=#{item.id} then #{item.ip}
      </if>
      </foreach>
      </trim>
      <trim prefix="port=(case" suffix="ELSE port end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('port')) or (colPickMode==1 and !item.containsKey('port'))">
      when a.id=#{item.id} then #{item.port}
      </if>
      </foreach>
      </trim>
      <trim prefix="enabled=(case" suffix="ELSE enabled end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <choose>
      <when test="(colPickMode==0 and item.containsKey('enabled')) or (colPickMode==1 and !item.containsKey('enabled'))">
      when a.id=#{item.id} then #{item.enabled}
      </when>
      <when test="(colPickMode==0 and item.containsKey('enabledIncrement')) or (colPickMode==1 and !item.containsKey('enabledIncrement'))">
      when a.id=#{item.id} then ifnull(a.enabled,0) + #{item.enabledIncrement}
      </when>
      </choose>
      </foreach>
      </trim>
      <trim prefix="onlineTime=(case" suffix="ELSE onlineTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('onlineTime')) or (colPickMode==1 and !item.containsKey('onlineTime'))">
      when a.id=#{item.id} then #{item.onlineTime}
      </if>
      </foreach>
      </trim>
      <trim prefix="offlineTime=(case" suffix="ELSE offlineTime end),">
      <foreach collection="data.dataList" item="item" index="index" separator="" >
      <if test="(colPickMode==0 and item.containsKey('offlineTime')) or (colPickMode==1 and !item.containsKey('offlineTime'))">
      when a.id=#{item.id} then #{item.offlineTime}
      </if>
      </foreach>
      </trim>
      </trim> </trim>
      where id in where id in
      <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")"> <foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
      ...@@ -820,8 +878,125 @@ ...@@ -820,8 +878,125 @@
      #{item} #{item}
      </foreach> </foreach>
      </if> </if>
      <if test="conditionParamRef.containsKey('deviceFirmId')">
      <if test="conditionParamRef.containsKey('productCode')"> <if test="conditionParamRef.deviceFirmId != null ">
      ${_conditionType_} a.deviceFirmId = #{${_conditionParam_}.deviceFirmId}
      </if>
      <if test="conditionParamRef.deviceFirmId == null">
      ${_conditionType_} a.deviceFirmId is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdList') and conditionParamRef.deviceFirmIdList.size() > 0">
      ${_conditionType_} a.deviceFirmId in
      <foreach collection="conditionParamRef.deviceFirmIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdNotList') and conditionParamRef.deviceFirmIdNotList.size() > 0">
      ${_conditionType_} a.deviceFirmId not in
      <foreach collection="conditionParamRef.deviceFirmIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdStart') and conditionParamRef.deviceFirmIdStart != null">
      ${_conditionType_} a.deviceFirmId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceFirmIdStart}
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdEnd') and conditionParamRef.deviceFirmIdEnd != null">
      ${_conditionType_} a.deviceFirmId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceFirmIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmname')">
      <if test="conditionParamRef.deviceFirmname != null and conditionParamRef.deviceFirmname != ''">
      ${_conditionType_} a.deviceFirmname like #{${_conditionParam_}.deviceFirmname}
      </if>
      <if test="conditionParamRef.deviceFirmname == null">
      ${_conditionType_} a.deviceFirmname is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmnameList') and conditionParamRef.deviceFirmnameList.size() > 0">
      ${_conditionType_} a.deviceFirmname in
      <foreach collection="conditionParamRef.deviceFirmnameList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmnameNotList') and conditionParamRef.deviceFirmnameNotList.size() > 0">
      ${_conditionType_} a.deviceFirmname not in
      <foreach collection="conditionParamRef.deviceFirmnameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('ip')">
      <if test="conditionParamRef.ip != null and conditionParamRef.ip != ''">
      ${_conditionType_} a.ip like #{${_conditionParam_}.ip}
      </if>
      <if test="conditionParamRef.ip == null">
      ${_conditionType_} a.ip is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('ipList') and conditionParamRef.ipList.size() > 0">
      ${_conditionType_} a.ip in
      <foreach collection="conditionParamRef.ipList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('ipNotList') and conditionParamRef.ipNotList.size() > 0">
      ${_conditionType_} a.ip not in
      <foreach collection="conditionParamRef.ipNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('port')">
      <if test="conditionParamRef.port != null and conditionParamRef.port != ''">
      ${_conditionType_} a.port like #{${_conditionParam_}.port}
      </if>
      <if test="conditionParamRef.port == null">
      ${_conditionType_} a.port is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('portList') and conditionParamRef.portList.size() > 0">
      ${_conditionType_} a.port in
      <foreach collection="conditionParamRef.portList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('portNotList') and conditionParamRef.portNotList.size() > 0">
      ${_conditionType_} a.port not in
      <foreach collection="conditionParamRef.portNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('enabled')">
      <if test="conditionParamRef.enabled != null ">
      ${_conditionType_} a.enabled = #{${_conditionParam_}.enabled}
      </if>
      <if test="conditionParamRef.enabled == null">
      ${_conditionType_} a.enabled is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0">
      ${_conditionType_} a.enabled in
      <foreach collection="conditionParamRef.enabledList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('enabledNotList') and conditionParamRef.enabledNotList.size() > 0">
      ${_conditionType_} a.enabled not in
      <foreach collection="conditionParamRef.enabledNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('enabledStart') and conditionParamRef.enabledStart != null">
      ${_conditionType_} a.enabled <![CDATA[ >= ]]> #{${_conditionParam_}.enabledStart}
      </if>
      <if test="conditionParamRef.containsKey('enabledEnd') and conditionParamRef.enabledEnd != null">
      ${_conditionType_} a.enabled <![CDATA[ <= ]]> #{${_conditionParam_}.enabledEnd}
      </if>
      <if test="conditionParamRef.containsKey('productCode')">
      <if test="conditionParamRef.productCode != null and conditionParamRef.productCode != ''"> <if test="conditionParamRef.productCode != null and conditionParamRef.productCode != ''">
      ${_conditionType_} a.productCode like #{${_conditionParam_}.productCode} ${_conditionType_} a.productCode like #{${_conditionParam_}.productCode}
      </if> </if>
      ...@@ -1021,6 +1196,111 @@ ...@@ -1021,6 +1196,111 @@
      #{item} #{item}
      </foreach> </foreach>
      </if> </if>
      <if test="conditionParamRef.containsKey('belong')">
      <if test="conditionParamRef.belong != null and conditionParamRef.belong != ''">
      ${_conditionType_} a.belong like #{${_conditionParam_}.belong}
      </if>
      <if test="conditionParamRef.belong == null">
      ${_conditionType_} a.belong is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('belongList') and conditionParamRef.belongList.size() > 0">
      ${_conditionType_} a.belong in
      <foreach collection="conditionParamRef.belongList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('belongNotList') and conditionParamRef.belongNotList.size() > 0">
      ${_conditionType_} a.belong not in
      <foreach collection="conditionParamRef.belongNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceInBuilding')">
      <if test="conditionParamRef.deviceInBuilding != null ">
      ${_conditionType_} a.deviceInBuilding = #{${_conditionParam_}.deviceInBuilding}
      </if>
      <if test="conditionParamRef.deviceInBuilding == null">
      ${_conditionType_} a.deviceInBuilding is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deviceInBuildingList') and conditionParamRef.deviceInBuildingList.size() > 0">
      ${_conditionType_} a.deviceInBuilding in
      <foreach collection="conditionParamRef.deviceInBuildingList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceInBuildingNotList') and conditionParamRef.deviceInBuildingNotList.size() > 0">
      ${_conditionType_} a.deviceInBuilding not in
      <foreach collection="conditionParamRef.deviceInBuildingNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceInBuildingStart') and conditionParamRef.deviceInBuildingStart != null">
      ${_conditionType_} a.deviceInBuilding <![CDATA[ >= ]]> #{${_conditionParam_}.deviceInBuildingStart}
      </if>
      <if test="conditionParamRef.containsKey('deviceInBuildingEnd') and conditionParamRef.deviceInBuildingEnd != null">
      ${_conditionType_} a.deviceInBuilding <![CDATA[ <= ]]> #{${_conditionParam_}.deviceInBuildingEnd}
      </if>
      <if test="conditionParamRef.containsKey('deviceInFloor')">
      <if test="conditionParamRef.deviceInFloor != null ">
      ${_conditionType_} a.deviceInFloor = #{${_conditionParam_}.deviceInFloor}
      </if>
      <if test="conditionParamRef.deviceInFloor == null">
      ${_conditionType_} a.deviceInFloor is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('deviceInFloorList') and conditionParamRef.deviceInFloorList.size() > 0">
      ${_conditionType_} a.deviceInFloor in
      <foreach collection="conditionParamRef.deviceInFloorList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceInFloorNotList') and conditionParamRef.deviceInFloorNotList.size() > 0">
      ${_conditionType_} a.deviceInFloor not in
      <foreach collection="conditionParamRef.deviceInFloorNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceInFloorStart') and conditionParamRef.deviceInFloorStart != null">
      ${_conditionType_} a.deviceInFloor <![CDATA[ >= ]]> #{${_conditionParam_}.deviceInFloorStart}
      </if>
      <if test="conditionParamRef.containsKey('deviceInFloorEnd') and conditionParamRef.deviceInFloorEnd != null">
      ${_conditionType_} a.deviceInFloor <![CDATA[ <= ]]> #{${_conditionParam_}.deviceInFloorEnd}
      </if>
      <if test="conditionParamRef.containsKey('onlineTime')">
      <if test="conditionParamRef.onlineTime != null ">
      ${_conditionType_} a.onlineTime = #{${_conditionParam_}.onlineTime}
      </if>
      <if test="conditionParamRef.onlineTime == null">
      ${_conditionType_} a.onlineTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('onlineTimeStart') and conditionParamRef.onlineTimeStart != null and conditionParamRef.onlineTimeStart!=''">
      ${_conditionType_} a.onlineTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.onlineTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('onlineTimeEnd') and conditionParamRef.onlineTimeEnd != null and conditionParamRef.onlineTimeEnd!=''">
      ${_conditionType_} a.onlineTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.onlineTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('offlineTime')">
      <if test="conditionParamRef.offlineTime != null ">
      ${_conditionType_} a.offlineTime = #{${_conditionParam_}.offlineTime}
      </if>
      <if test="conditionParamRef.offlineTime == null">
      ${_conditionType_} a.offlineTime is null
      </if>
      </if>
      <if test="conditionParamRef.containsKey('offlineTimeStart') and conditionParamRef.offlineTimeStart != null and conditionParamRef.offlineTimeStart!=''">
      ${_conditionType_} a.offlineTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.offlineTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('offlineTimeEnd') and conditionParamRef.offlineTimeEnd != null and conditionParamRef.offlineTimeEnd!=''">
      ${_conditionType_} a.offlineTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.offlineTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('source')"> <if test="conditionParamRef.containsKey('source')">
      <if test="conditionParamRef.source != null "> <if test="conditionParamRef.source != null ">
      ${_conditionType_} a.source = #{${_conditionParam_}.source} ${_conditionType_} a.source = #{${_conditionParam_}.source}
      ...@@ -1132,165 +1412,186 @@ ...@@ -1132,165 +1412,186 @@
      <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''">
      ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if> </if>
      <if test="conditionParamRef.containsKey('deviceFirmId')"> </sql>
      <if test="conditionParamRef.deviceFirmId != null "> <sql id="_orderCols_">
      ${_conditionType_} a.deviceFirmId = #{${_conditionParam_}.deviceFirmId} <if test="orderColList != null and !orderColList.isEmpty()">
      </if> order by
      <if test="conditionParamRef.deviceFirmId == null"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
      ${_conditionType_} a.deviceFirmId is null field(a.id,
      </if> <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
      </if> #{item}
      <if test="conditionParamRef.containsKey('deviceFirmIdList') and conditionParamRef.deviceFirmIdList.size() > 0"> </foreach>
      ${_conditionType_} a.deviceFirmId in ,
      <foreach collection="conditionParamRef.deviceFirmIdList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdNotList') and conditionParamRef.deviceFirmIdNotList.size() > 0">
      ${_conditionType_} a.deviceFirmId not in
      <foreach collection="conditionParamRef.deviceFirmIdNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdStart') and conditionParamRef.deviceFirmIdStart != null">
      ${_conditionType_} a.deviceFirmId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceFirmIdStart}
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdEnd') and conditionParamRef.deviceFirmIdEnd != null">
      ${_conditionType_} a.deviceFirmId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceFirmIdEnd}
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmname')">
      <if test="conditionParamRef.deviceFirmname != null and conditionParamRef.deviceFirmname != ''">
      ${_conditionType_} a.deviceFirmname like #{${_conditionParam_}.deviceFirmname}
      </if> </if>
      <if test="conditionParamRef.deviceFirmname == null"> <if test="conditionParamRef.containsKey('deviceIdList') and conditionParamRef.deviceIdList.size() > 0">
      ${_conditionType_} a.deviceFirmname is null field(a.deviceId,
      <foreach collection="conditionParamRef.deviceIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if> </if>
      </if> <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
      <if test="conditionParamRef.containsKey('deviceFirmnameList') and conditionParamRef.deviceFirmnameList.size() > 0"> field(a.siteId,
      ${_conditionType_} a.deviceFirmname in <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
      <foreach collection="conditionParamRef.deviceFirmnameList" open="(" close=")" index="index" item="item" separator=","> #{item}
      #{item} </foreach>
      </foreach> ,
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmnameNotList') and conditionParamRef.deviceFirmnameNotList.size() > 0">
      ${_conditionType_} a.deviceFirmname not in
      <foreach collection="conditionParamRef.deviceFirmnameNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('ip')">
      <if test="conditionParamRef.ip != null and conditionParamRef.ip != ''">
      ${_conditionType_} a.ip like #{${_conditionParam_}.ip}
      </if> </if>
      <if test="conditionParamRef.ip == null"> <if test="conditionParamRef.containsKey('deviceFirmIdList') and conditionParamRef.deviceFirmIdList.size() > 0">
      ${_conditionType_} a.ip is null field(a.deviceFirmId,
      <foreach collection="conditionParamRef.deviceFirmIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if> </if>
      </if> <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0">
      <if test="conditionParamRef.containsKey('ipList') and conditionParamRef.ipList.size() > 0"> field(a.enabled,
      ${_conditionType_} a.ip in <foreach collection="conditionParamRef.enabledList" open="" close=")" index="index" item="item" separator=",">
      <foreach collection="conditionParamRef.ipList" open="(" close=")" index="index" item="item" separator=","> #{item}
      #{item} </foreach>
      </foreach> ,
      </if>
      <if test="conditionParamRef.containsKey('ipNotList') and conditionParamRef.ipNotList.size() > 0">
      ${_conditionType_} a.ip not in
      <foreach collection="conditionParamRef.ipNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('port')">
      <if test="conditionParamRef.port != null and conditionParamRef.port != ''">
      ${_conditionType_} a.port like #{${_conditionParam_}.port}
      </if> </if>
      <if test="conditionParamRef.port == null"> <if test="conditionParamRef.containsKey('deviceSrcList') and conditionParamRef.deviceSrcList.size() > 0">
      ${_conditionType_} a.port is null field(a.deviceSrc,
      <foreach collection="conditionParamRef.deviceSrcList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if> </if>
      </if> <if test="conditionParamRef.containsKey('deviceStatusList') and conditionParamRef.deviceStatusList.size() > 0">
      <if test="conditionParamRef.containsKey('portList') and conditionParamRef.portList.size() > 0"> field(a.deviceStatus,
      ${_conditionType_} a.port in <foreach collection="conditionParamRef.deviceStatusList" open="" close=")" index="index" item="item" separator=",">
      <foreach collection="conditionParamRef.portList" open="(" close=")" index="index" item="item" separator=","> #{item}
      #{item} </foreach>
      </foreach> ,
      </if>
      <if test="conditionParamRef.containsKey('portNotList') and conditionParamRef.portNotList.size() > 0">
      ${_conditionType_} a.port not in
      <foreach collection="conditionParamRef.portNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('enabled')">
      <if test="conditionParamRef.enabled != null ">
      ${_conditionType_} a.enabled = #{${_conditionParam_}.enabled}
      </if> </if>
      <if test="conditionParamRef.enabled == null"> <if test="conditionParamRef.containsKey('deviceInBuildingList') and conditionParamRef.deviceInBuildingList.size() > 0">
      ${_conditionType_} a.enabled is null field(a.deviceInBuilding,
      <foreach collection="conditionParamRef.deviceInBuildingList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if> </if>
      </if> <if test="conditionParamRef.containsKey('deviceInFloorList') and conditionParamRef.deviceInFloorList.size() > 0">
      <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0"> field(a.deviceInFloor,
      ${_conditionType_} a.enabled in <foreach collection="conditionParamRef.deviceInFloorList" open="" close=")" index="index" item="item" separator=",">
      <foreach collection="conditionParamRef.enabledList" open="(" close=")" index="index" item="item" separator=","> #{item}
      #{item} </foreach>
      </foreach> ,
      </if>
      <if test="conditionParamRef.containsKey('enabledNotList') and conditionParamRef.enabledNotList.size() > 0">
      ${_conditionType_} a.enabled not in
      <foreach collection="conditionParamRef.enabledNotList" open="(" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      </if>
      <if test="conditionParamRef.containsKey('enabledStart') and conditionParamRef.enabledStart != null">
      ${_conditionType_} a.enabled <![CDATA[ >= ]]> #{${_conditionParam_}.enabledStart}
      </if>
      <if test="conditionParamRef.containsKey('enabledEnd') and conditionParamRef.enabledEnd != null">
      ${_conditionType_} a.enabled <![CDATA[ <= ]]> #{${_conditionParam_}.enabledEnd}
      </if>
      <if test="conditionParamRef.containsKey('onlineTime')">
      <if test="conditionParamRef.onlineTime != null ">
      ${_conditionType_} a.onlineTime = #{${_conditionParam_}.onlineTime}
      </if> </if>
      <if test="conditionParamRef.onlineTime == null"> <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
      ${_conditionType_} a.onlineTime is null field(a.source,
      <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if> </if>
      </if> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
      <if test="conditionParamRef.containsKey('onlineTimeStart') and conditionParamRef.onlineTimeStart != null and conditionParamRef.onlineTimeStart!=''"> field(a.createUserId,
      ${_conditionType_} a.onlineTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.onlineTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
      </if> #{item}
      <if test="conditionParamRef.containsKey('onlineTimeEnd') and conditionParamRef.onlineTimeEnd != null and conditionParamRef.onlineTimeEnd!=''"> </foreach>
      ${_conditionType_} a.onlineTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.onlineTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ,
      </if>
      <if test="conditionParamRef.containsKey('offlineTime')">
      <if test="conditionParamRef.offlineTime != null ">
      ${_conditionType_} a.offlineTime = #{${_conditionParam_}.offlineTime}
      </if> </if>
      <if test="conditionParamRef.offlineTime == null"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
      ${_conditionType_} a.offlineTime is null field(a.updateUserId,
      <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if> </if>
      </if>
      <if test="conditionParamRef.containsKey('offlineTimeStart') and conditionParamRef.offlineTimeStart != null and conditionParamRef.offlineTimeStart!=''">
      ${_conditionType_} a.offlineTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.offlineTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      <if test="conditionParamRef.containsKey('offlineTimeEnd') and conditionParamRef.offlineTimeEnd != null and conditionParamRef.offlineTimeEnd!=''">
      ${_conditionType_} a.offlineTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.offlineTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
      </if>
      </sql>
      <sql id="_orderCols_">
      <if test="orderColList != null and !orderColList.isEmpty()">
      order by
      <trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
      <foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
      ${item.colName} ${item.sortKind} a.${item.colName} ${item.sortKind}
      </foreach> </foreach>
      </trim> </trim>
      </if> </if>
      <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
      order by order by
      <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
      field(a.id,
      <foreach collection="conditionParamRef.idList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('deviceIdList') and conditionParamRef.deviceIdList.size() > 0">
      field(a.deviceId,
      <foreach collection="conditionParamRef.deviceIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
      field(a.siteId,
      <foreach collection="conditionParamRef.siteIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('deviceFirmIdList') and conditionParamRef.deviceFirmIdList.size() > 0">
      field(a.deviceFirmId,
      <foreach collection="conditionParamRef.deviceFirmIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0">
      field(a.enabled,
      <foreach collection="conditionParamRef.enabledList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('deviceSrcList') and conditionParamRef.deviceSrcList.size() > 0">
      field(a.deviceSrc,
      <foreach collection="conditionParamRef.deviceSrcList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('deviceStatusList') and conditionParamRef.deviceStatusList.size() > 0">
      field(a.deviceStatus,
      <foreach collection="conditionParamRef.deviceStatusList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('deviceInBuildingList') and conditionParamRef.deviceInBuildingList.size() > 0">
      field(a.deviceInBuilding,
      <foreach collection="conditionParamRef.deviceInBuildingList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('deviceInFloorList') and conditionParamRef.deviceInFloorList.size() > 0">
      field(a.deviceInFloor,
      <foreach collection="conditionParamRef.deviceInFloorList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
      field(a.source,
      <foreach collection="conditionParamRef.sourceList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
      field(a.createUserId,
      <foreach collection="conditionParamRef.createUserIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
      field(a.updateUserId,
      <foreach collection="conditionParamRef.updateUserIdList" open="" close=")" index="index" item="item" separator=",">
      #{item}
      </foreach>
      ,
      </if>
      <trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
      <if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
      a.id a.id
      ...@@ -1332,6 +1633,31 @@ ...@@ -1332,6 +1633,31 @@
      <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if> <if test='orderCol.siteName != null and "DESC".equalsIgnoreCase(orderCol.siteName)'>DESC</if>
      , ,
      </if> </if>
      <if test="orderCol.containsKey('deviceFirmId')">
      a.deviceFirmId
      <if test='orderCol.deviceFirmId != null and "DESC".equalsIgnoreCase(orderCol.deviceFirmId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deviceFirmname')">
      a.deviceFirmname
      <if test='orderCol.deviceFirmname != null and "DESC".equalsIgnoreCase(orderCol.deviceFirmname)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('ip')">
      a.ip
      <if test='orderCol.ip != null and "DESC".equalsIgnoreCase(orderCol.ip)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('port')">
      a.port
      <if test='orderCol.port != null and "DESC".equalsIgnoreCase(orderCol.port)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('enabled')">
      a.enabled
      <if test='orderCol.enabled != null and "DESC".equalsIgnoreCase(orderCol.enabled)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('productCode')"> <if test="orderCol.containsKey('productCode')">
      a.productCode a.productCode
      <if test='orderCol.productCode != null and "DESC".equalsIgnoreCase(orderCol.productCode)'>DESC</if> <if test='orderCol.productCode != null and "DESC".equalsIgnoreCase(orderCol.productCode)'>DESC</if>
      ...@@ -1377,6 +1703,31 @@ ...@@ -1377,6 +1703,31 @@
      <if test='orderCol.deviceRemark != null and "DESC".equalsIgnoreCase(orderCol.deviceRemark)'>DESC</if> <if test='orderCol.deviceRemark != null and "DESC".equalsIgnoreCase(orderCol.deviceRemark)'>DESC</if>
      , ,
      </if> </if>
      <if test="orderCol.containsKey('belong')">
      a.belong
      <if test='orderCol.belong != null and "DESC".equalsIgnoreCase(orderCol.belong)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deviceInBuilding')">
      a.deviceInBuilding
      <if test='orderCol.deviceInBuilding != null and "DESC".equalsIgnoreCase(orderCol.deviceInBuilding)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deviceInFloor')">
      a.deviceInFloor
      <if test='orderCol.deviceInFloor != null and "DESC".equalsIgnoreCase(orderCol.deviceInFloor)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('onlineTime')">
      a.onlineTime
      <if test='orderCol.onlineTime != null and "DESC".equalsIgnoreCase(orderCol.onlineTime)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('offlineTime')">
      a.offlineTime
      <if test='orderCol.offlineTime != null and "DESC".equalsIgnoreCase(orderCol.offlineTime)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('source')"> <if test="orderCol.containsKey('source')">
      a.source a.source
      <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if> <if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
      ...@@ -1402,43 +1753,10 @@ ...@@ -1402,43 +1753,10 @@
      <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
      , ,
      </if> </if>
      <if test="orderCol.containsKey('deviceFirmId')">
      a.deviceFirmId
      <if test='orderCol.deviceFirmId != null and "DESC".equalsIgnoreCase(orderCol.deviceFirmId)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('deviceFirmname')">
      a.deviceFirmname
      <if test='orderCol.deviceFirmname != null and "DESC".equalsIgnoreCase(orderCol.deviceFirmname)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('ip')">
      a.ip
      <if test='orderCol.ip != null and "DESC".equalsIgnoreCase(orderCol.ip)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('port')">
      a.port
      <if test='orderCol.port != null and "DESC".equalsIgnoreCase(orderCol.port)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('enabled')">
      a.enabled
      <if test='orderCol.enabled != null and "DESC".equalsIgnoreCase(orderCol.enabled)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('onlineTime')">
      a.onlineTime
      <if test='orderCol.onlineTime != null and "DESC".equalsIgnoreCase(orderCol.onlineTime)'>DESC</if>
      ,
      </if>
      <if test="orderCol.containsKey('offlineTime')">
      a.offlineTime
      <if test='orderCol.offlineTime != null and "DESC".equalsIgnoreCase(orderCol.offlineTime)'>DESC</if>
      ,
      </if>
      </trim> </trim>
      </if> </if>
      </sql> </sql>
      <sql id="_group_by_"> <sql id="_group_by_">
      <if test="groupList != null and !groupList.isEmpty()"> <if test="groupList != null and !groupList.isEmpty()">
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment