Skip to content

D
device-new-platform
Commit dd534fb2 authored by 赵啸非's avatar 赵啸非
Browse files
Options

设备添加产品编码字段，并添加同步更新产品编码字段

parent 32d7a444
Hide whitespace changes
Inline Side-by-side
Showing with 1624 additions and 290 deletions
device-manager/db/add.sql
View file @ dd534fb2
...@@ -16,3 +16,7 @@ ALTER TABLE mortals_xhx_product ADD COLUMN `eventUrl` varchar (512) COMMENT ...@@ -16,3 +16,7 @@ ALTER TABLE mortals_xhx_product ADD COLUMN `eventUrl` varchar (512) COMMENT
-- ---------------------------- -- ----------------------------
ALTER TABLE mortals_xhx_device ADD COLUMN `deviceVersion` varchar (64) COMMENT '设备版本' AFTER deleted; ALTER TABLE mortals_xhx_device ADD COLUMN `deviceVersion` varchar (64) COMMENT '设备版本' AFTER deleted;
-- ----------------------------
2023-02-2
-- ----------------------------
ALTER TABLE mortals_xhx_device ADD COLUMN `productCode` varchar (64) default '' COMMENT '产品编码' AFTER productId;
\ No newline at end of file
device-manager/db/module.sql
View file @ dd534fb2
...@@ -4,58 +4,60 @@ use ...@@ -4,58 +4,60 @@ use
-- 设备表 -- 设备表
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_device`; DROP TABLE IF EXISTS `mortals_xhx_device`;
CREATE TABLE `mortals_xhx_device` CREATE TABLE mortals_xhx_device(
( `id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键ID，主键，自增长', `deviceName` varchar(20) NOT NULL COMMENT '设备名称',
`deviceName` varchar(20) NOT NULL COMMENT '设备名称', `deviceCode` varchar(256) COMMENT '设备编码,SN码等，默认为MAC地址',
`deviceCode` varchar(256) DEFAULT NULL COMMENT '设备编码', `deviceMac` varchar(64) COMMENT '设备的MAC地址',
`deviceSN` varchar(512) DEFAULT NULL COMMENT '设备SN码', `siteId` bigint(20) COMMENT '站点Id，来源基础服务平台',
`deviceMac` varchar(64) DEFAULT NULL COMMENT '设备的MAC地址', `siteCode` varchar(256) COMMENT '站点编号，来源基础服务平台',
`siteId` bigint(20) DEFAULT NULL COMMENT '站点Id，来源基础服务平台', `siteName` varchar(256) COMMENT '站点名称',
`siteCode` varchar(256) DEFAULT NULL COMMENT '站点编号，来源基础服务平台', `platformId` bigint(20) COMMENT '平台系统Id',
`siteName` varchar(256) DEFAULT NULL COMMENT '站点名称', `platformName` varchar(256) COMMENT '平台系统名称',
`platformId` bigint(20) DEFAULT NULL COMMENT '平台系统Id', `productId` bigint(20) COMMENT '产品Id',
`platformName` varchar(256) DEFAULT NULL COMMENT '平台系统名称', `productName` varchar(256) COMMENT '产品名称',
`productId` bigint(20) DEFAULT NULL COMMENT '产品Id', `skinId` bigint(20) NOT NULL COMMENT '皮肤id',
`productName` varchar(256) DEFAULT NULL COMMENT '产品名称', `skinName` varchar(20) NOT NULL COMMENT '皮肤名称',
`skinId` bigint(20) DEFAULT NULL COMMENT '皮肤id', `homeUrl` varchar(512) COMMENT '首页地址',
`skinName` varchar(512) DEFAULT NULL COMMENT '皮肤名称', `deviceFirmId` bigint(20) COMMENT '设备生产厂商ID',
`homeUrl` varchar(512) DEFAULT NULL COMMENT '首页地址', `deviceFirmname` varchar(20) COMMENT '设备生产厂商名称',
`deviceFirmId` bigint(20) DEFAULT NULL COMMENT '设备生产厂商ID', `deviceSrc` tinyint(2) DEFAULT '2' COMMENT '设备来源(0.子设备，1.网关设备，2.直连设备)',
`deviceFirmname` varchar(20) DEFAULT NULL COMMENT '设备生产厂商名称', `deviceDataSourceWay` tinyint(2) DEFAULT '0' COMMENT '数据获取方式(0.主动上报，1.被动拉取)',
`deviceSrc` tinyint(2) DEFAULT NULL COMMENT '设备来源(0.子设备，1.网关设备，2.直连设备)', `lon` varchar(32) COMMENT '经度',
`deviceDataSourceWay` tinyint(2) DEFAULT NULL COMMENT '数据获取方式(0.主动上报，1被动拉取)', `lati` varchar(32) COMMENT '经度',
`lon` varchar(32) DEFAULT NULL COMMENT '经度', `deviceInBuilding` tinyint(2) COMMENT '所属楼栋',
`lati` varchar(32) DEFAULT NULL COMMENT '经度', `deviceInFloor` tinyint(2) COMMENT '所属楼层',
`deviceInBuilding` tinyint(2) DEFAULT NULL COMMENT '所属楼栋', `defectsLiabilityPeriod` datetime COMMENT '保修期至',
`deviceInFloor` tinyint(2) DEFAULT NULL COMMENT '所属楼层', `leadingOfficial` varchar(64) COMMENT '负责人',
`defectsLiabilityPeriod` datetime DEFAULT NULL COMMENT '保修期至', `leadingOfficialTelephone` varchar(64) COMMENT '联系电话',
`leadingOfficial` varchar(10) DEFAULT NULL COMMENT '负责人', `isReceiveMess` tinyint(2) DEFAULT '0' COMMENT '是否接收异常短(0.否，1.是)',
`leadingOfficialTelephone` varchar(11) DEFAULT NULL COMMENT '联系电话', `devicePhotoPath` varchar(256) COMMENT '设备图片',
`isReceiveMess` tinyint(2) DEFAULT NULL COMMENT '是否接收异常短(0.否，1.是)', `ip` varchar(64) COMMENT '设备访问ip',
`ip` varchar(64) DEFAULT NULL COMMENT '设备访问ip', `centernum` varchar(64) COMMENT '中心设备编码',
`centernum` varchar(64) DEFAULT NULL COMMENT '中心设备编码', `port` varchar(64) COMMENT '端口',
`port` varchar(64) DEFAULT NULL COMMENT '端口', `deviceTopic` varchar(100) COMMENT '设备topic信息',
`deviceTopic` varchar(100) DEFAULT NULL COMMENT '设备topic信息', `deviceStatus` tinyint(2) DEFAULT '0' COMMENT '设备状态 (0.未激活，1.离线,2.在线)',
`deviceStatus` tinyint(2) DEFAULT NULL COMMENT '设备状态 (0.未激活，1.离线,2.在线)', `enabled` tinyint(2) DEFAULT '0' COMMENT '启用状态 (0.停止，1.启用)',
`enabled` tinyint(2) DEFAULT NULL COMMENT '启用状态 (0.停止，1.启用)', `deviceAuthCode` varchar(512) COMMENT '设备授权码',
`deviceAuthCode` varchar(255) DEFAULT NULL, `deviceRemark` varchar(256) COMMENT '备注',
`deviceRemark` varchar(256) DEFAULT NULL COMMENT '备注', `onlineTime` datetime COMMENT '最近上线时间',
`onlineTime` datetime DEFAULT NULL COMMENT '最近上线时间', `offlineTime` datetime COMMENT '最近离线时间',
`offlineTime` datetime DEFAULT NULL COMMENT '最近离线时间', `deleted` tinyint(2) DEFAULT '0' COMMENT '是否删除(0.否，1.是)',
`devicePhotoPath` varchar(255) DEFAULT NULL, `source` tinyint(2) DEFAULT '1' COMMENT '设备来源(0.旧设备，1.新设备)',
`deleted` tinyint(2) DEFAULT NULL COMMENT '是否删除，(0.否，1.是)', `createUserId` bigint(20) NOT NULL COMMENT '创建用户',
`deviceVersion` varchar(64) DEFAULT NULL COMMENT '设备版本', `createTime` datetime NOT NULL COMMENT '创建时间',
`source` tinyint(2) DEFAULT NULL, `updateUserId` bigint(20) COMMENT '更新用户',
`createUserId` bigint(20) NOT NULL COMMENT '创建用户', `updateTime` datetime COMMENT '更新时间',
`createTime` datetime NOT NULL COMMENT '创建时间', `deviceSN` varchar(256) COMMENT '设备SN码',
`updateUserId` bigint(20) DEFAULT NULL COMMENT '更新用户', `deviceVersion` varchar(64) COMMENT '设备版本',
`updateTime` datetime DEFAULT NULL COMMENT '更新时间', `productCode` varchar(256) COMMENT '产品编码',
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`)
KEY `productCode` (`productCode`) USING BTREE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备';
-- ---------------------------- -- ----------------------------
-- 平台系统表 -- 平台系统表
-- ---------------------------- -- ----------------------------
......
device-manager/pom.xml
View file @ dd534fb2
...@@ -215,16 +215,7 @@ ...@@ -215,16 +215,7 @@
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId> <artifactId>jjwt</artifactId>
</dependency> </dependency>
<dependency>
<groupId>net.sourceforge.tess4j</groupId>
<artifactId>tess4j</artifactId>
<version>5.6.0</version>
</dependency>
<dependency>
<groupId>p6spy</groupId>
<artifactId>p6spy</artifactId>
<version>3.9.1</version>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
......
device-manager/src/main/java/com/mortals/xhx/busiz/web/TestSendMsgController.java
View file @ dd534fb2
...@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; ...@@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.http.HttpUtil; import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.annotation.UnAuth;
import com.mortals.framework.service.ILogService; import com.mortals.framework.service.ILogService;
import com.mortals.framework.service.impl.FileLogServiceImpl; import com.mortals.framework.service.impl.FileLogServiceImpl;
import com.mortals.xhx.busiz.req.TestReq; import com.mortals.xhx.busiz.req.TestReq;
...@@ -12,14 +13,23 @@ import com.mortals.xhx.busiz.rsp.ApiResp; ...@@ -12,14 +13,23 @@ import com.mortals.xhx.busiz.rsp.ApiResp;
import com.mortals.xhx.busiz.rsp.DeviceResp; import com.mortals.xhx.busiz.rsp.DeviceResp;
import com.mortals.xhx.common.code.ApiRespCodeEnum; import com.mortals.xhx.common.code.ApiRespCodeEnum;
import com.mortals.xhx.common.utils.ImgUtils; import com.mortals.xhx.common.utils.ImgUtils;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.model.DeviceQuery;
import com.mortals.xhx.module.device.service.DeviceService;
import com.mortals.xhx.module.product.model.ProductEntity;
import com.mortals.xhx.module.product.service.ProductService;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.io.File; import java.io.File;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
/** /**
* 设备 * 设备
...@@ -33,6 +43,10 @@ import java.io.File; ...@@ -33,6 +43,10 @@ import java.io.File;
public class TestSendMsgController { public class TestSendMsgController {
@Autowired @Autowired
protected ILogService logService = FileLogServiceImpl.getInstance(); protected ILogService logService = FileLogServiceImpl.getInstance();
@Autowired
private ProductService productService;
@Autowired
private DeviceService deviceService;
/** /**
* 发送日志消息 * 发送日志消息
...@@ -52,6 +66,35 @@ public class TestSendMsgController { ...@@ -52,6 +66,35 @@ public class TestSendMsgController {
} }
@PostMapping("reDeviceProductCode")
@UnAuth
public String reDeviceProductCode() {
log.info("刷新设备的产品编码");
ApiResp<DeviceResp> rsp = new ApiResp<>();
rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
List<DeviceEntity> updateProductCodeList = deviceService.find(new DeviceQuery()).stream().map(deviceEntity -> {
if (ObjectUtils.isEmpty(deviceEntity.getProductCode()) && !ObjectUtils.isEmpty(deviceEntity.getProductId())) {
ProductEntity cache = productService.getCache(deviceEntity.getProductId().toString());
if (!ObjectUtils.isEmpty(cache)) {
deviceEntity.setProductCode(cache.getProductCode());
DeviceEntity temp = new DeviceEntity();
temp.setId(deviceEntity.getId());
temp.setProductCode(cache.getProductCode());
temp.setUpdateTime(new Date());
return temp;
}
}
return null;
}).filter(f -> f != null).collect(Collectors.toList());
if (!ObjectUtils.isEmpty(updateProductCodeList)) {
log.info("更新设备产品列表，size:{}", updateProductCodeList.size());
deviceService.update(updateProductCodeList, null);
}
return JSON.toJSONString(rsp);
}
public static void main(String[] args) { public static void main(String[] args) {
String resp = HttpUtil.get("http://59.225.206.13:8331/oauth-pro/admin-pro/sys/randomImage/1675827431800?_t=1675827431"); String resp = HttpUtil.get("http://59.225.206.13:8331/oauth-pro/admin-pro/sys/randomImage/1675827431800?_t=1675827431");
...@@ -61,10 +104,10 @@ public class TestSendMsgController { ...@@ -61,10 +104,10 @@ public class TestSendMsgController {
log.info("result:{}", jsonObject.get("result")); log.info("result:{}", jsonObject.get("result"));
String OriginalImg = "F:\\pics\\2.jpg"; String OriginalImg = "F:\\pics\\2.jpg";
String ocrResult = "F:\\pics\\2-1.jpg"; String ocrResult = "F:\\pics\\2-1.jpg";
Base64.decodeToFile(StrUtil.replace(jsonObject.get("result").toString(),"data:image/jpg;base64,",""), new File(OriginalImg)); Base64.decodeToFile(StrUtil.replace(jsonObject.get("result").toString(), "data:image/jpg;base64,", ""), new File(OriginalImg));
ImgUtils.removeBackground(OriginalImg, ocrResult); ImgUtils.removeBackground(OriginalImg, ocrResult);
// log.info(code); // log.info(code);
/* /*
//原始验证码地址 //原始验证码地址
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
View file @ dd534fb2
package com.mortals.xhx.module.device.model; package com.mortals.xhx.module.device.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.base.framework.CustomJsonDateDeserializer; import com.mortals.xhx.base.framework.CustomJsonDateDeserializer;
import com.mortals.xhx.module.device.model.vo.DeviceVo; import com.mortals.xhx.module.device.model.vo.DeviceVo;
import java.util.Date;
/** /**
* 设备实体对象 * 设备实体对象
* *
...@@ -68,6 +62,11 @@ public class DeviceEntity extends DeviceVo { ...@@ -68,6 +62,11 @@ public class DeviceEntity extends DeviceVo {
* 产品Id * 产品Id
*/ */
private Long productId; private Long productId;
/**
* 产品编码
*/
@Excel(name = "产品类型",cacheDict = "productDict" ,type = Excel.Type.IMPORT)
private String productCode;
/** /**
* 产品名称 * 产品名称
*/ */
...@@ -322,6 +321,20 @@ public class DeviceEntity extends DeviceVo { ...@@ -322,6 +321,20 @@ public class DeviceEntity extends DeviceVo {
public void setProductId(Long productId){ public void setProductId(Long productId){
this.productId = productId; this.productId = productId;
} }
/**
* 获取 产品编码
* @return String
*/
public String getProductCode(){
return productCode;
}
/**
* 设置 产品编码
* @param productCode
*/
public void setProductCode(String productCode) {
this.productCode = productCode;
}
/** /**
* 获取 产品名称 * 获取 产品名称
* @return String * @return String
...@@ -806,6 +819,8 @@ public class DeviceEntity extends DeviceVo { ...@@ -806,6 +819,8 @@ public class DeviceEntity extends DeviceVo {
this.productId = null; this.productId = null;
this.productCode = "";
this.productName = ""; this.productName = "";
this.deviceFirmId = null; this.deviceFirmId = null;
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java
View file @ dd534fb2
package com.mortals.xhx.module.device.model; package com.mortals.xhx.module.device.model;
import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.device.model.DeviceEntity;
/** /**
* 设备查询对象 * 设备查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-08-22 * @date 2023-02-25
*/ */
public class DeviceQuery extends DeviceEntity { public class DeviceQuery extends DeviceEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
...@@ -22,18 +20,24 @@ public class DeviceQuery extends DeviceEntity { ...@@ -22,18 +20,24 @@ public class DeviceQuery extends DeviceEntity {
/** 主键ID，主键，自增长列表 */ /** 主键ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 主键ID，主键，自增长排除列表 */
private List <Long> idNotList;
/** 设备名称 */ /** 设备名称 */
private List<String> deviceNameList; private List<String> deviceNameList;
/** 设备名称排除列表 */
private List <String> deviceNameNotList;
/** 设备编码,SN码等，默认为MAC地址 */ /** 设备编码,SN码等，默认为MAC地址 */
private List<String> deviceCodeList; private List<String> deviceCodeList;
/** 设备SN码 */ /** 设备编码,SN码等，默认为MAC地址排除列表 */
private List<String> deviceSNList; private List <String> deviceCodeNotList;
/** 设备的MAC地址 */ /** 设备的MAC地址 */
private List<String> deviceMacList; private List<String> deviceMacList;
/** 设备的MAC地址排除列表 */
private List <String> deviceMacNotList;
/** 开始 站点Id，来源基础服务平台 */ /** 开始 站点Id，来源基础服务平台 */
private Long siteIdStart; private Long siteIdStart;
...@@ -46,12 +50,19 @@ public class DeviceQuery extends DeviceEntity { ...@@ -46,12 +50,19 @@ public class DeviceQuery extends DeviceEntity {
/** 站点Id，来源基础服务平台列表 */ /** 站点Id，来源基础服务平台列表 */
private List <Long> siteIdList; private List <Long> siteIdList;
/** 站点Id，来源基础服务平台排除列表 */
private List <Long> siteIdNotList;
/** 站点编号，来源基础服务平台 */ /** 站点编号，来源基础服务平台 */
private List<String> siteCodeList; private List<String> siteCodeList;
/** 站点编号，来源基础服务平台排除列表 */
private List <String> siteCodeNotList;
/** 站点名称 */ /** 站点名称 */
private List<String> siteNameList; private List<String> siteNameList;
/** 站点名称排除列表 */
private List <String> siteNameNotList;
/** 开始 平台系统Id */ /** 开始 平台系统Id */
private Long platformIdStart; private Long platformIdStart;
...@@ -64,9 +75,14 @@ public class DeviceQuery extends DeviceEntity { ...@@ -64,9 +75,14 @@ public class DeviceQuery extends DeviceEntity {
/** 平台系统Id列表 */ /** 平台系统Id列表 */
private List <Long> platformIdList; private List <Long> platformIdList;
/** 平台系统Id排除列表 */
private List <Long> platformIdNotList;
/** 平台系统名称 */ /** 平台系统名称 */
private List<String> platformNameList; private List<String> platformNameList;
/** 平台系统名称排除列表 */
private List <String> platformNameNotList;
/** 开始 产品Id */ /** 开始 产品Id */
private Long productIdStart; private Long productIdStart;
...@@ -79,9 +95,14 @@ public class DeviceQuery extends DeviceEntity { ...@@ -79,9 +95,14 @@ public class DeviceQuery extends DeviceEntity {
/** 产品Id列表 */ /** 产品Id列表 */
private List <Long> productIdList; private List <Long> productIdList;
/** 产品Id排除列表 */
private List <Long> productIdNotList;
/** 产品名称 */ /** 产品名称 */
private List<String> productNameList; private List<String> productNameList;
/** 产品名称排除列表 */
private List <String> productNameNotList;
/** 开始 皮肤id */ /** 开始 皮肤id */
private Long skinIdStart; private Long skinIdStart;
...@@ -94,12 +115,19 @@ public class DeviceQuery extends DeviceEntity { ...@@ -94,12 +115,19 @@ public class DeviceQuery extends DeviceEntity {
/** 皮肤id列表 */ /** 皮肤id列表 */
private List <Long> skinIdList; private List <Long> skinIdList;
/** 皮肤id排除列表 */
private List <Long> skinIdNotList;
/** 皮肤名称 */ /** 皮肤名称 */
private List<String> skinNameList; private List<String> skinNameList;
/** 皮肤名称排除列表 */
private List <String> skinNameNotList;
/** 首页地址 */ /** 首页地址 */
private List<String> homeUrlList; private List<String> homeUrlList;
/** 首页地址排除列表 */
private List <String> homeUrlNotList;
/** 开始 设备生产厂商ID */ /** 开始 设备生产厂商ID */
private Long deviceFirmIdStart; private Long deviceFirmIdStart;
...@@ -112,9 +140,14 @@ public class DeviceQuery extends DeviceEntity { ...@@ -112,9 +140,14 @@ public class DeviceQuery extends DeviceEntity {
/** 设备生产厂商ID列表 */ /** 设备生产厂商ID列表 */
private List <Long> deviceFirmIdList; private List <Long> deviceFirmIdList;
/** 设备生产厂商ID排除列表 */
private List <Long> deviceFirmIdNotList;
/** 设备生产厂商名称 */ /** 设备生产厂商名称 */
private List<String> deviceFirmnameList; private List<String> deviceFirmnameList;
/** 设备生产厂商名称排除列表 */
private List <String> deviceFirmnameNotList;
/** 开始 设备来源(0.子设备，1.网关设备，2.直连设备) */ /** 开始 设备来源(0.子设备，1.网关设备，2.直连设备) */
private Integer deviceSrcStart; private Integer deviceSrcStart;
...@@ -127,6 +160,9 @@ public class DeviceQuery extends DeviceEntity { ...@@ -127,6 +160,9 @@ public class DeviceQuery extends DeviceEntity {
/** 设备来源(0.子设备，1.网关设备，2.直连设备)列表 */ /** 设备来源(0.子设备，1.网关设备，2.直连设备)列表 */
private List <Integer> deviceSrcList; private List <Integer> deviceSrcList;
/** 设备来源(0.子设备，1.网关设备，2.直连设备)排除列表 */
private List <Integer> deviceSrcNotList;
/** 开始 数据获取方式(0.主动上报，1.被动拉取) */ /** 开始 数据获取方式(0.主动上报，1.被动拉取) */
private Integer deviceDataSourceWayStart; private Integer deviceDataSourceWayStart;
...@@ -139,12 +175,19 @@ public class DeviceQuery extends DeviceEntity { ...@@ -139,12 +175,19 @@ public class DeviceQuery extends DeviceEntity {
/** 数据获取方式(0.主动上报，1.被动拉取)列表 */ /** 数据获取方式(0.主动上报，1.被动拉取)列表 */
private List <Integer> deviceDataSourceWayList; private List <Integer> deviceDataSourceWayList;
/** 数据获取方式(0.主动上报，1.被动拉取)排除列表 */
private List <Integer> deviceDataSourceWayNotList;
/** 经度 */ /** 经度 */
private List<String> lonList; private List<String> lonList;
/** 经度排除列表 */
private List <String> lonNotList;
/** 经度 */ /** 经度 */
private List<String> latiList; private List<String> latiList;
/** 经度排除列表 */
private List <String> latiNotList;
/** 开始 所属楼栋 */ /** 开始 所属楼栋 */
private Integer deviceInBuildingStart; private Integer deviceInBuildingStart;
...@@ -157,6 +200,9 @@ public class DeviceQuery extends DeviceEntity { ...@@ -157,6 +200,9 @@ public class DeviceQuery extends DeviceEntity {
/** 所属楼栋列表 */ /** 所属楼栋列表 */
private List <Integer> deviceInBuildingList; private List <Integer> deviceInBuildingList;
/** 所属楼栋排除列表 */
private List <Integer> deviceInBuildingNotList;
/** 开始 所属楼层 */ /** 开始 所属楼层 */
private Integer deviceInFloorStart; private Integer deviceInFloorStart;
...@@ -169,6 +215,9 @@ public class DeviceQuery extends DeviceEntity { ...@@ -169,6 +215,9 @@ public class DeviceQuery extends DeviceEntity {
/** 所属楼层列表 */ /** 所属楼层列表 */
private List <Integer> deviceInFloorList; private List <Integer> deviceInFloorList;
/** 所属楼层排除列表 */
private List <Integer> deviceInFloorNotList;
/** 开始 保修期至 */ /** 开始 保修期至 */
private String defectsLiabilityPeriodStart; private String defectsLiabilityPeriodStart;
...@@ -178,9 +227,13 @@ public class DeviceQuery extends DeviceEntity { ...@@ -178,9 +227,13 @@ public class DeviceQuery extends DeviceEntity {
/** 负责人 */ /** 负责人 */
private List<String> leadingOfficialList; private List<String> leadingOfficialList;
/** 负责人排除列表 */
private List <String> leadingOfficialNotList;
/** 联系电话 */ /** 联系电话 */
private List<String> leadingOfficialTelephoneList; private List<String> leadingOfficialTelephoneList;
/** 联系电话排除列表 */
private List <String> leadingOfficialTelephoneNotList;
/** 开始 是否接收异常短(0.否，1.是) */ /** 开始 是否接收异常短(0.否，1.是) */
private Integer isReceiveMessStart; private Integer isReceiveMessStart;
...@@ -193,21 +246,34 @@ public class DeviceQuery extends DeviceEntity { ...@@ -193,21 +246,34 @@ public class DeviceQuery extends DeviceEntity {
/** 是否接收异常短(0.否，1.是)列表 */ /** 是否接收异常短(0.否，1.是)列表 */
private List <Integer> isReceiveMessList; private List <Integer> isReceiveMessList;
/** 是否接收异常短(0.否，1.是)排除列表 */
private List <Integer> isReceiveMessNotList;
/** 设备图片 */ /** 设备图片 */
private List<String> devicePhotoPathList; private List<String> devicePhotoPathList;
/** 设备图片排除列表 */
private List <String> devicePhotoPathNotList;
/** 设备访问ip */ /** 设备访问ip */
private List<String> ipList; private List<String> ipList;
/** 设备访问ip排除列表 */
private List <String> ipNotList;
/** 中心设备编码 */ /** 中心设备编码 */
private List<String> centernumList; private List<String> centernumList;
/** 中心设备编码排除列表 */
private List <String> centernumNotList;
/** 端口 */ /** 端口 */
private List<String> portList; private List<String> portList;
/** 端口排除列表 */
private List <String> portNotList;
/** 设备topic信息 */ /** 设备topic信息 */
private List<String> deviceTopicList; private List<String> deviceTopicList;
/** 设备topic信息排除列表 */
private List <String> deviceTopicNotList;
/** 开始 设备状态 (0.未激活，1.离线,2.在线) */ /** 开始 设备状态 (0.未激活，1.离线,2.在线) */
private Integer deviceStatusStart; private Integer deviceStatusStart;
...@@ -220,6 +286,9 @@ public class DeviceQuery extends DeviceEntity { ...@@ -220,6 +286,9 @@ public class DeviceQuery extends DeviceEntity {
/** 设备状态 (0.未激活，1.离线,2.在线)列表 */ /** 设备状态 (0.未激活，1.离线,2.在线)列表 */
private List <Integer> deviceStatusList; private List <Integer> deviceStatusList;
/** 设备状态 (0.未激活，1.离线,2.在线)排除列表 */
private List <Integer> deviceStatusNotList;
/** 开始 启用状态 (0.停止，1.启用) */ /** 开始 启用状态 (0.停止，1.启用) */
private Integer enabledStart; private Integer enabledStart;
...@@ -232,12 +301,19 @@ public class DeviceQuery extends DeviceEntity { ...@@ -232,12 +301,19 @@ public class DeviceQuery extends DeviceEntity {
/** 启用状态 (0.停止，1.启用)列表 */ /** 启用状态 (0.停止，1.启用)列表 */
private List <Integer> enabledList; private List <Integer> enabledList;
/** 启用状态 (0.停止，1.启用)排除列表 */
private List <Integer> enabledNotList;
/** 设备授权码 */ /** 设备授权码 */
private List<String> deviceAuthCodeList; private List<String> deviceAuthCodeList;
/** 设备授权码排除列表 */
private List <String> deviceAuthCodeNotList;
/** 备注 */ /** 备注 */
private List<String> deviceRemarkList; private List<String> deviceRemarkList;
/** 备注排除列表 */
private List <String> deviceRemarkNotList;
/** 开始 最近上线时间 */ /** 开始 最近上线时间 */
private String onlineTimeStart; private String onlineTimeStart;
...@@ -262,8 +338,8 @@ public class DeviceQuery extends DeviceEntity { ...@@ -262,8 +338,8 @@ public class DeviceQuery extends DeviceEntity {
/** 是否删除(0.否，1.是)列表 */ /** 是否删除(0.否，1.是)列表 */
private List <Integer> deletedList; private List <Integer> deletedList;
/** 设备版本 */ /** 是否删除(0.否，1.是)排除列表 */
private List<String> deviceVersionList; private List <Integer> deletedNotList;
/** 开始 设备来源(0.旧设备，1.新设备) */ /** 开始 设备来源(0.旧设备，1.新设备) */
private Integer sourceStart; private Integer sourceStart;
...@@ -277,6 +353,9 @@ public class DeviceQuery extends DeviceEntity { ...@@ -277,6 +353,9 @@ public class DeviceQuery extends DeviceEntity {
/** 设备来源(0.旧设备，1.新设备)列表 */ /** 设备来源(0.旧设备，1.新设备)列表 */
private List <Integer> sourceList; private List <Integer> sourceList;
/** 设备来源(0.旧设备，1.新设备)排除列表 */
private List <Integer> sourceNotList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -289,6 +368,9 @@ public class DeviceQuery extends DeviceEntity { ...@@ -289,6 +368,9 @@ public class DeviceQuery extends DeviceEntity {
/** 创建用户列表 */ /** 创建用户列表 */
private List <Long> createUserIdList; private List <Long> createUserIdList;
/** 创建用户排除列表 */
private List <Long> createUserIdNotList;
/** 开始 创建时间 */ /** 开始 创建时间 */
private String createTimeStart; private String createTimeStart;
...@@ -307,12 +389,30 @@ public class DeviceQuery extends DeviceEntity { ...@@ -307,12 +389,30 @@ public class DeviceQuery extends DeviceEntity {
/** 更新用户列表 */ /** 更新用户列表 */
private List <Long> updateUserIdList; private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */ /** 开始 更新时间 */
private String updateTimeStart; private String updateTimeStart;
/** 结束 更新时间 */ /** 结束 更新时间 */
private String updateTimeEnd; private String updateTimeEnd;
/** 设备SN码 */
private List<String> deviceSNList;
/** 设备SN码排除列表 */
private List <String> deviceSNNotList;
/** 设备版本 */
private List<String> deviceVersionList;
/** 设备版本排除列表 */
private List <String> deviceVersionNotList;
/** 产品编码 */
private List<String> productCodeList;
/** 产品编码排除列表 */
private List <String> productCodeNotList;
/** 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;
...@@ -385,6 +485,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -385,6 +485,23 @@ public class DeviceQuery extends DeviceEntity {
this.idList = idList; this.idList = idList;
} }
/**
* 获取 主键ID，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/** /**
* 获取 设备名称 * 获取 设备名称
* @return deviceNameList * @return deviceNameList
...@@ -400,6 +517,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -400,6 +517,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDeviceNameList(List<String> deviceNameList){ public void setDeviceNameList(List<String> deviceNameList){
this.deviceNameList = deviceNameList; this.deviceNameList = deviceNameList;
} }
/**
* 获取 设备名称
* @return deviceNameNotList
*/
public List<String> getDeviceNameNotList(){
return this.deviceNameNotList;
}
/**
* 设置 设备名称
* @param deviceNameNotList
*/
public void setDeviceNameNotList(List<String> deviceNameNotList){
this.deviceNameNotList = deviceNameNotList;
}
/** /**
* 获取 设备编码,SN码等，默认为MAC地址 * 获取 设备编码,SN码等，默认为MAC地址
* @return deviceCodeList * @return deviceCodeList
...@@ -415,21 +549,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -415,21 +549,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDeviceCodeList(List<String> deviceCodeList){ public void setDeviceCodeList(List<String> deviceCodeList){
this.deviceCodeList = deviceCodeList; this.deviceCodeList = deviceCodeList;
} }
/** /**
* 获取 设备SN码 * 获取 设备编码,SN码等，默认为MAC地址
* @return deviceSNList * @return deviceCodeNotList
*/ */
public List<String> getDeviceSNList(){ public List<String> getDeviceCodeNotList(){
return this.deviceSNList; return this.deviceCodeNotList;
} }
/** /**
* 设置 设备SN码 * 设置 设备编码,SN码等，默认为MAC地址
* @param deviceSNList * @param deviceCodeNotList
*/ */
public void setDeviceSNList(List<String> deviceSNList){ public void setDeviceCodeNotList(List<String> deviceCodeNotList){
this.deviceSNList = deviceSNList; this.deviceCodeNotList = deviceCodeNotList;
} }
/** /**
* 获取 设备的MAC地址 * 获取 设备的MAC地址
* @return deviceMacList * @return deviceMacList
...@@ -445,6 +581,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -445,6 +581,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDeviceMacList(List<String> deviceMacList){ public void setDeviceMacList(List<String> deviceMacList){
this.deviceMacList = deviceMacList; this.deviceMacList = deviceMacList;
} }
/**
* 获取 设备的MAC地址
* @return deviceMacNotList
*/
public List<String> getDeviceMacNotList(){
return this.deviceMacNotList;
}
/**
* 设置 设备的MAC地址
* @param deviceMacNotList
*/
public void setDeviceMacNotList(List<String> deviceMacNotList){
this.deviceMacNotList = deviceMacNotList;
}
/** /**
* 获取 开始 站点Id，来源基础服务平台 * 获取 开始 站点Id，来源基础服务平台
* @return siteIdStart * @return siteIdStart
...@@ -509,6 +662,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -509,6 +662,23 @@ public class DeviceQuery extends DeviceEntity {
this.siteIdList = siteIdList; this.siteIdList = siteIdList;
} }
/**
* 获取 站点Id，来源基础服务平台
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/** /**
* 获取 站点编号，来源基础服务平台 * 获取 站点编号，来源基础服务平台
* @return siteCodeList * @return siteCodeList
...@@ -524,6 +694,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -524,6 +694,23 @@ public class DeviceQuery extends DeviceEntity {
public void setSiteCodeList(List<String> siteCodeList){ public void setSiteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList; this.siteCodeList = siteCodeList;
} }
/**
* 获取 站点编号，来源基础服务平台
* @return siteCodeNotList
*/
public List<String> getSiteCodeNotList(){
return this.siteCodeNotList;
}
/**
* 设置 站点编号，来源基础服务平台
* @param siteCodeNotList
*/
public void setSiteCodeNotList(List<String> siteCodeNotList){
this.siteCodeNotList = siteCodeNotList;
}
/** /**
* 获取 站点名称 * 获取 站点名称
* @return siteNameList * @return siteNameList
...@@ -539,6 +726,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -539,6 +726,23 @@ public class DeviceQuery extends DeviceEntity {
public void setSiteNameList(List<String> siteNameList){ public void setSiteNameList(List<String> siteNameList){
this.siteNameList = siteNameList; this.siteNameList = siteNameList;
} }
/**
* 获取 站点名称
* @return siteNameNotList
*/
public List<String> getSiteNameNotList(){
return this.siteNameNotList;
}
/**
* 设置 站点名称
* @param siteNameNotList
*/
public void setSiteNameNotList(List<String> siteNameNotList){
this.siteNameNotList = siteNameNotList;
}
/** /**
* 获取 开始 平台系统Id * 获取 开始 平台系统Id
* @return platformIdStart * @return platformIdStart
...@@ -603,6 +807,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -603,6 +807,23 @@ public class DeviceQuery extends DeviceEntity {
this.platformIdList = platformIdList; this.platformIdList = platformIdList;
} }
/**
* 获取 平台系统Id
* @return platformIdNotList
*/
public List<Long> getPlatformIdNotList(){
return this.platformIdNotList;
}
/**
* 设置 平台系统Id
* @param platformIdNotList
*/
public void setPlatformIdNotList(List<Long> platformIdNotList){
this.platformIdNotList = platformIdNotList;
}
/** /**
* 获取 平台系统名称 * 获取 平台系统名称
* @return platformNameList * @return platformNameList
...@@ -618,6 +839,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -618,6 +839,23 @@ public class DeviceQuery extends DeviceEntity {
public void setPlatformNameList(List<String> platformNameList){ public void setPlatformNameList(List<String> platformNameList){
this.platformNameList = platformNameList; this.platformNameList = platformNameList;
} }
/**
* 获取 平台系统名称
* @return platformNameNotList
*/
public List<String> getPlatformNameNotList(){
return this.platformNameNotList;
}
/**
* 设置 平台系统名称
* @param platformNameNotList
*/
public void setPlatformNameNotList(List<String> platformNameNotList){
this.platformNameNotList = platformNameNotList;
}
/** /**
* 获取 开始 产品Id * 获取 开始 产品Id
* @return productIdStart * @return productIdStart
...@@ -682,6 +920,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -682,6 +920,23 @@ public class DeviceQuery extends DeviceEntity {
this.productIdList = productIdList; this.productIdList = productIdList;
} }
/**
* 获取 产品Id
* @return productIdNotList
*/
public List<Long> getProductIdNotList(){
return this.productIdNotList;
}
/**
* 设置 产品Id
* @param productIdNotList
*/
public void setProductIdNotList(List<Long> productIdNotList){
this.productIdNotList = productIdNotList;
}
/** /**
* 获取 产品名称 * 获取 产品名称
* @return productNameList * @return productNameList
...@@ -697,6 +952,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -697,6 +952,23 @@ public class DeviceQuery extends DeviceEntity {
public void setProductNameList(List<String> productNameList){ public void setProductNameList(List<String> productNameList){
this.productNameList = productNameList; this.productNameList = productNameList;
} }
/**
* 获取 产品名称
* @return productNameNotList
*/
public List<String> getProductNameNotList(){
return this.productNameNotList;
}
/**
* 设置 产品名称
* @param productNameNotList
*/
public void setProductNameNotList(List<String> productNameNotList){
this.productNameNotList = productNameNotList;
}
/** /**
* 获取 开始 皮肤id * 获取 开始 皮肤id
* @return skinIdStart * @return skinIdStart
...@@ -761,6 +1033,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -761,6 +1033,23 @@ public class DeviceQuery extends DeviceEntity {
this.skinIdList = skinIdList; this.skinIdList = skinIdList;
} }
/**
* 获取 皮肤id
* @return skinIdNotList
*/
public List<Long> getSkinIdNotList(){
return this.skinIdNotList;
}
/**
* 设置 皮肤id
* @param skinIdNotList
*/
public void setSkinIdNotList(List<Long> skinIdNotList){
this.skinIdNotList = skinIdNotList;
}
/** /**
* 获取 皮肤名称 * 获取 皮肤名称
* @return skinNameList * @return skinNameList
...@@ -776,6 +1065,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -776,6 +1065,23 @@ public class DeviceQuery extends DeviceEntity {
public void setSkinNameList(List<String> skinNameList){ public void setSkinNameList(List<String> skinNameList){
this.skinNameList = skinNameList; this.skinNameList = skinNameList;
} }
/**
* 获取 皮肤名称
* @return skinNameNotList
*/
public List<String> getSkinNameNotList(){
return this.skinNameNotList;
}
/**
* 设置 皮肤名称
* @param skinNameNotList
*/
public void setSkinNameNotList(List<String> skinNameNotList){
this.skinNameNotList = skinNameNotList;
}
/** /**
* 获取 首页地址 * 获取 首页地址
* @return homeUrlList * @return homeUrlList
...@@ -791,6 +1097,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -791,6 +1097,23 @@ public class DeviceQuery extends DeviceEntity {
public void setHomeUrlList(List<String> homeUrlList){ public void setHomeUrlList(List<String> homeUrlList){
this.homeUrlList = homeUrlList; this.homeUrlList = homeUrlList;
} }
/**
* 获取 首页地址
* @return homeUrlNotList
*/
public List<String> getHomeUrlNotList(){
return this.homeUrlNotList;
}
/**
* 设置 首页地址
* @param homeUrlNotList
*/
public void setHomeUrlNotList(List<String> homeUrlNotList){
this.homeUrlNotList = homeUrlNotList;
}
/** /**
* 获取 开始 设备生产厂商ID * 获取 开始 设备生产厂商ID
* @return deviceFirmIdStart * @return deviceFirmIdStart
...@@ -855,6 +1178,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -855,6 +1178,23 @@ public class DeviceQuery extends DeviceEntity {
this.deviceFirmIdList = deviceFirmIdList; this.deviceFirmIdList = deviceFirmIdList;
} }
/**
* 获取 设备生产厂商ID
* @return deviceFirmIdNotList
*/
public List<Long> getDeviceFirmIdNotList(){
return this.deviceFirmIdNotList;
}
/**
* 设置 设备生产厂商ID
* @param deviceFirmIdNotList
*/
public void setDeviceFirmIdNotList(List<Long> deviceFirmIdNotList){
this.deviceFirmIdNotList = deviceFirmIdNotList;
}
/** /**
* 获取 设备生产厂商名称 * 获取 设备生产厂商名称
* @return deviceFirmnameList * @return deviceFirmnameList
...@@ -870,6 +1210,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -870,6 +1210,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDeviceFirmnameList(List<String> deviceFirmnameList){ public void setDeviceFirmnameList(List<String> deviceFirmnameList){
this.deviceFirmnameList = deviceFirmnameList; this.deviceFirmnameList = deviceFirmnameList;
} }
/**
* 获取 设备生产厂商名称
* @return deviceFirmnameNotList
*/
public List<String> getDeviceFirmnameNotList(){
return this.deviceFirmnameNotList;
}
/**
* 设置 设备生产厂商名称
* @param deviceFirmnameNotList
*/
public void setDeviceFirmnameNotList(List<String> deviceFirmnameNotList){
this.deviceFirmnameNotList = deviceFirmnameNotList;
}
/** /**
* 获取 开始 设备来源(0.子设备，1.网关设备，2.直连设备) * 获取 开始 设备来源(0.子设备，1.网关设备，2.直连设备)
* @return deviceSrcStart * @return deviceSrcStart
...@@ -934,6 +1291,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -934,6 +1291,23 @@ public class DeviceQuery extends DeviceEntity {
this.deviceSrcList = deviceSrcList; this.deviceSrcList = deviceSrcList;
} }
/**
* 获取 设备来源(0.子设备，1.网关设备，2.直连设备)
* @return deviceSrcNotList
*/
public List<Integer> getDeviceSrcNotList(){
return this.deviceSrcNotList;
}
/**
* 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrcNotList
*/
public void setDeviceSrcNotList(List<Integer> deviceSrcNotList){
this.deviceSrcNotList = deviceSrcNotList;
}
/** /**
* 获取 开始 数据获取方式(0.主动上报，1.被动拉取) * 获取 开始 数据获取方式(0.主动上报，1.被动拉取)
* @return deviceDataSourceWayStart * @return deviceDataSourceWayStart
...@@ -998,6 +1372,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -998,6 +1372,23 @@ public class DeviceQuery extends DeviceEntity {
this.deviceDataSourceWayList = deviceDataSourceWayList; this.deviceDataSourceWayList = deviceDataSourceWayList;
} }
/**
* 获取 数据获取方式(0.主动上报，1.被动拉取)
* @return deviceDataSourceWayNotList
*/
public List<Integer> getDeviceDataSourceWayNotList(){
return this.deviceDataSourceWayNotList;
}
/**
* 设置 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWayNotList
*/
public void setDeviceDataSourceWayNotList(List<Integer> deviceDataSourceWayNotList){
this.deviceDataSourceWayNotList = deviceDataSourceWayNotList;
}
/** /**
* 获取 经度 * 获取 经度
* @return lonList * @return lonList
...@@ -1013,6 +1404,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1013,6 +1404,23 @@ public class DeviceQuery extends DeviceEntity {
public void setLonList(List<String> lonList){ public void setLonList(List<String> lonList){
this.lonList = lonList; this.lonList = lonList;
} }
/**
* 获取 经度
* @return lonNotList
*/
public List<String> getLonNotList(){
return this.lonNotList;
}
/**
* 设置 经度
* @param lonNotList
*/
public void setLonNotList(List<String> lonNotList){
this.lonNotList = lonNotList;
}
/** /**
* 获取 经度 * 获取 经度
* @return latiList * @return latiList
...@@ -1028,6 +1436,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1028,6 +1436,23 @@ public class DeviceQuery extends DeviceEntity {
public void setLatiList(List<String> latiList){ public void setLatiList(List<String> latiList){
this.latiList = latiList; this.latiList = latiList;
} }
/**
* 获取 经度
* @return latiNotList
*/
public List<String> getLatiNotList(){
return this.latiNotList;
}
/**
* 设置 经度
* @param latiNotList
*/
public void setLatiNotList(List<String> latiNotList){
this.latiNotList = latiNotList;
}
/** /**
* 获取 开始 所属楼栋 * 获取 开始 所属楼栋
* @return deviceInBuildingStart * @return deviceInBuildingStart
...@@ -1093,16 +1518,33 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1093,16 +1518,33 @@ public class DeviceQuery extends DeviceEntity {
} }
/** /**
* 获取 开始 所属楼层 * 获取 所属楼栋
* @return deviceInFloorStart * @return deviceInBuildingNotList
*/ */
public Integer getDeviceInFloorStart(){ public List<Integer> getDeviceInBuildingNotList(){
return this.deviceInFloorStart; return this.deviceInBuildingNotList;
} }
/** /**
* 设置 开始 所属楼层 * 设置 所属楼栋
* @param deviceInFloorStart * @param deviceInBuildingNotList
*/
public void setDeviceInBuildingNotList(List<Integer> deviceInBuildingNotList){
this.deviceInBuildingNotList = deviceInBuildingNotList;
}
/**
* 获取 开始 所属楼层
* @return deviceInFloorStart
*/
public Integer getDeviceInFloorStart(){
return this.deviceInFloorStart;
}
/**
* 设置 开始 所属楼层
* @param deviceInFloorStart
*/ */
public void setDeviceInFloorStart(Integer deviceInFloorStart){ public void setDeviceInFloorStart(Integer deviceInFloorStart){
this.deviceInFloorStart = deviceInFloorStart; this.deviceInFloorStart = deviceInFloorStart;
...@@ -1156,6 +1598,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1156,6 +1598,23 @@ public class DeviceQuery extends DeviceEntity {
this.deviceInFloorList = deviceInFloorList; this.deviceInFloorList = deviceInFloorList;
} }
/**
* 获取 所属楼层
* @return deviceInFloorNotList
*/
public List<Integer> getDeviceInFloorNotList(){
return this.deviceInFloorNotList;
}
/**
* 设置 所属楼层
* @param deviceInFloorNotList
*/
public void setDeviceInFloorNotList(List<Integer> deviceInFloorNotList){
this.deviceInFloorNotList = deviceInFloorNotList;
}
/** /**
* 获取 开始 保修期至 * 获取 开始 保修期至
* @return defectsLiabilityPeriodStart * @return defectsLiabilityPeriodStart
...@@ -1203,6 +1662,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1203,6 +1662,23 @@ public class DeviceQuery extends DeviceEntity {
public void setLeadingOfficialList(List<String> leadingOfficialList){ public void setLeadingOfficialList(List<String> leadingOfficialList){
this.leadingOfficialList = leadingOfficialList; this.leadingOfficialList = leadingOfficialList;
} }
/**
* 获取 负责人
* @return leadingOfficialNotList
*/
public List<String> getLeadingOfficialNotList(){
return this.leadingOfficialNotList;
}
/**
* 设置 负责人
* @param leadingOfficialNotList
*/
public void setLeadingOfficialNotList(List<String> leadingOfficialNotList){
this.leadingOfficialNotList = leadingOfficialNotList;
}
/** /**
* 获取 联系电话 * 获取 联系电话
* @return leadingOfficialTelephoneList * @return leadingOfficialTelephoneList
...@@ -1218,6 +1694,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1218,6 +1694,23 @@ public class DeviceQuery extends DeviceEntity {
public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){ public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
this.leadingOfficialTelephoneList = leadingOfficialTelephoneList; this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
} }
/**
* 获取 联系电话
* @return leadingOfficialTelephoneNotList
*/
public List<String> getLeadingOfficialTelephoneNotList(){
return this.leadingOfficialTelephoneNotList;
}
/**
* 设置 联系电话
* @param leadingOfficialTelephoneNotList
*/
public void setLeadingOfficialTelephoneNotList(List<String> leadingOfficialTelephoneNotList){
this.leadingOfficialTelephoneNotList = leadingOfficialTelephoneNotList;
}
/** /**
* 获取 开始 是否接收异常短(0.否，1.是) * 获取 开始 是否接收异常短(0.否，1.是)
* @return isReceiveMessStart * @return isReceiveMessStart
...@@ -1282,6 +1775,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1282,6 +1775,23 @@ public class DeviceQuery extends DeviceEntity {
this.isReceiveMessList = isReceiveMessList; this.isReceiveMessList = isReceiveMessList;
} }
/**
* 获取 是否接收异常短(0.否，1.是)
* @return isReceiveMessNotList
*/
public List<Integer> getIsReceiveMessNotList(){
return this.isReceiveMessNotList;
}
/**
* 设置 是否接收异常短(0.否，1.是)
* @param isReceiveMessNotList
*/
public void setIsReceiveMessNotList(List<Integer> isReceiveMessNotList){
this.isReceiveMessNotList = isReceiveMessNotList;
}
/** /**
* 获取 设备图片 * 获取 设备图片
* @return devicePhotoPathList * @return devicePhotoPathList
...@@ -1297,6 +1807,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1297,6 +1807,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDevicePhotoPathList(List<String> devicePhotoPathList){ public void setDevicePhotoPathList(List<String> devicePhotoPathList){
this.devicePhotoPathList = devicePhotoPathList; this.devicePhotoPathList = devicePhotoPathList;
} }
/**
* 获取 设备图片
* @return devicePhotoPathNotList
*/
public List<String> getDevicePhotoPathNotList(){
return this.devicePhotoPathNotList;
}
/**
* 设置 设备图片
* @param devicePhotoPathNotList
*/
public void setDevicePhotoPathNotList(List<String> devicePhotoPathNotList){
this.devicePhotoPathNotList = devicePhotoPathNotList;
}
/** /**
* 获取 设备访问ip * 获取 设备访问ip
* @return ipList * @return ipList
...@@ -1312,6 +1839,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1312,6 +1839,23 @@ public class DeviceQuery extends DeviceEntity {
public void setIpList(List<String> ipList){ public void setIpList(List<String> ipList){
this.ipList = ipList; this.ipList = ipList;
} }
/**
* 获取 设备访问ip
* @return ipNotList
*/
public List<String> getIpNotList(){
return this.ipNotList;
}
/**
* 设置 设备访问ip
* @param ipNotList
*/
public void setIpNotList(List<String> ipNotList){
this.ipNotList = ipNotList;
}
/** /**
* 获取 中心设备编码 * 获取 中心设备编码
* @return centernumList * @return centernumList
...@@ -1327,6 +1871,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1327,6 +1871,23 @@ public class DeviceQuery extends DeviceEntity {
public void setCenternumList(List<String> centernumList){ public void setCenternumList(List<String> centernumList){
this.centernumList = centernumList; this.centernumList = centernumList;
} }
/**
* 获取 中心设备编码
* @return centernumNotList
*/
public List<String> getCenternumNotList(){
return this.centernumNotList;
}
/**
* 设置 中心设备编码
* @param centernumNotList
*/
public void setCenternumNotList(List<String> centernumNotList){
this.centernumNotList = centernumNotList;
}
/** /**
* 获取 端口 * 获取 端口
* @return portList * @return portList
...@@ -1342,6 +1903,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1342,6 +1903,23 @@ public class DeviceQuery extends DeviceEntity {
public void setPortList(List<String> portList){ public void setPortList(List<String> portList){
this.portList = portList; this.portList = portList;
} }
/**
* 获取 端口
* @return portNotList
*/
public List<String> getPortNotList(){
return this.portNotList;
}
/**
* 设置 端口
* @param portNotList
*/
public void setPortNotList(List<String> portNotList){
this.portNotList = portNotList;
}
/** /**
* 获取 设备topic信息 * 获取 设备topic信息
* @return deviceTopicList * @return deviceTopicList
...@@ -1357,6 +1935,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1357,6 +1935,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDeviceTopicList(List<String> deviceTopicList){ public void setDeviceTopicList(List<String> deviceTopicList){
this.deviceTopicList = deviceTopicList; this.deviceTopicList = deviceTopicList;
} }
/**
* 获取 设备topic信息
* @return deviceTopicNotList
*/
public List<String> getDeviceTopicNotList(){
return this.deviceTopicNotList;
}
/**
* 设置 设备topic信息
* @param deviceTopicNotList
*/
public void setDeviceTopicNotList(List<String> deviceTopicNotList){
this.deviceTopicNotList = deviceTopicNotList;
}
/** /**
* 获取 开始 设备状态 (0.未激活，1.离线,2.在线) * 获取 开始 设备状态 (0.未激活，1.离线,2.在线)
* @return deviceStatusStart * @return deviceStatusStart
...@@ -1421,6 +2016,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1421,6 +2016,23 @@ public class DeviceQuery extends DeviceEntity {
this.deviceStatusList = deviceStatusList; this.deviceStatusList = deviceStatusList;
} }
/**
* 获取 设备状态 (0.未激活，1.离线,2.在线)
* @return deviceStatusNotList
*/
public List<Integer> getDeviceStatusNotList(){
return this.deviceStatusNotList;
}
/**
* 设置 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatusNotList
*/
public void setDeviceStatusNotList(List<Integer> deviceStatusNotList){
this.deviceStatusNotList = deviceStatusNotList;
}
/** /**
* 获取 开始 启用状态 (0.停止，1.启用) * 获取 开始 启用状态 (0.停止，1.启用)
* @return enabledStart * @return enabledStart
...@@ -1485,6 +2097,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1485,6 +2097,23 @@ public class DeviceQuery extends DeviceEntity {
this.enabledList = 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 deviceAuthCodeList * @return deviceAuthCodeList
...@@ -1500,6 +2129,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1500,6 +2129,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDeviceAuthCodeList(List<String> deviceAuthCodeList){ public void setDeviceAuthCodeList(List<String> deviceAuthCodeList){
this.deviceAuthCodeList = deviceAuthCodeList; this.deviceAuthCodeList = deviceAuthCodeList;
} }
/**
* 获取 设备授权码
* @return deviceAuthCodeNotList
*/
public List<String> getDeviceAuthCodeNotList(){
return this.deviceAuthCodeNotList;
}
/**
* 设置 设备授权码
* @param deviceAuthCodeNotList
*/
public void setDeviceAuthCodeNotList(List<String> deviceAuthCodeNotList){
this.deviceAuthCodeNotList = deviceAuthCodeNotList;
}
/** /**
* 获取 备注 * 获取 备注
* @return deviceRemarkList * @return deviceRemarkList
...@@ -1515,6 +2161,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1515,6 +2161,23 @@ public class DeviceQuery extends DeviceEntity {
public void setDeviceRemarkList(List<String> deviceRemarkList){ public void setDeviceRemarkList(List<String> deviceRemarkList){
this.deviceRemarkList = deviceRemarkList; this.deviceRemarkList = deviceRemarkList;
} }
/**
* 获取 备注
* @return deviceRemarkNotList
*/
public List<String> getDeviceRemarkNotList(){
return this.deviceRemarkNotList;
}
/**
* 设置 备注
* @param deviceRemarkNotList
*/
public void setDeviceRemarkNotList(List<String> deviceRemarkNotList){
this.deviceRemarkNotList = deviceRemarkNotList;
}
/** /**
* 获取 开始 最近上线时间 * 获取 开始 最近上线时间
* @return onlineTimeStart * @return onlineTimeStart
...@@ -1644,20 +2307,22 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1644,20 +2307,22 @@ public class DeviceQuery extends DeviceEntity {
} }
/** /**
* 获取 设备版本 * 获取 是否删除(0.否，1.是)
* @return deviceVersionList * @return deletedNotList
*/ */
public List<String> getDeviceVersionList(){ public List<Integer> getDeletedNotList(){
return this.deviceVersionList; return this.deletedNotList;
} }
/** /**
* 设置 设备版本 * 设置 是否删除(0.否，1.是)
* @param deviceVersionList * @param deletedNotList
*/ */
public void setDeviceVersionList(List<String> deviceVersionList){ public void setDeletedNotList(List<Integer> deletedNotList){
this.deviceVersionList = deviceVersionList; this.deletedNotList = deletedNotList;
} }
/** /**
* 获取 开始 设备来源(0.旧设备，1.新设备) * 获取 开始 设备来源(0.旧设备，1.新设备)
* @return sourceStart * @return sourceStart
...@@ -1722,6 +2387,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1722,6 +2387,23 @@ public class DeviceQuery extends DeviceEntity {
this.sourceList = 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 * @return createUserIdStart
...@@ -1786,6 +2468,23 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1786,6 +2468,23 @@ public class DeviceQuery extends DeviceEntity {
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/**
* 获取 创建用户
* @return createUserIdNotList
*/
public List<Long> getCreateUserIdNotList(){
return this.createUserIdNotList;
}
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public void setCreateUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
}
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
...@@ -1811,107 +2510,220 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1811,107 +2510,220 @@ public class DeviceQuery extends DeviceEntity {
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/
public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd;
}
/**
* 获取 开始 更新用户
* @return updateUserIdStart
*/
public Long getUpdateUserIdStart(){
return this.updateUserIdStart;
}
/**
* 设置 开始 更新用户
* @param updateUserIdStart
*/
public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart;
}
/**
* 获取 结束 更新用户
* @return $updateUserIdEnd
*/
public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd;
}
/**
* 设置 结束 更新用户
* @param updateUserIdEnd
*/
public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd;
}
/**
* 获取 增加 更新用户
* @return updateUserIdIncrement
*/
public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement;
}
/**
* 设置 增加 更新用户
* @param updateUserIdIncrement
*/
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement;
}
/**
* 获取 更新用户
* @return updateUserIdList
*/
public List<Long> getUpdateUserIdList(){
return this.updateUserIdList;
}
/**
* 设置 更新用户
* @param updateUserIdList
*/
public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList;
}
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/**
* 获取 开始 更新时间
* @return updateTimeStart
*/
public String getUpdateTimeStart(){
return this.updateTimeStart;
}
/**
* 设置 开始 更新时间
* @param updateTimeStart
*/
public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart;
}
/**
* 获取 结束 更新时间
* @return updateTimeEnd
*/
public String getUpdateTimeEnd(){
return this.updateTimeEnd;
}
/**
* 设置 结束 更新时间
* @param updateTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.createTimeEnd = createTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 获取 开始 更新用户 * 获取 设备SN码
* @return updateUserIdStart * @return deviceSNList
*/ */
public Long getUpdateUserIdStart(){ public List<String> getDeviceSNList(){
return this.updateUserIdStart; return this.deviceSNList;
} }
/** /**
* 设置 开始 更新用户 * 设置 设备SN码
* @param updateUserIdStart * @param deviceSNList
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setDeviceSNList(List<String> deviceSNList){
this.updateUserIdStart = updateUserIdStart; this.deviceSNList = deviceSNList;
} }
/** /**
* 获取 结束 更新用户 * 获取 设备SN码
* @return $updateUserIdEnd * @return deviceSNNotList
*/ */
public Long getUpdateUserIdEnd(){ public List<String> getDeviceSNNotList(){
return this.updateUserIdEnd; return this.deviceSNNotList;
} }
/** /**
* 设置 结束 更新用户 * 设置 设备SN码
* @param updateUserIdEnd * @param deviceSNNotList
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setDeviceSNNotList(List<String> deviceSNNotList){
this.updateUserIdEnd = updateUserIdEnd; this.deviceSNNotList = deviceSNNotList;
} }
/** /**
* 获取 增加 更新用户 * 获取 设备版本
* @return updateUserIdIncrement * @return deviceVersionList
*/ */
public Long getUpdateUserIdIncrement(){ public List<String> getDeviceVersionList(){
return this.updateUserIdIncrement; return this.deviceVersionList;
} }
/** /**
* 设置 增加 更新用户 * 设置 设备版本
* @param updateUserIdIncrement * @param deviceVersionList
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setDeviceVersionList(List<String> deviceVersionList){
this.updateUserIdIncrement = updateUserIdIncrement; this.deviceVersionList = deviceVersionList;
} }
/** /**
* 获取 更新用户 * 获取 设备版本
* @return updateUserIdList * @return deviceVersionNotList
*/ */
public List<Long> getUpdateUserIdList(){ public List<String> getDeviceVersionNotList(){
return this.updateUserIdList; return this.deviceVersionNotList;
} }
/** /**
* 设置 更新用户 * 设置 设备版本
* @param updateUserIdList * @param deviceVersionNotList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setDeviceVersionNotList(List<String> deviceVersionNotList){
this.updateUserIdList = updateUserIdList; this.deviceVersionNotList = deviceVersionNotList;
} }
/** /**
* 获取 开始 更新时间 * 获取 产品编码
* @return updateTimeStart * @return productCodeList
*/ */
public String getUpdateTimeStart(){ public List<String> getProductCodeList(){
return this.updateTimeStart; return this.productCodeList;
} }
/** /**
* 设置 开始 更新时间 * 设置 产品编码
* @param updateTimeStart * @param productCodeList
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setProductCodeList(List<String> productCodeList){
this.updateTimeStart = updateTimeStart; this.productCodeList = productCodeList;
} }
/** /**
* 获取 结束 更新时间 * 获取 产品编码
* @return updateTimeEnd * @return productCodeNotList
*/ */
public String getUpdateTimeEnd(){ public List<String> getProductCodeNotList(){
return this.updateTimeEnd; return this.productCodeNotList;
} }
/** /**
* 设置 结束 更新时间 * 设置 产品编码
* @param updateTimeEnd * @param productCodeNotList
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setProductCodeNotList(List<String> productCodeNotList){
this.updateTimeEnd = updateTimeEnd; this.productCodeNotList = productCodeNotList;
} }
/** /**
...@@ -1959,6 +2771,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1959,6 +2771,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public DeviceQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/** /**
* 设置 设备名称 * 设置 设备名称
...@@ -1998,25 +2819,6 @@ public class DeviceQuery extends DeviceEntity { ...@@ -1998,25 +2819,6 @@ public class DeviceQuery extends DeviceEntity {
} }
/**
* 设置 设备SN码
* @param deviceSN
*/
public DeviceQuery deviceSN(String deviceSN){
setDeviceSN(deviceSN);
return this;
}
/**
* 设置 设备SN码
* @param deviceSNList
*/
public DeviceQuery deviceSNList(List<String> deviceSNList){
this.deviceSNList = deviceSNList;
return this;
}
/** /**
* 设置 设备的MAC地址 * 设置 设备的MAC地址
* @param deviceMac * @param deviceMac
...@@ -2080,6 +2882,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2080,6 +2882,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdNotList
*/
public DeviceQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/** /**
* 设置 站点编号，来源基础服务平台 * 设置 站点编号，来源基础服务平台
...@@ -2163,6 +2974,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2163,6 +2974,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 平台系统Id
* @param platformIdNotList
*/
public DeviceQuery platformIdNotList(List<Long> platformIdNotList){
this.platformIdNotList = platformIdNotList;
return this;
}
/** /**
* 设置 平台系统名称 * 设置 平台系统名称
...@@ -2227,6 +3047,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2227,6 +3047,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 产品Id
* @param productIdNotList
*/
public DeviceQuery productIdNotList(List<Long> productIdNotList){
this.productIdNotList = productIdNotList;
return this;
}
/** /**
* 设置 产品名称 * 设置 产品名称
...@@ -2291,6 +3120,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2291,6 +3120,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 皮肤id
* @param skinIdNotList
*/
public DeviceQuery skinIdNotList(List<Long> skinIdNotList){
this.skinIdNotList = skinIdNotList;
return this;
}
/** /**
* 设置 皮肤名称 * 设置 皮肤名称
...@@ -2374,6 +3212,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2374,6 +3212,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 设备生产厂商ID
* @param deviceFirmIdNotList
*/
public DeviceQuery deviceFirmIdNotList(List<Long> deviceFirmIdNotList){
this.deviceFirmIdNotList = deviceFirmIdNotList;
return this;
}
/** /**
* 设置 设备生产厂商名称 * 设置 设备生产厂商名称
...@@ -2438,6 +3285,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2438,6 +3285,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrcNotList
*/
public DeviceQuery deviceSrcNotList(List<Integer> deviceSrcNotList){
this.deviceSrcNotList = deviceSrcNotList;
return this;
}
/** /**
* 设置 数据获取方式(0.主动上报，1.被动拉取) * 设置 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWay * @param deviceDataSourceWay
...@@ -2483,6 +3339,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2483,6 +3339,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWayNotList
*/
public DeviceQuery deviceDataSourceWayNotList(List<Integer> deviceDataSourceWayNotList){
this.deviceDataSourceWayNotList = deviceDataSourceWayNotList;
return this;
}
/** /**
* 设置 经度 * 设置 经度
...@@ -2566,6 +3431,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2566,6 +3431,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 所属楼栋
* @param deviceInBuildingNotList
*/
public DeviceQuery deviceInBuildingNotList(List<Integer> deviceInBuildingNotList){
this.deviceInBuildingNotList = deviceInBuildingNotList;
return this;
}
/** /**
* 设置 所属楼层 * 设置 所属楼层
* @param deviceInFloor * @param deviceInFloor
...@@ -2611,6 +3485,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2611,6 +3485,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 所属楼层
* @param deviceInFloorNotList
*/
public DeviceQuery deviceInFloorNotList(List<Integer> deviceInFloorNotList){
this.deviceInFloorNotList = deviceInFloorNotList;
return this;
}
/** /**
...@@ -2695,6 +3578,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2695,6 +3578,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 是否接收异常短(0.否，1.是)
* @param isReceiveMessNotList
*/
public DeviceQuery isReceiveMessNotList(List<Integer> isReceiveMessNotList){
this.isReceiveMessNotList = isReceiveMessNotList;
return this;
}
/** /**
* 设置 设备图片 * 设置 设备图片
...@@ -2835,6 +3727,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2835,6 +3727,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatusNotList
*/
public DeviceQuery deviceStatusNotList(List<Integer> deviceStatusNotList){
this.deviceStatusNotList = deviceStatusNotList;
return this;
}
/** /**
* 设置 启用状态 (0.停止，1.启用) * 设置 启用状态 (0.停止，1.启用)
* @param enabled * @param enabled
...@@ -2880,6 +3781,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2880,6 +3781,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 启用状态 (0.停止，1.启用)
* @param enabledNotList
*/
public DeviceQuery enabledNotList(List<Integer> enabledNotList){
this.enabledNotList = enabledNotList;
return this;
}
/** /**
* 设置 设备授权码 * 设置 设备授权码
...@@ -2965,22 +3875,12 @@ public class DeviceQuery extends DeviceEntity { ...@@ -2965,22 +3875,12 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 设备版本
* @param deviceVersion
*/
public DeviceQuery deviceVersion(String deviceVersion){
setDeviceVersion(deviceVersion);
return this;
}
/** /**
* 设置 设备版本 * 设置 是否删除(0.否，1.是)
* @param deviceVersionList * @param deletedNotList
*/ */
public DeviceQuery deviceVersionList(List<String> deviceVersionList){ public DeviceQuery deletedNotList(List<Integer> deletedNotList){
this.deviceVersionList = deviceVersionList; this.deletedNotList = deletedNotList;
return this; return this;
} }
...@@ -3029,6 +3929,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -3029,6 +3929,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 设备来源(0.旧设备，1.新设备)
* @param sourceNotList
*/
public DeviceQuery sourceNotList(List<Integer> sourceNotList){
this.sourceNotList = sourceNotList;
return this;
}
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
...@@ -3074,6 +3983,15 @@ public class DeviceQuery extends DeviceEntity { ...@@ -3074,6 +3983,15 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 创建用户
* @param createUserIdNotList
*/
public DeviceQuery createUserIdNotList(List<Long> createUserIdNotList){
this.createUserIdNotList = createUserIdNotList;
return this;
}
/** /**
* 设置 更新用户 * 设置 更新用户
...@@ -3120,6 +4038,72 @@ public class DeviceQuery extends DeviceEntity { ...@@ -3120,6 +4038,72 @@ public class DeviceQuery extends DeviceEntity {
return this; return this;
} }
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public DeviceQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 设备SN码
* @param deviceSN
*/
public DeviceQuery deviceSN(String deviceSN){
setDeviceSN(deviceSN);
return this;
}
/**
* 设置 设备SN码
* @param deviceSNList
*/
public DeviceQuery deviceSNList(List<String> deviceSNList){
this.deviceSNList = deviceSNList;
return this;
}
/**
* 设置 设备版本
* @param deviceVersion
*/
public DeviceQuery deviceVersion(String deviceVersion){
setDeviceVersion(deviceVersion);
return this;
}
/**
* 设置 设备版本
* @param deviceVersionList
*/
public DeviceQuery deviceVersionList(List<String> deviceVersionList){
this.deviceVersionList = deviceVersionList;
return this;
}
/**
* 设置 产品编码
* @param productCode
*/
public DeviceQuery productCode(String productCode){
setProductCode(productCode);
return this;
}
/**
* 设置 产品编码
* @param productCodeList
*/
public DeviceQuery productCodeList(List<String> productCodeList){
this.productCodeList = productCodeList;
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)
......
device-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml
View file @ dd534fb2
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
<id property="id" column="id" /> <id property="id" column="id" />
<result property="deviceName" column="deviceName" /> <result property="deviceName" column="deviceName" />
<result property="deviceCode" column="deviceCode" /> <result property="deviceCode" column="deviceCode" />
<result property="deviceSN" column="deviceSN" />
<result property="deviceMac" column="deviceMac" /> <result property="deviceMac" column="deviceMac" />
<result property="siteId" column="siteId" /> <result property="siteId" column="siteId" />
<result property="siteCode" column="siteCode" /> <result property="siteCode" column="siteCode" />
...@@ -44,12 +43,14 @@ ...@@ -44,12 +43,14 @@
<result property="onlineTime" column="onlineTime" /> <result property="onlineTime" column="onlineTime" />
<result property="offlineTime" column="offlineTime" /> <result property="offlineTime" column="offlineTime" />
<result property="deleted" column="deleted" /> <result property="deleted" column="deleted" />
<result property="deviceVersion" column="deviceVersion" />
<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="deviceSN" column="deviceSN" />
<result property="deviceVersion" column="deviceVersion" />
<result property="productCode" column="productCode" />
</resultMap> </resultMap>
...@@ -66,9 +67,6 @@ ...@@ -66,9 +67,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))">
a.deviceCode, a.deviceCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceSN') or colPickMode == 1 and data.containsKey('deviceSN')))">
a.deviceSN,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceMac') or colPickMode == 1 and data.containsKey('deviceMac')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceMac') or colPickMode == 1 and data.containsKey('deviceMac')))">
a.deviceMac, a.deviceMac,
</if> </if>
...@@ -174,9 +172,6 @@ ...@@ -174,9 +172,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deleted') or colPickMode == 1 and data.containsKey('deleted')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deleted') or colPickMode == 1 and data.containsKey('deleted')))">
a.deleted, a.deleted,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceVersion') or colPickMode == 1 and data.containsKey('deviceVersion')))">
a.deviceVersion,
</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>
...@@ -192,23 +187,32 @@ ...@@ -192,23 +187,32 @@
<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('deviceSN') or colPickMode == 1 and data.containsKey('deviceSN')))">
a.deviceSN,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceVersion') or colPickMode == 1 and data.containsKey('deviceVersion')))">
a.deviceVersion,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productCode') or colPickMode == 1 and data.containsKey('productCode')))">
a.productCode,
</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
(deviceName,deviceCode,deviceSN,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,skinId,skinName,homeUrl,deviceFirmId,deviceFirmname,deviceSrc,deviceDataSourceWay,lon,lati,deviceInBuilding,deviceInFloor,defectsLiabilityPeriod,leadingOfficial,leadingOfficialTelephone,isReceiveMess,devicePhotoPath,ip,centernum,port,deviceTopic,deviceStatus,enabled,deviceAuthCode,deviceRemark,onlineTime,offlineTime,deleted,deviceVersion,source,createUserId,createTime,updateUserId,updateTime) (deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,skinId,skinName,homeUrl,deviceFirmId,deviceFirmname,deviceSrc,deviceDataSourceWay,lon,lati,deviceInBuilding,deviceInFloor,defectsLiabilityPeriod,leadingOfficial,leadingOfficialTelephone,isReceiveMess,devicePhotoPath,ip,centernum,port,deviceTopic,deviceStatus,enabled,deviceAuthCode,deviceRemark,onlineTime,offlineTime,deleted,source,createUserId,createTime,updateUserId,updateTime,deviceSN,deviceVersion,productCode)
VALUES VALUES
(#{deviceName},#{deviceCode},#{deviceSN},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{platformId},#{platformName},#{productId},#{productName},#{skinId},#{skinName},#{homeUrl},#{deviceFirmId},#{deviceFirmname},#{deviceSrc},#{deviceDataSourceWay},#{lon},#{lati},#{deviceInBuilding},#{deviceInFloor},#{defectsLiabilityPeriod},#{leadingOfficial},#{leadingOfficialTelephone},#{isReceiveMess},#{devicePhotoPath},#{ip},#{centernum},#{port},#{deviceTopic},#{deviceStatus},#{enabled},#{deviceAuthCode},#{deviceRemark},#{onlineTime},#{offlineTime},#{deleted},#{deviceVersion},#{source},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{platformId},#{platformName},#{productId},#{productName},#{skinId},#{skinName},#{homeUrl},#{deviceFirmId},#{deviceFirmname},#{deviceSrc},#{deviceDataSourceWay},#{lon},#{lati},#{deviceInBuilding},#{deviceInFloor},#{defectsLiabilityPeriod},#{leadingOfficial},#{leadingOfficialTelephone},#{isReceiveMess},#{devicePhotoPath},#{ip},#{centernum},#{port},#{deviceTopic},#{deviceStatus},#{enabled},#{deviceAuthCode},#{deviceRemark},#{onlineTime},#{offlineTime},#{deleted},#{source},#{createUserId},#{createTime},#{updateUserId},#{updateTime},#{deviceSN},#{deviceVersion},#{productCode})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device insert into mortals_xhx_device
(deviceName,deviceCode,deviceSN,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,skinId,skinName,homeUrl,deviceFirmId,deviceFirmname,deviceSrc,deviceDataSourceWay,lon,lati,deviceInBuilding,deviceInFloor,defectsLiabilityPeriod,leadingOfficial,leadingOfficialTelephone,isReceiveMess,devicePhotoPath,ip,centernum,port,deviceTopic,deviceStatus,enabled,deviceAuthCode,deviceRemark,onlineTime,offlineTime,deleted,deviceVersion,source,createUserId,createTime,updateUserId,updateTime) (deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,skinId,skinName,homeUrl,deviceFirmId,deviceFirmname,deviceSrc,deviceDataSourceWay,lon,lati,deviceInBuilding,deviceInFloor,defectsLiabilityPeriod,leadingOfficial,leadingOfficialTelephone,isReceiveMess,devicePhotoPath,ip,centernum,port,deviceTopic,deviceStatus,enabled,deviceAuthCode,deviceRemark,onlineTime,offlineTime,deleted,source,createUserId,createTime,updateUserId,updateTime,deviceSN,deviceVersion,productCode)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.deviceName},#{item.deviceCode},#{item.deviceSN},#{item.deviceMac},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.platformId},#{item.platformName},#{item.productId},#{item.productName},#{item.skinId},#{item.skinName},#{item.homeUrl},#{item.deviceFirmId},#{item.deviceFirmname},#{item.deviceSrc},#{item.deviceDataSourceWay},#{item.lon},#{item.lati},#{item.deviceInBuilding},#{item.deviceInFloor},#{item.defectsLiabilityPeriod},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.isReceiveMess},#{item.devicePhotoPath},#{item.ip},#{item.centernum},#{item.port},#{item.deviceTopic},#{item.deviceStatus},#{item.enabled},#{item.deviceAuthCode},#{item.deviceRemark},#{item.onlineTime},#{item.offlineTime},#{item.deleted},#{item.deviceVersion},#{item.source},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.deviceName},#{item.deviceCode},#{item.deviceMac},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.platformId},#{item.platformName},#{item.productId},#{item.productName},#{item.skinId},#{item.skinName},#{item.homeUrl},#{item.deviceFirmId},#{item.deviceFirmname},#{item.deviceSrc},#{item.deviceDataSourceWay},#{item.lon},#{item.lati},#{item.deviceInBuilding},#{item.deviceInFloor},#{item.defectsLiabilityPeriod},#{item.leadingOfficial},#{item.leadingOfficialTelephone},#{item.isReceiveMess},#{item.devicePhotoPath},#{item.ip},#{item.centernum},#{item.port},#{item.deviceTopic},#{item.deviceStatus},#{item.enabled},#{item.deviceAuthCode},#{item.deviceRemark},#{item.onlineTime},#{item.offlineTime},#{item.deleted},#{item.source},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.deviceSN},#{item.deviceVersion},#{item.productCode})
</foreach> </foreach>
</insert> </insert>
...@@ -224,9 +228,6 @@ ...@@ -224,9 +228,6 @@
<if test="(colPickMode==0 and data.containsKey('deviceCode')) or (colPickMode==1 and !data.containsKey('deviceCode'))"> <if test="(colPickMode==0 and data.containsKey('deviceCode')) or (colPickMode==1 and !data.containsKey('deviceCode'))">
a.deviceCode=#{data.deviceCode}, a.deviceCode=#{data.deviceCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('deviceSN')) or (colPickMode==1 and !data.containsKey('deviceSN'))">
a.deviceSN=#{data.deviceSN},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceMac')) or (colPickMode==1 and !data.containsKey('deviceMac'))"> <if test="(colPickMode==0 and data.containsKey('deviceMac')) or (colPickMode==1 and !data.containsKey('deviceMac'))">
a.deviceMac=#{data.deviceMac}, a.deviceMac=#{data.deviceMac},
</if> </if>
...@@ -371,9 +372,6 @@ ...@@ -371,9 +372,6 @@
<if test="(colPickMode==0 and data.containsKey('deletedIncrement')) or (colPickMode==1 and !data.containsKey('deletedIncrement'))"> <if test="(colPickMode==0 and data.containsKey('deletedIncrement')) or (colPickMode==1 and !data.containsKey('deletedIncrement'))">
a.deleted=ifnull(a.deleted,0) + #{data.deletedIncrement}, a.deleted=ifnull(a.deleted,0) + #{data.deletedIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('deviceVersion')) or (colPickMode==1 and !data.containsKey('deviceVersion'))">
a.deviceVersion=#{data.deviceVersion},
</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>
...@@ -398,6 +396,15 @@ ...@@ -398,6 +396,15 @@
<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('deviceSN')) or (colPickMode==1 and !data.containsKey('deviceSN'))">
a.deviceSN=#{data.deviceSN},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceVersion')) or (colPickMode==1 and !data.containsKey('deviceVersion'))">
a.deviceVersion=#{data.deviceVersion},
</if>
<if test="(colPickMode==0 and data.containsKey('productCode')) or (colPickMode==1 and !data.containsKey('productCode'))">
a.productCode=#{data.productCode},
</if>
</trim> </trim>
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
...@@ -424,13 +431,6 @@ ...@@ -424,13 +431,6 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceSN=(case" suffix="ELSE deviceSN end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceSN')) or (colPickMode==1 and !item.containsKey('deviceSN'))">
when a.id=#{item.id} then #{item.deviceSN}
</if>
</foreach>
</trim>
<trim prefix="deviceMac=(case" suffix="ELSE deviceMac end),"> <trim prefix="deviceMac=(case" suffix="ELSE deviceMac 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('deviceMac')) or (colPickMode==1 and !item.containsKey('deviceMac'))"> <if test="(colPickMode==0 and item.containsKey('deviceMac')) or (colPickMode==1 and !item.containsKey('deviceMac'))">
...@@ -741,13 +741,6 @@ ...@@ -741,13 +741,6 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceVersion=(case" suffix="ELSE deviceVersion end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceVersion')) or (colPickMode==1 and !item.containsKey('deviceVersion'))">
when a.id=#{item.id} then #{item.deviceVersion}
</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>
...@@ -798,6 +791,27 @@ ...@@ -798,6 +791,27 @@
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceSN=(case" suffix="ELSE deviceSN end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceSN')) or (colPickMode==1 and !item.containsKey('deviceSN'))">
when a.id=#{item.id} then #{item.deviceSN}
</if>
</foreach>
</trim>
<trim prefix="deviceVersion=(case" suffix="ELSE deviceVersion end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceVersion')) or (colPickMode==1 and !item.containsKey('deviceVersion'))">
when a.id=#{item.id} then #{item.deviceVersion}
</if>
</foreach>
</trim>
<trim prefix="productCode=(case" suffix="ELSE productCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('productCode')) or (colPickMode==1 and !item.containsKey('productCode'))">
when a.id=#{item.id} then #{item.productCode}
</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=")">
...@@ -821,6 +835,21 @@ ...@@ -821,6 +835,21 @@
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_device where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_device where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_device as a delete a.* from mortals_xhx_device as a
...@@ -907,12 +936,18 @@ ...@@ -907,12 +936,18 @@
${_conditionType_} a.id is null ${_conditionType_} a.id is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('idList')"> <if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in ${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null"> <if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart} ${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
...@@ -929,12 +964,18 @@ ...@@ -929,12 +964,18 @@
${_conditionType_} a.deviceName is null ${_conditionType_} a.deviceName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceNameList')"> <if test="conditionParamRef.containsKey('deviceNameList') and conditionParamRef.deviceNameList.size() > 0">
${_conditionType_} a.deviceName in ${_conditionType_} a.deviceName in
<foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceNameNotList') and conditionParamRef.deviceNameNotList.size() > 0">
${_conditionType_} a.deviceName not in
<foreach collection="conditionParamRef.deviceNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceCode')"> <if test="conditionParamRef.containsKey('deviceCode')">
<if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''"> <if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''">
...@@ -944,24 +985,15 @@ ...@@ -944,24 +985,15 @@
${_conditionType_} a.deviceCode is null ${_conditionType_} a.deviceCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceCodeList')"> <if test="conditionParamRef.containsKey('deviceCodeList') and conditionParamRef.deviceCodeList.size() > 0">
${_conditionType_} a.deviceCode in ${_conditionType_} a.deviceCode in
<foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceCodeNotList') and conditionParamRef.deviceCodeNotList.size() > 0">
<if test="conditionParamRef.containsKey('deviceSN')"> ${_conditionType_} a.deviceCode not in
<if test="conditionParamRef.deviceSN != null and conditionParamRef.deviceSN != ''"> <foreach collection="conditionParamRef.deviceCodeNotList" open="(" close=")" index="index" item="item" separator=",">
${_conditionType_} a.deviceSN like #{${_conditionParam_}.deviceSN}
</if>
<if test="conditionParamRef.deviceSN == null">
${_conditionType_} a.deviceSN is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceSNList')">
${_conditionType_} a.deviceSN in
<foreach collection="conditionParamRef.deviceSNList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
...@@ -974,12 +1006,18 @@ ...@@ -974,12 +1006,18 @@
${_conditionType_} a.deviceMac is null ${_conditionType_} a.deviceMac is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceMacList')"> <if test="conditionParamRef.containsKey('deviceMacList') and conditionParamRef.deviceMacList.size() > 0">
${_conditionType_} a.deviceMac in ${_conditionType_} a.deviceMac in
<foreach collection="conditionParamRef.deviceMacList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceMacList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceMacNotList') and conditionParamRef.deviceMacNotList.size() > 0">
${_conditionType_} a.deviceMac not in
<foreach collection="conditionParamRef.deviceMacNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteId')"> <if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null "> <if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId} ${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
...@@ -988,12 +1026,18 @@ ...@@ -988,12 +1026,18 @@
${_conditionType_} a.siteId is null ${_conditionType_} a.siteId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteIdList')"> <if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in ${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null"> <if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart} ${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if> </if>
...@@ -1010,12 +1054,18 @@ ...@@ -1010,12 +1054,18 @@
${_conditionType_} a.siteCode is null ${_conditionType_} a.siteCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteCodeList')"> <if test="conditionParamRef.containsKey('siteCodeList') and conditionParamRef.siteCodeList.size() > 0">
${_conditionType_} a.siteCode in ${_conditionType_} a.siteCode in
<foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteCodeNotList') and conditionParamRef.siteCodeNotList.size() > 0">
${_conditionType_} a.siteCode not in
<foreach collection="conditionParamRef.siteCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteName')"> <if test="conditionParamRef.containsKey('siteName')">
<if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''"> <if test="conditionParamRef.siteName != null and conditionParamRef.siteName != ''">
...@@ -1025,12 +1075,18 @@ ...@@ -1025,12 +1075,18 @@
${_conditionType_} a.siteName is null ${_conditionType_} a.siteName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('siteNameList')"> <if test="conditionParamRef.containsKey('siteNameList') and conditionParamRef.siteNameList.size() > 0">
${_conditionType_} a.siteName in ${_conditionType_} a.siteName in
<foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.siteNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('siteNameNotList') and conditionParamRef.siteNameNotList.size() > 0">
${_conditionType_} a.siteName not in
<foreach collection="conditionParamRef.siteNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('platformId')"> <if test="conditionParamRef.containsKey('platformId')">
<if test="conditionParamRef.platformId != null "> <if test="conditionParamRef.platformId != null ">
${_conditionType_} a.platformId = #{${_conditionParam_}.platformId} ${_conditionType_} a.platformId = #{${_conditionParam_}.platformId}
...@@ -1039,12 +1095,18 @@ ...@@ -1039,12 +1095,18 @@
${_conditionType_} a.platformId is null ${_conditionType_} a.platformId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('platformIdList')"> <if test="conditionParamRef.containsKey('platformIdList') and conditionParamRef.platformIdList.size() > 0">
${_conditionType_} a.platformId in ${_conditionType_} a.platformId in
<foreach collection="conditionParamRef.platformIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.platformIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('platformIdNotList') and conditionParamRef.platformIdNotList.size() > 0">
${_conditionType_} a.platformId not in
<foreach collection="conditionParamRef.platformIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('platformIdStart') and conditionParamRef.platformIdStart != null"> <if test="conditionParamRef.containsKey('platformIdStart') and conditionParamRef.platformIdStart != null">
${_conditionType_} a.platformId <![CDATA[ >= ]]> #{${_conditionParam_}.platformIdStart} ${_conditionType_} a.platformId <![CDATA[ >= ]]> #{${_conditionParam_}.platformIdStart}
</if> </if>
...@@ -1061,12 +1123,18 @@ ...@@ -1061,12 +1123,18 @@
${_conditionType_} a.platformName is null ${_conditionType_} a.platformName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('platformNameList')"> <if test="conditionParamRef.containsKey('platformNameList') and conditionParamRef.platformNameList.size() > 0">
${_conditionType_} a.platformName in ${_conditionType_} a.platformName in
<foreach collection="conditionParamRef.platformNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.platformNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('platformNameNotList') and conditionParamRef.platformNameNotList.size() > 0">
${_conditionType_} a.platformName not in
<foreach collection="conditionParamRef.platformNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productId')"> <if test="conditionParamRef.containsKey('productId')">
<if test="conditionParamRef.productId != null "> <if test="conditionParamRef.productId != null ">
${_conditionType_} a.productId = #{${_conditionParam_}.productId} ${_conditionType_} a.productId = #{${_conditionParam_}.productId}
...@@ -1075,12 +1143,18 @@ ...@@ -1075,12 +1143,18 @@
${_conditionType_} a.productId is null ${_conditionType_} a.productId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('productIdList')"> <if test="conditionParamRef.containsKey('productIdList') and conditionParamRef.productIdList.size() > 0">
${_conditionType_} a.productId in ${_conditionType_} a.productId in
<foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.productIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('productIdNotList') and conditionParamRef.productIdNotList.size() > 0">
${_conditionType_} a.productId not in
<foreach collection="conditionParamRef.productIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productIdStart') and conditionParamRef.productIdStart != null"> <if test="conditionParamRef.containsKey('productIdStart') and conditionParamRef.productIdStart != null">
${_conditionType_} a.productId <![CDATA[ >= ]]> #{${_conditionParam_}.productIdStart} ${_conditionType_} a.productId <![CDATA[ >= ]]> #{${_conditionParam_}.productIdStart}
</if> </if>
...@@ -1097,12 +1171,18 @@ ...@@ -1097,12 +1171,18 @@
${_conditionType_} a.productName is null ${_conditionType_} a.productName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('productNameList')"> <if test="conditionParamRef.containsKey('productNameList') and conditionParamRef.productNameList.size() > 0">
${_conditionType_} a.productName in ${_conditionType_} a.productName in
<foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('productNameNotList') and conditionParamRef.productNameNotList.size() > 0">
${_conditionType_} a.productName not in
<foreach collection="conditionParamRef.productNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('skinId')"> <if test="conditionParamRef.containsKey('skinId')">
<if test="conditionParamRef.skinId != null "> <if test="conditionParamRef.skinId != null ">
${_conditionType_} a.skinId = #{${_conditionParam_}.skinId} ${_conditionType_} a.skinId = #{${_conditionParam_}.skinId}
...@@ -1111,12 +1191,18 @@ ...@@ -1111,12 +1191,18 @@
${_conditionType_} a.skinId is null ${_conditionType_} a.skinId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('skinIdList')"> <if test="conditionParamRef.containsKey('skinIdList') and conditionParamRef.skinIdList.size() > 0">
${_conditionType_} a.skinId in ${_conditionType_} a.skinId in
<foreach collection="conditionParamRef.skinIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.skinIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('skinIdNotList') and conditionParamRef.skinIdNotList.size() > 0">
${_conditionType_} a.skinId not in
<foreach collection="conditionParamRef.skinIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('skinIdStart') and conditionParamRef.skinIdStart != null"> <if test="conditionParamRef.containsKey('skinIdStart') and conditionParamRef.skinIdStart != null">
${_conditionType_} a.skinId <![CDATA[ >= ]]> #{${_conditionParam_}.skinIdStart} ${_conditionType_} a.skinId <![CDATA[ >= ]]> #{${_conditionParam_}.skinIdStart}
</if> </if>
...@@ -1133,12 +1219,18 @@ ...@@ -1133,12 +1219,18 @@
${_conditionType_} a.skinName is null ${_conditionType_} a.skinName is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('skinNameList')"> <if test="conditionParamRef.containsKey('skinNameList') and conditionParamRef.skinNameList.size() > 0">
${_conditionType_} a.skinName in ${_conditionType_} a.skinName in
<foreach collection="conditionParamRef.skinNameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.skinNameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('skinNameNotList') and conditionParamRef.skinNameNotList.size() > 0">
${_conditionType_} a.skinName not in
<foreach collection="conditionParamRef.skinNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('homeUrl')"> <if test="conditionParamRef.containsKey('homeUrl')">
<if test="conditionParamRef.homeUrl != null and conditionParamRef.homeUrl != ''"> <if test="conditionParamRef.homeUrl != null and conditionParamRef.homeUrl != ''">
...@@ -1148,12 +1240,18 @@ ...@@ -1148,12 +1240,18 @@
${_conditionType_} a.homeUrl is null ${_conditionType_} a.homeUrl is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('homeUrlList')"> <if test="conditionParamRef.containsKey('homeUrlList') and conditionParamRef.homeUrlList.size() > 0">
${_conditionType_} a.homeUrl in ${_conditionType_} a.homeUrl in
<foreach collection="conditionParamRef.homeUrlList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.homeUrlList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('homeUrlNotList') and conditionParamRef.homeUrlNotList.size() > 0">
${_conditionType_} a.homeUrl not in
<foreach collection="conditionParamRef.homeUrlNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceFirmId')"> <if test="conditionParamRef.containsKey('deviceFirmId')">
<if test="conditionParamRef.deviceFirmId != null "> <if test="conditionParamRef.deviceFirmId != null ">
${_conditionType_} a.deviceFirmId = #{${_conditionParam_}.deviceFirmId} ${_conditionType_} a.deviceFirmId = #{${_conditionParam_}.deviceFirmId}
...@@ -1162,12 +1260,18 @@ ...@@ -1162,12 +1260,18 @@
${_conditionType_} a.deviceFirmId is null ${_conditionType_} a.deviceFirmId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceFirmIdList')"> <if test="conditionParamRef.containsKey('deviceFirmIdList') and conditionParamRef.deviceFirmIdList.size() > 0">
${_conditionType_} a.deviceFirmId in ${_conditionType_} a.deviceFirmId in
<foreach collection="conditionParamRef.deviceFirmIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceFirmIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('deviceFirmIdStart') and conditionParamRef.deviceFirmIdStart != null">
${_conditionType_} a.deviceFirmId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceFirmIdStart} ${_conditionType_} a.deviceFirmId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceFirmIdStart}
</if> </if>
...@@ -1184,12 +1288,18 @@ ...@@ -1184,12 +1288,18 @@
${_conditionType_} a.deviceFirmname is null ${_conditionType_} a.deviceFirmname is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceFirmnameList')"> <if test="conditionParamRef.containsKey('deviceFirmnameList') and conditionParamRef.deviceFirmnameList.size() > 0">
${_conditionType_} a.deviceFirmname in ${_conditionType_} a.deviceFirmname in
<foreach collection="conditionParamRef.deviceFirmnameList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceFirmnameList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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('deviceSrc')"> <if test="conditionParamRef.containsKey('deviceSrc')">
<if test="conditionParamRef.deviceSrc != null "> <if test="conditionParamRef.deviceSrc != null ">
${_conditionType_} a.deviceSrc = #{${_conditionParam_}.deviceSrc} ${_conditionType_} a.deviceSrc = #{${_conditionParam_}.deviceSrc}
...@@ -1198,12 +1308,18 @@ ...@@ -1198,12 +1308,18 @@
${_conditionType_} a.deviceSrc is null ${_conditionType_} a.deviceSrc is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceSrcList')"> <if test="conditionParamRef.containsKey('deviceSrcList') and conditionParamRef.deviceSrcList.size() > 0">
${_conditionType_} a.deviceSrc in ${_conditionType_} a.deviceSrc in
<foreach collection="conditionParamRef.deviceSrcList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceSrcList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceSrcNotList') and conditionParamRef.deviceSrcNotList.size() > 0">
${_conditionType_} a.deviceSrc not in
<foreach collection="conditionParamRef.deviceSrcNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceSrcStart') and conditionParamRef.deviceSrcStart != null"> <if test="conditionParamRef.containsKey('deviceSrcStart') and conditionParamRef.deviceSrcStart != null">
${_conditionType_} a.deviceSrc <![CDATA[ >= ]]> #{${_conditionParam_}.deviceSrcStart} ${_conditionType_} a.deviceSrc <![CDATA[ >= ]]> #{${_conditionParam_}.deviceSrcStart}
</if> </if>
...@@ -1219,12 +1335,18 @@ ...@@ -1219,12 +1335,18 @@
${_conditionType_} a.deviceDataSourceWay is null ${_conditionType_} a.deviceDataSourceWay is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceDataSourceWayList')"> <if test="conditionParamRef.containsKey('deviceDataSourceWayList') and conditionParamRef.deviceDataSourceWayList.size() > 0">
${_conditionType_} a.deviceDataSourceWay in ${_conditionType_} a.deviceDataSourceWay in
<foreach collection="conditionParamRef.deviceDataSourceWayList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceDataSourceWayList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceDataSourceWayNotList') and conditionParamRef.deviceDataSourceWayNotList.size() > 0">
${_conditionType_} a.deviceDataSourceWay not in
<foreach collection="conditionParamRef.deviceDataSourceWayNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceDataSourceWayStart') and conditionParamRef.deviceDataSourceWayStart != null"> <if test="conditionParamRef.containsKey('deviceDataSourceWayStart') and conditionParamRef.deviceDataSourceWayStart != null">
${_conditionType_} a.deviceDataSourceWay <![CDATA[ >= ]]> #{${_conditionParam_}.deviceDataSourceWayStart} ${_conditionType_} a.deviceDataSourceWay <![CDATA[ >= ]]> #{${_conditionParam_}.deviceDataSourceWayStart}
</if> </if>
...@@ -1241,12 +1363,18 @@ ...@@ -1241,12 +1363,18 @@
${_conditionType_} a.lon is null ${_conditionType_} a.lon is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('lonList')"> <if test="conditionParamRef.containsKey('lonList') and conditionParamRef.lonList.size() > 0">
${_conditionType_} a.lon in ${_conditionType_} a.lon in
<foreach collection="conditionParamRef.lonList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.lonList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('lonNotList') and conditionParamRef.lonNotList.size() > 0">
${_conditionType_} a.lon not in
<foreach collection="conditionParamRef.lonNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('lati')"> <if test="conditionParamRef.containsKey('lati')">
<if test="conditionParamRef.lati != null and conditionParamRef.lati != ''"> <if test="conditionParamRef.lati != null and conditionParamRef.lati != ''">
...@@ -1256,12 +1384,18 @@ ...@@ -1256,12 +1384,18 @@
${_conditionType_} a.lati is null ${_conditionType_} a.lati is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('latiList')"> <if test="conditionParamRef.containsKey('latiList') and conditionParamRef.latiList.size() > 0">
${_conditionType_} a.lati in ${_conditionType_} a.lati in
<foreach collection="conditionParamRef.latiList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.latiList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('latiNotList') and conditionParamRef.latiNotList.size() > 0">
${_conditionType_} a.lati not in
<foreach collection="conditionParamRef.latiNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceInBuilding')"> <if test="conditionParamRef.containsKey('deviceInBuilding')">
<if test="conditionParamRef.deviceInBuilding != null "> <if test="conditionParamRef.deviceInBuilding != null ">
${_conditionType_} a.deviceInBuilding = #{${_conditionParam_}.deviceInBuilding} ${_conditionType_} a.deviceInBuilding = #{${_conditionParam_}.deviceInBuilding}
...@@ -1270,12 +1404,18 @@ ...@@ -1270,12 +1404,18 @@
${_conditionType_} a.deviceInBuilding is null ${_conditionType_} a.deviceInBuilding is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceInBuildingList')"> <if test="conditionParamRef.containsKey('deviceInBuildingList') and conditionParamRef.deviceInBuildingList.size() > 0">
${_conditionType_} a.deviceInBuilding in ${_conditionType_} a.deviceInBuilding in
<foreach collection="conditionParamRef.deviceInBuildingList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceInBuildingList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('deviceInBuildingStart') and conditionParamRef.deviceInBuildingStart != null">
${_conditionType_} a.deviceInBuilding <![CDATA[ >= ]]> #{${_conditionParam_}.deviceInBuildingStart} ${_conditionType_} a.deviceInBuilding <![CDATA[ >= ]]> #{${_conditionParam_}.deviceInBuildingStart}
</if> </if>
...@@ -1291,12 +1431,18 @@ ...@@ -1291,12 +1431,18 @@
${_conditionType_} a.deviceInFloor is null ${_conditionType_} a.deviceInFloor is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceInFloorList')"> <if test="conditionParamRef.containsKey('deviceInFloorList') and conditionParamRef.deviceInFloorList.size() > 0">
${_conditionType_} a.deviceInFloor in ${_conditionType_} a.deviceInFloor in
<foreach collection="conditionParamRef.deviceInFloorList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceInFloorList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('deviceInFloorStart') and conditionParamRef.deviceInFloorStart != null">
${_conditionType_} a.deviceInFloor <![CDATA[ >= ]]> #{${_conditionParam_}.deviceInFloorStart} ${_conditionType_} a.deviceInFloor <![CDATA[ >= ]]> #{${_conditionParam_}.deviceInFloorStart}
</if> </if>
...@@ -1328,12 +1474,18 @@ ...@@ -1328,12 +1474,18 @@
${_conditionType_} a.leadingOfficial is null ${_conditionType_} a.leadingOfficial is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('leadingOfficialList')"> <if test="conditionParamRef.containsKey('leadingOfficialList') and conditionParamRef.leadingOfficialList.size() > 0">
${_conditionType_} a.leadingOfficial in ${_conditionType_} a.leadingOfficial in
<foreach collection="conditionParamRef.leadingOfficialList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leadingOfficialList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('leadingOfficialNotList') and conditionParamRef.leadingOfficialNotList.size() > 0">
${_conditionType_} a.leadingOfficial not in
<foreach collection="conditionParamRef.leadingOfficialNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('leadingOfficialTelephone')"> <if test="conditionParamRef.containsKey('leadingOfficialTelephone')">
<if test="conditionParamRef.leadingOfficialTelephone != null and conditionParamRef.leadingOfficialTelephone != ''"> <if test="conditionParamRef.leadingOfficialTelephone != null and conditionParamRef.leadingOfficialTelephone != ''">
...@@ -1343,12 +1495,18 @@ ...@@ -1343,12 +1495,18 @@
${_conditionType_} a.leadingOfficialTelephone is null ${_conditionType_} a.leadingOfficialTelephone is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('leadingOfficialTelephoneList')"> <if test="conditionParamRef.containsKey('leadingOfficialTelephoneList') and conditionParamRef.leadingOfficialTelephoneList.size() > 0">
${_conditionType_} a.leadingOfficialTelephone in ${_conditionType_} a.leadingOfficialTelephone in
<foreach collection="conditionParamRef.leadingOfficialTelephoneList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.leadingOfficialTelephoneList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('leadingOfficialTelephoneNotList') and conditionParamRef.leadingOfficialTelephoneNotList.size() > 0">
${_conditionType_} a.leadingOfficialTelephone not in
<foreach collection="conditionParamRef.leadingOfficialTelephoneNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isReceiveMess')"> <if test="conditionParamRef.containsKey('isReceiveMess')">
<if test="conditionParamRef.isReceiveMess != null "> <if test="conditionParamRef.isReceiveMess != null ">
${_conditionType_} a.isReceiveMess = #{${_conditionParam_}.isReceiveMess} ${_conditionType_} a.isReceiveMess = #{${_conditionParam_}.isReceiveMess}
...@@ -1357,12 +1515,18 @@ ...@@ -1357,12 +1515,18 @@
${_conditionType_} a.isReceiveMess is null ${_conditionType_} a.isReceiveMess is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('isReceiveMessList')"> <if test="conditionParamRef.containsKey('isReceiveMessList') and conditionParamRef.isReceiveMessList.size() > 0">
${_conditionType_} a.isReceiveMess in ${_conditionType_} a.isReceiveMess in
<foreach collection="conditionParamRef.isReceiveMessList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.isReceiveMessList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('isReceiveMessNotList') and conditionParamRef.isReceiveMessNotList.size() > 0">
${_conditionType_} a.isReceiveMess not in
<foreach collection="conditionParamRef.isReceiveMessNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('isReceiveMessStart') and conditionParamRef.isReceiveMessStart != null"> <if test="conditionParamRef.containsKey('isReceiveMessStart') and conditionParamRef.isReceiveMessStart != null">
${_conditionType_} a.isReceiveMess <![CDATA[ >= ]]> #{${_conditionParam_}.isReceiveMessStart} ${_conditionType_} a.isReceiveMess <![CDATA[ >= ]]> #{${_conditionParam_}.isReceiveMessStart}
</if> </if>
...@@ -1379,12 +1543,18 @@ ...@@ -1379,12 +1543,18 @@
${_conditionType_} a.devicePhotoPath is null ${_conditionType_} a.devicePhotoPath is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('devicePhotoPathList')"> <if test="conditionParamRef.containsKey('devicePhotoPathList') and conditionParamRef.devicePhotoPathList.size() > 0">
${_conditionType_} a.devicePhotoPath in ${_conditionType_} a.devicePhotoPath in
<foreach collection="conditionParamRef.devicePhotoPathList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.devicePhotoPathList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('devicePhotoPathNotList') and conditionParamRef.devicePhotoPathNotList.size() > 0">
${_conditionType_} a.devicePhotoPath not in
<foreach collection="conditionParamRef.devicePhotoPathNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ip')"> <if test="conditionParamRef.containsKey('ip')">
<if test="conditionParamRef.ip != null and conditionParamRef.ip != ''"> <if test="conditionParamRef.ip != null and conditionParamRef.ip != ''">
...@@ -1394,12 +1564,18 @@ ...@@ -1394,12 +1564,18 @@
${_conditionType_} a.ip is null ${_conditionType_} a.ip is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('ipList')"> <if test="conditionParamRef.containsKey('ipList') and conditionParamRef.ipList.size() > 0">
${_conditionType_} a.ip in ${_conditionType_} a.ip in
<foreach collection="conditionParamRef.ipList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.ipList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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('centernum')"> <if test="conditionParamRef.containsKey('centernum')">
<if test="conditionParamRef.centernum != null and conditionParamRef.centernum != ''"> <if test="conditionParamRef.centernum != null and conditionParamRef.centernum != ''">
...@@ -1409,12 +1585,18 @@ ...@@ -1409,12 +1585,18 @@
${_conditionType_} a.centernum is null ${_conditionType_} a.centernum is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('centernumList')"> <if test="conditionParamRef.containsKey('centernumList') and conditionParamRef.centernumList.size() > 0">
${_conditionType_} a.centernum in ${_conditionType_} a.centernum in
<foreach collection="conditionParamRef.centernumList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.centernumList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('centernumNotList') and conditionParamRef.centernumNotList.size() > 0">
${_conditionType_} a.centernum not in
<foreach collection="conditionParamRef.centernumNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('port')"> <if test="conditionParamRef.containsKey('port')">
<if test="conditionParamRef.port != null and conditionParamRef.port != ''"> <if test="conditionParamRef.port != null and conditionParamRef.port != ''">
...@@ -1424,12 +1606,18 @@ ...@@ -1424,12 +1606,18 @@
${_conditionType_} a.port is null ${_conditionType_} a.port is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('portList')"> <if test="conditionParamRef.containsKey('portList') and conditionParamRef.portList.size() > 0">
${_conditionType_} a.port in ${_conditionType_} a.port in
<foreach collection="conditionParamRef.portList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.portList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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('deviceTopic')"> <if test="conditionParamRef.containsKey('deviceTopic')">
<if test="conditionParamRef.deviceTopic != null and conditionParamRef.deviceTopic != ''"> <if test="conditionParamRef.deviceTopic != null and conditionParamRef.deviceTopic != ''">
...@@ -1439,12 +1627,18 @@ ...@@ -1439,12 +1627,18 @@
${_conditionType_} a.deviceTopic is null ${_conditionType_} a.deviceTopic is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceTopicList')"> <if test="conditionParamRef.containsKey('deviceTopicList') and conditionParamRef.deviceTopicList.size() > 0">
${_conditionType_} a.deviceTopic in ${_conditionType_} a.deviceTopic in
<foreach collection="conditionParamRef.deviceTopicList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceTopicList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceTopicNotList') and conditionParamRef.deviceTopicNotList.size() > 0">
${_conditionType_} a.deviceTopic not in
<foreach collection="conditionParamRef.deviceTopicNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceStatus')"> <if test="conditionParamRef.containsKey('deviceStatus')">
<if test="conditionParamRef.deviceStatus != null "> <if test="conditionParamRef.deviceStatus != null ">
${_conditionType_} a.deviceStatus = #{${_conditionParam_}.deviceStatus} ${_conditionType_} a.deviceStatus = #{${_conditionParam_}.deviceStatus}
...@@ -1453,12 +1647,18 @@ ...@@ -1453,12 +1647,18 @@
${_conditionType_} a.deviceStatus is null ${_conditionType_} a.deviceStatus is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceStatusList')"> <if test="conditionParamRef.containsKey('deviceStatusList') and conditionParamRef.deviceStatusList.size() > 0">
${_conditionType_} a.deviceStatus in ${_conditionType_} a.deviceStatus in
<foreach collection="conditionParamRef.deviceStatusList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceStatusNotList') and conditionParamRef.deviceStatusNotList.size() > 0">
${_conditionType_} a.deviceStatus not in
<foreach collection="conditionParamRef.deviceStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceStatusStart') and conditionParamRef.deviceStatusStart != null"> <if test="conditionParamRef.containsKey('deviceStatusStart') and conditionParamRef.deviceStatusStart != null">
${_conditionType_} a.deviceStatus <![CDATA[ >= ]]> #{${_conditionParam_}.deviceStatusStart} ${_conditionType_} a.deviceStatus <![CDATA[ >= ]]> #{${_conditionParam_}.deviceStatusStart}
</if> </if>
...@@ -1474,12 +1674,18 @@ ...@@ -1474,12 +1674,18 @@
${_conditionType_} a.enabled is null ${_conditionType_} a.enabled is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('enabledList')"> <if test="conditionParamRef.containsKey('enabledList') and conditionParamRef.enabledList.size() > 0">
${_conditionType_} a.enabled in ${_conditionType_} a.enabled in
<foreach collection="conditionParamRef.enabledList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.enabledList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </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"> <if test="conditionParamRef.containsKey('enabledStart') and conditionParamRef.enabledStart != null">
${_conditionType_} a.enabled <![CDATA[ >= ]]> #{${_conditionParam_}.enabledStart} ${_conditionType_} a.enabled <![CDATA[ >= ]]> #{${_conditionParam_}.enabledStart}
</if> </if>
...@@ -1496,12 +1702,18 @@ ...@@ -1496,12 +1702,18 @@
${_conditionType_} a.deviceAuthCode is null ${_conditionType_} a.deviceAuthCode is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceAuthCodeList')"> <if test="conditionParamRef.containsKey('deviceAuthCodeList') and conditionParamRef.deviceAuthCodeList.size() > 0">
${_conditionType_} a.deviceAuthCode in ${_conditionType_} a.deviceAuthCode in
<foreach collection="conditionParamRef.deviceAuthCodeList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceAuthCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceAuthCodeNotList') and conditionParamRef.deviceAuthCodeNotList.size() > 0">
${_conditionType_} a.deviceAuthCode not in
<foreach collection="conditionParamRef.deviceAuthCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceRemark')"> <if test="conditionParamRef.containsKey('deviceRemark')">
<if test="conditionParamRef.deviceRemark != null and conditionParamRef.deviceRemark != ''"> <if test="conditionParamRef.deviceRemark != null and conditionParamRef.deviceRemark != ''">
...@@ -1511,12 +1723,18 @@ ...@@ -1511,12 +1723,18 @@
${_conditionType_} a.deviceRemark is null ${_conditionType_} a.deviceRemark is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceRemarkList')"> <if test="conditionParamRef.containsKey('deviceRemarkList') and conditionParamRef.deviceRemarkList.size() > 0">
${_conditionType_} a.deviceRemark in ${_conditionType_} a.deviceRemark in
<foreach collection="conditionParamRef.deviceRemarkList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deviceRemarkList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceRemarkNotList') and conditionParamRef.deviceRemarkNotList.size() > 0">
${_conditionType_} a.deviceRemark not in
<foreach collection="conditionParamRef.deviceRemarkNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineTime')"> <if test="conditionParamRef.containsKey('onlineTime')">
<if test="conditionParamRef.onlineTime != null "> <if test="conditionParamRef.onlineTime != null ">
...@@ -1555,12 +1773,18 @@ ...@@ -1555,12 +1773,18 @@
${_conditionType_} a.deleted is null ${_conditionType_} a.deleted is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('deletedList')"> <if test="conditionParamRef.containsKey('deletedList') and conditionParamRef.deletedList.size() > 0">
${_conditionType_} a.deleted in ${_conditionType_} a.deleted in
<foreach collection="conditionParamRef.deletedList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.deletedList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deletedNotList') and conditionParamRef.deletedNotList.size() > 0">
${_conditionType_} a.deleted not in
<foreach collection="conditionParamRef.deletedNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deletedStart') and conditionParamRef.deletedStart != null"> <if test="conditionParamRef.containsKey('deletedStart') and conditionParamRef.deletedStart != null">
${_conditionType_} a.deleted <![CDATA[ >= ]]> #{${_conditionParam_}.deletedStart} ${_conditionType_} a.deleted <![CDATA[ >= ]]> #{${_conditionParam_}.deletedStart}
</if> </if>
...@@ -1568,21 +1792,6 @@ ...@@ -1568,21 +1792,6 @@
${_conditionType_} a.deleted <![CDATA[ <= ]]> #{${_conditionParam_}.deletedEnd} ${_conditionType_} a.deleted <![CDATA[ <= ]]> #{${_conditionParam_}.deletedEnd}
</if> </if>
<if test="conditionParamRef.containsKey('deviceVersion')">
<if test="conditionParamRef.deviceVersion != null and conditionParamRef.deviceVersion != ''">
${_conditionType_} a.deviceVersion like #{${_conditionParam_}.deviceVersion}
</if>
<if test="conditionParamRef.deviceVersion == null">
${_conditionType_} a.deviceVersion is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceVersionList')">
${_conditionType_} a.deviceVersion in
<foreach collection="conditionParamRef.deviceVersionList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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}
...@@ -1591,12 +1800,18 @@ ...@@ -1591,12 +1800,18 @@
${_conditionType_} a.source is null ${_conditionType_} a.source is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('sourceList')"> <if test="conditionParamRef.containsKey('sourceList') and conditionParamRef.sourceList.size() > 0">
${_conditionType_} a.source in ${_conditionType_} a.source in
<foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('sourceNotList') and conditionParamRef.sourceNotList.size() > 0">
${_conditionType_} a.source not in
<foreach collection="conditionParamRef.sourceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null"> <if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart} ${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
</if> </if>
...@@ -1612,12 +1827,18 @@ ...@@ -1612,12 +1827,18 @@
${_conditionType_} a.createUserId is null ${_conditionType_} a.createUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> <if test="conditionParamRef.containsKey('createUserIdList') and conditionParamRef.createUserIdList.size() > 0">
${_conditionType_} a.createUserId in ${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdNotList') and conditionParamRef.createUserIdNotList.size() > 0">
${_conditionType_} a.createUserId not in
<foreach collection="conditionParamRef.createUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> <if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} ${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if> </if>
...@@ -1648,12 +1869,18 @@ ...@@ -1648,12 +1869,18 @@
${_conditionType_} a.updateUserId is null ${_conditionType_} a.updateUserId is null
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=","> <foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item} #{item}
</foreach> </foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> <if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} ${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if> </if>
...@@ -1676,6 +1903,69 @@ ...@@ -1676,6 +1903,69 @@
<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('deviceSN')">
<if test="conditionParamRef.deviceSN != null and conditionParamRef.deviceSN != ''">
${_conditionType_} a.deviceSN like #{${_conditionParam_}.deviceSN}
</if>
<if test="conditionParamRef.deviceSN == null">
${_conditionType_} a.deviceSN is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceSNList') and conditionParamRef.deviceSNList.size() > 0">
${_conditionType_} a.deviceSN in
<foreach collection="conditionParamRef.deviceSNList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceSNNotList') and conditionParamRef.deviceSNNotList.size() > 0">
${_conditionType_} a.deviceSN not in
<foreach collection="conditionParamRef.deviceSNNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceVersion')">
<if test="conditionParamRef.deviceVersion != null and conditionParamRef.deviceVersion != ''">
${_conditionType_} a.deviceVersion like #{${_conditionParam_}.deviceVersion}
</if>
<if test="conditionParamRef.deviceVersion == null">
${_conditionType_} a.deviceVersion is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceVersionList') and conditionParamRef.deviceVersionList.size() > 0">
${_conditionType_} a.deviceVersion in
<foreach collection="conditionParamRef.deviceVersionList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceVersionNotList') and conditionParamRef.deviceVersionNotList.size() > 0">
${_conditionType_} a.deviceVersion not in
<foreach collection="conditionParamRef.deviceVersionNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productCode')">
<if test="conditionParamRef.productCode != null and conditionParamRef.productCode != ''">
${_conditionType_} a.productCode like #{${_conditionParam_}.productCode}
</if>
<if test="conditionParamRef.productCode == null">
${_conditionType_} a.productCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('productCodeList') and conditionParamRef.productCodeList.size() > 0">
${_conditionType_} a.productCode in
<foreach collection="conditionParamRef.productCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productCodeNotList') and conditionParamRef.productCodeNotList.size() > 0">
${_conditionType_} a.productCode not in
<foreach collection="conditionParamRef.productCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
...@@ -1704,11 +1994,6 @@ ...@@ -1704,11 +1994,6 @@
<if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if> <if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceSN')">
a.deviceSN
<if test='orderCol.deviceSN != null and "DESC".equalsIgnoreCase(orderCol.deviceSN)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deviceMac')"> <if test="orderCol.containsKey('deviceMac')">
a.deviceMac a.deviceMac
<if test='orderCol.deviceMac != null and "DESC".equalsIgnoreCase(orderCol.deviceMac)'>DESC</if> <if test='orderCol.deviceMac != null and "DESC".equalsIgnoreCase(orderCol.deviceMac)'>DESC</if>
...@@ -1884,11 +2169,6 @@ ...@@ -1884,11 +2169,6 @@
<if test='orderCol.deleted != null and "DESC".equalsIgnoreCase(orderCol.deleted)'>DESC</if> <if test='orderCol.deleted != null and "DESC".equalsIgnoreCase(orderCol.deleted)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceVersion')">
a.deviceVersion
<if test='orderCol.deviceVersion != null and "DESC".equalsIgnoreCase(orderCol.deviceVersion)'>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>
...@@ -1914,6 +2194,21 @@ ...@@ -1914,6 +2194,21 @@
<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('deviceSN')">
a.deviceSN
<if test='orderCol.deviceSN != null and "DESC".equalsIgnoreCase(orderCol.deviceSN)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deviceVersion')">
a.deviceVersion
<if test='orderCol.deviceVersion != null and "DESC".equalsIgnoreCase(orderCol.deviceVersion)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('productCode')">
a.productCode
<if test='orderCol.productCode != null and "DESC".equalsIgnoreCase(orderCol.productCode)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
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