Skip to content

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

修改部分消息结构

parent 2a76bdb1
Hide whitespace changes
Inline Side-by-side
Showing with 2684 additions and 2217 deletions
common-lib/src/main/java/com/mortals/xhx/queue/rabbitmq/TbRabbitMqConsumerTemplate.java
View file @ 91ac7bfe
...@@ -110,6 +110,11 @@ public class TbRabbitMqConsumerTemplate<T extends TbQueueMsg> extends AbstractTb ...@@ -110,6 +110,11 @@ public class TbRabbitMqConsumerTemplate<T extends TbQueueMsg> extends AbstractTb
try { try {
DefaultTbQueueMsg msg = new DefaultTbQueueMsg(); DefaultTbQueueMsg msg = new DefaultTbQueueMsg();
// DefaultTbQueueMsg msg = gson.fromJson(new String(message.getBody()), DefaultTbQueueMsg.class); // DefaultTbQueueMsg msg = gson.fromJson(new String(message.getBody()), DefaultTbQueueMsg.class);
if(ObjectUtils.isEmpty(message.getBody())){
log.info("message is empty");
return null;
}
Map<String, Object> map = JSON.parseObject(new String(message.getBody()), HashMap.class); Map<String, Object> map = JSON.parseObject(new String(message.getBody()), HashMap.class);
msg.setKey((String)map.get("key")); msg.setKey((String)map.get("key"));
String payloadStr = (String)map.get("data"); String payloadStr = (String)map.get("data");
...@@ -121,10 +126,11 @@ public class TbRabbitMqConsumerTemplate<T extends TbQueueMsg> extends AbstractTb ...@@ -121,10 +126,11 @@ public class TbRabbitMqConsumerTemplate<T extends TbQueueMsg> extends AbstractTb
HashMap<String, String> hashMap = JSON.parseObject(headerStr, HashMap.class); HashMap<String, String> hashMap = JSON.parseObject(headerStr, HashMap.class);
headers.setData(hashMap); headers.setData(hashMap);
msg.setHeaders(headers); msg.setHeaders(headers);
log.debug("msg:" + msg.toString()); log.info("msg:" + msg.toString());
return decoder.decode(msg); return decoder.decode(msg);
} catch (Exception e) { } catch (Exception e) {
log.error("反序列化异常！", e); log.error("反序列化异常！", e);
log.error("message:",JSON.toJSONString(message));
return null; return null;
} }
......
db/module.sql
View file @ 91ac7bfe
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
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) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`deviceName` varchar(20) NOT NULL COMMENT '设备名称', `deviceName` varchar(20) COMMENT '设备名称',
`deviceCode` varchar(256) COMMENT '设备编码,SN码等，默认为MAC地址', `deviceCode` varchar(256) NOT NULL COMMENT '设备编码,SN码等，默认为MAC地址',
`deviceMac` varchar(64) COMMENT '设备的MAC地址', `deviceMac` varchar(64) COMMENT '设备的MAC地址',
`siteId` bigint(20) COMMENT '站点Id，来源基础服务平台', `siteId` bigint(20) COMMENT '站点Id，来源基础服务平台',
`siteCode` varchar(256) COMMENT '站点编号，来源基础服务平台', `siteCode` varchar(256) COMMENT '站点编号，来源基础服务平台',
...@@ -37,7 +37,8 @@ CREATE TABLE mortals_xhx_device( ...@@ -37,7 +37,8 @@ CREATE TABLE mortals_xhx_device(
`deviceRemark` varchar(256) COMMENT '备注', `deviceRemark` varchar(256) COMMENT '备注',
`onlineTime` datetime COMMENT '最近上线时间', `onlineTime` datetime COMMENT '最近上线时间',
`offlineTime` datetime COMMENT '最近离线时间', `offlineTime` datetime COMMENT '最近离线时间',
`deleted` tinyint(2) COMMENT '是否删除，(0.否，1.是)', `deleted` tinyint(2) COMMENT '是否删除(0.否，1.是)',
`source` tinyint(2) COMMENT '收不来源(0.旧设备，1.新设备)',
`createUserId` bigint(20) NOT NULL COMMENT '创建用户', `createUserId` bigint(20) NOT NULL COMMENT '创建用户',
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
`updateUserId` bigint(20) COMMENT '更新用户', `updateUserId` bigint(20) COMMENT '更新用户',
...@@ -45,10 +46,6 @@ CREATE TABLE mortals_xhx_device( ...@@ -45,10 +46,6 @@ CREATE TABLE mortals_xhx_device(
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备';
-- ---------------------------- -- ----------------------------
-- 平台系统表 -- 平台系统表
-- ---------------------------- -- ----------------------------
...@@ -76,9 +73,9 @@ PRIMARY KEY (`id`) ...@@ -76,9 +73,9 @@ PRIMARY KEY (`id`)
DROP TABLE IF EXISTS `mortals_xhx_product`; DROP TABLE IF EXISTS `mortals_xhx_product`;
CREATE TABLE mortals_xhx_product( CREATE TABLE mortals_xhx_product(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`platformId` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '关联平台',
`productName` varchar(20) NOT NULL COMMENT '产品名称，名称唯一', `productName` varchar(20) NOT NULL COMMENT '产品名称，名称唯一',
`productCode` varchar(256) NOT NULL COMMENT '产品编码', `productCode` varchar(256) COMMENT '产品编码',
`exchangeName` varchar(256) NOT NULL COMMENT '交换机名称,英文必填',
`productRemark` varchar(256) COMMENT '备注', `productRemark` varchar(256) COMMENT '备注',
`createUserId` bigint(20) NOT NULL COMMENT '创建用户', `createUserId` bigint(20) NOT NULL COMMENT '创建用户',
`createTime` datetime NOT NULL COMMENT '创建时间', `createTime` datetime NOT NULL COMMENT '创建时间',
...@@ -87,6 +84,8 @@ CREATE TABLE mortals_xhx_product( ...@@ -87,6 +84,8 @@ CREATE TABLE mortals_xhx_product(
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='产品'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='产品';
-- ---------------------------- -- ----------------------------
-- 设备生产厂商表 -- 设备生产厂商表
-- ---------------------------- -- ----------------------------
......
device-manager-ui/admin/src/views/platform/dialogshow.vue
View file @ 91ac7bfe
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<Field :span="20" label="平台名称" prop="platformName" v-model="form.platformName" placeholder="请输入平台名称，名称唯一"/> <Field :span="20" label="平台名称" prop="platformName" v-model="form.platformName" placeholder="请输入平台名称，名称唯一"/>
<Field :span="20" label="平台编码" prop="platformSn" v-model="form.platformSn" placeholder="请输入平台编码，编码唯一"/> <Field :span="20" label="平台编码" prop="platformSn" v-model="form.platformSn" placeholder="请输入平台编码，编码唯一"/>
<Field :span="20" label="发送地址" prop="sendUrl" v-model="form.sendUrl" placeholder="请输入发送httpurl地址"/> <Field :span="20" label="发送地址" prop="sendUrl" v-model="form.sendUrl" placeholder="请输入发送httpurl地址"/>
<Field :span="20" label="首页地址" prop="homeUrl" v-model="form.homeUrl" placeholder="请输入首页地址"/> <!-- <Field :span="20" label="首页地址" prop="homeUrl" v-model="form.homeUrl" placeholder="请输入首页地址"/> -->
<!-- <Field :span="20" label="发送消息类型" prop="sendMsgType" v-model="form.sendMsgType" type="radio" :enumData="dict.sendMsgType" placeholder="请选择发送第三方平台消息类型"/> --> <!-- <Field :span="20" label="发送消息类型" prop="sendMsgType" v-model="form.sendMsgType" type="radio" :enumData="dict.sendMsgType" placeholder="请选择发送第三方平台消息类型"/> -->
<Field :span="20" label="是否发送消息" prop="sendSwitch" v-model="form.sendSwitch" type="radio" :enumData="dict.sendSwitch" placeholder="请选择是否启用发送消息"/> <Field :span="20" label="是否发送消息" prop="sendSwitch" v-model="form.sendSwitch" type="radio" :enumData="dict.sendSwitch" placeholder="请选择是否启用发送消息"/>
......
device-manager-ui/admin/src/views/platform/list.vue
View file @ 91ac7bfe
...@@ -3,17 +3,17 @@ ...@@ -3,17 +3,17 @@
<LayoutTable :data="tableData" :config="tableConfig"> <LayoutTable :data="tableData" :config="tableConfig">
</LayoutTable> </LayoutTable>
<dialog-show ref="dialogform" @ok="getData" /> <drawer-show ref="drawerform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow"; import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "Platform", name: "Platform",
components: {dialogShow }, components: {drawerShow },
mixins: [table], mixins: [table],
created() { created() {
}, },
...@@ -21,17 +21,17 @@ ...@@ -21,17 +21,17 @@
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
this.$refs.dialogform.add(row); this.$refs.drawerform.add(row);
}, },
/** 重写编辑方法 */ /** 重写编辑方法 */
toEdit(row) { toEdit(row) {
this.$refs.dialogform.edit(row); this.$refs.drawerform.edit(row);
}, },
/** 重写查看方法 */ /** 重写查看方法 */
// toView(row) { toView(row) {
// this.$refs.dialogform.view(row); this.$refs.drawerform.view(row);
// }, },
}, },
data() { data() {
......
device-manager-ui/admin/src/views/product/dialogshow.vue
View file @ 91ac7bfe
...@@ -3,9 +3,9 @@ ...@@ -3,9 +3,9 @@
<el-dialog :title="title" :visible.sync="open" width="90%" append-to-body> <el-dialog :title="title" :visible.sync="open" width="90%" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="120px"> <el-form ref="form" :model="form" :rules="rules" label-width="120px">
<el-row> <el-row>
<Field :span="20" label="产品名称" prop="productName" v-model="form.productName" placeholder="请输入产品名称，名称唯一,如排号机"/> <Field label="产品名称，名称唯一" prop="productName" v-model="form.productName" placeholder="请输入产品名称，名称唯一"/>
<Field :span="20" label="产品编码" prop="productCode" v-model="form.productCode" placeholder="请输入产品编码，编码唯已，如phj"/> <Field label="产品编码" prop="productCode" v-model="form.productCode" type="textarea" placeholder="请输入产品编码"/>
<Field :span="20" label="备注" prop="productRemark" v-model="form.productRemark" type="textarea" placeholder="请输入备注"/> <Field label="备注" prop="productRemark" v-model="form.productRemark" type="textarea" placeholder="请输入备注"/>
</el-row> </el-row>
...@@ -41,14 +41,6 @@ ...@@ -41,14 +41,6 @@
{required: true,message: "请输入产品名称，名称唯一", trigger: "blur" }, {required: true,message: "请输入产品名称，名称唯一", trigger: "blur" },
{max: 20,message: "最多只能录入20个字符",trigger: "blur",}, {max: 20,message: "最多只能录入20个字符",trigger: "blur",},
], ],
productCode: [
{required: true,message: "请输入产品编码，编码唯一", trigger: "blur" },
{max: 256,message: "最多只能录入256个字符",trigger: "blur",},
],
exchangeName: [
{required: true,message: "请输入交换机名称,英文必填，默认产品编码", trigger: "blur" },
{max: 256,message: "最多只能录入256个字符",trigger: "blur",},
],
createTime: [ createTime: [
{required: true,message: "请选择创建时间" }, {required: true,message: "请选择创建时间" },
], ],
...@@ -61,7 +53,7 @@ ...@@ -61,7 +53,7 @@
edit(row) { edit(row) {
this.reset() this.reset()
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.editUrl;; this.urls.currUrl ="product/edit";
this.getData(); this.getData();
this.pageInfo.type="edit" this.pageInfo.type="edit"
this.title = "修改产品"; this.title = "修改产品";
...@@ -69,8 +61,7 @@ ...@@ -69,8 +61,7 @@
/** 新增 */ /** 新增 */
add(row) { add(row) {
this.reset() this.reset()
this.query = { id: row.id }; this.urls.currUrl = "product/add";
this.urls.currUrl = this.pageInfo.addUrl;
this.getData(); this.getData();
this.pageInfo.type="add" this.pageInfo.type="add"
this.title = "新增产品"; this.title = "新增产品";
...@@ -79,7 +70,7 @@ ...@@ -79,7 +70,7 @@
view(row) { view(row) {
this.reset() this.reset()
this.query = { id: row.id }; this.query = { id: row.id };
this.urls.currUrl =this.pageInfo.viewUrl;; this.urls.currUrl ="product/view";
this.getData(); this.getData();
this.pageInfo.type="view" this.pageInfo.type="view"
this.title = "产品详细"; this.title = "产品详细";
...@@ -101,9 +92,9 @@ ...@@ -101,9 +92,9 @@
// 表单重置 // 表单重置
reset() { reset() {
this.form = { this.form = {
platformId : null,
productName : "", productName : "",
productCode : "", productCode : "",
exchangeName : "",
productRemark : "", productRemark : "",
}; };
this.resetForm("form"); this.resetForm("form");
......
device-manager-ui/admin/src/views/product/list.vue
View file @ 91ac7bfe
<template> <template>
<div class="page"> <div class="page">
<LayoutTable :data="tableData" notAdd notDel notSearch :config="tableConfig"> <LayoutTable :data="tableData" notDel notSearch :config="tableConfig">
</LayoutTable> </LayoutTable>
<dialog-show ref="dialogform" @ok="getData" />
<drawer-show ref="drawerform" @ok="getData" />
</div> </div>
</template> </template>
<script> <script>
/** 表单弹出框模式需引入 */ /** 表单弹出框模式需引入 */
import dialogShow from "./dialogshow";
import drawerShow from "./drawershow";
import table from "@/assets/mixins/table"; import table from "@/assets/mixins/table";
export default { export default {
name: "Product", name: "ProductList",
components: {dialogShow }, components: {
drawerShow
},
mixins: [table], mixins: [table],
created() { created() {
}, },
methods: { methods: {
/** 重写新增方法 */ /** 重写新增方法 */
toAdd(row) { toAdd(row) {
this.$refs.dialogform.add(row); this.$refs.drawerform.add(row);
}, },
/** 重写编辑方法 */ /** 重写编辑方法 */
toEdit(row) { toEdit(row) {
this.$refs.dialogform.edit(row); this.$refs.drawerform.edit(row);
}, },
/** 重写查看方法 */ /** 重写查看方法 */
// toView(row) { toView(row) {
// this.$refs.dialogform.view(row); this.$refs.drawerform.view(row);
// }, },
}, },
data() { data() {
...@@ -40,11 +42,25 @@ ...@@ -40,11 +42,25 @@
search: [ search: [
], ],
columns: [ columns: [
// {type: "selection", width: 60},
{type: "index",label: "序号",width: 50},
{label: "关联平台", prop: "platformId", formatter: this.formatter},
{label: "产品名称", prop: "productName"}, {label: "产品名称", prop: "productName"},
{label: "产品编码", prop: "productCode"}, {label: "产品编码", prop: "productCode"},
{label: "备注", prop: "productRemark"},
{
label: "操作",
width: 240,
formatter: row => {
return (
<table-buttons noAdd row={row} onEdit={this.toEdit} onView={this.toView} onDel={this.toDel} />
);
}
}
] ]
} }
}; };
......
device-manager/src/main/java/com/mortals/xhx/busiz/req/DeviceReq.java
View file @ 91ac7bfe
...@@ -18,14 +18,14 @@ public class DeviceReq implements Serializable { ...@@ -18,14 +18,14 @@ public class DeviceReq implements Serializable {
*/ */
private Integer receiveMethod; private Integer receiveMethod;
/** // /**
* 平台系统id // * 平台系统id
*/ // */
private Long platformId; // private Long platformId;
/** // /**
* 平台系统编码 // * 平台系统编码
*/ // */
private String platformCode; // private String platformCode;
/** /**
* 产品id * 产品id
*/ */
...@@ -121,4 +121,9 @@ public class DeviceReq implements Serializable { ...@@ -121,4 +121,9 @@ public class DeviceReq implements Serializable {
@JsonDeserialize(using = CustomJsonDateDeserializer.class) @JsonDeserialize(using = CustomJsonDateDeserializer.class)
private Date defectsLiabilityPeriod; private Date defectsLiabilityPeriod;
/**
* 设备来源（默认为新设备）
*/
private Integer source;
} }
device-manager/src/main/java/com/mortals/xhx/busiz/rsp/DeviceInfo.java 0 → 100644
View file @ 91ac7bfe
package com.mortals.xhx.busiz.rsp;
import lombok.Data;
import java.io.Serializable;
/**
* 设备基础信息
* @author: zxfei
* @date: 2022/7/11 10:36
* @description:
**/
@Data
public class DeviceInfo implements Serializable {
/**
* 站点ID
*/
private Long siteId;
/**
* 站点编码
*/
private String siteCode;
/**
* 站点名称
*/
private String siteName;
/**
* 设备产品类型Id
*/
private Long productId;
/**
* 设备产品类型
*/
private String productName;
}
device-manager/src/main/java/com/mortals/xhx/busiz/rsp/RegisterResp.java
View file @ 91ac7bfe
...@@ -17,6 +17,10 @@ public class RegisterResp implements Serializable { ...@@ -17,6 +17,10 @@ public class RegisterResp implements Serializable {
*/ */
private ServerInfo serviceInfo; private ServerInfo serviceInfo;
/**
* 设备基础信息
*/
private DeviceInfo deviceInfo;
} }
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @ 91ac7bfe
...@@ -36,7 +36,6 @@ import com.mortals.xhx.module.platform.service.PlatformService; ...@@ -36,7 +36,6 @@ import com.mortals.xhx.module.platform.service.PlatformService;
import com.mortals.xhx.module.product.model.ProductEntity; import com.mortals.xhx.module.product.model.ProductEntity;
import com.mortals.xhx.module.product.model.ProductQuery; import com.mortals.xhx.module.product.model.ProductQuery;
import com.mortals.xhx.module.product.service.ProductService; import com.mortals.xhx.module.product.service.ProductService;
import com.mortals.xhx.module.sitestat.model.SitestatEntity;
import com.mortals.xhx.queue.TbQueueMsgHeaders; import com.mortals.xhx.queue.TbQueueMsgHeaders;
import com.mortals.xhx.queue.TopicPartitionInfo; import com.mortals.xhx.queue.TopicPartitionInfo;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -53,6 +52,7 @@ import java.util.stream.Collectors; ...@@ -53,6 +52,7 @@ import java.util.stream.Collectors;
import static com.mortals.xhx.common.key.Constant.DES_STR; import static com.mortals.xhx.common.key.Constant.DES_STR;
import static com.mortals.xhx.common.key.Constant.ENCRYPT_STR; import static com.mortals.xhx.common.key.Constant.ENCRYPT_STR;
import static com.mortals.xhx.common.key.ErrorCode.*;
/** /**
* 设备 * 设备
...@@ -110,12 +110,8 @@ public class DeviceApiController { ...@@ -110,12 +110,8 @@ public class DeviceApiController {
try { try {
DeviceEntity deviceEntity = checkDeviceExist(req); DeviceEntity deviceEntity = checkDeviceExist(req);
if (deviceEntity.getDeviceStatus() == DeviceStatusEnum.未激活.getValue()) { if (deviceEntity.getDeviceStatus() == DeviceStatusEnum.未激活.getValue()) {
throw new AppException("当前设备未激活，请在后台配置后再激活！"); throw new AppException(DEVICE_UNACTIVE, DEVICE_UNACTIVE_CONTENT);
} }
// if (deviceEntity.getStatus() != StatusEnum.启用.getValue()) {
// throw new AppException("当前设备未启用，请在后台启用当前设备！");
// }
DeviceQueueAuthInfo authInfo = new DeviceQueueAuthInfo(); DeviceQueueAuthInfo authInfo = new DeviceQueueAuthInfo();
authInfo.setHost(host); authInfo.setHost(host);
authInfo.setPort(port); authInfo.setPort(port);
...@@ -123,30 +119,38 @@ public class DeviceApiController { ...@@ -123,30 +119,38 @@ public class DeviceApiController {
authInfo.setPassword(password); authInfo.setPassword(password);
authInfo.setMessageTtl(messageTtl); authInfo.setMessageTtl(messageTtl);
authInfo.setVirtualHost(virtualHost); authInfo.setVirtualHost(virtualHost);
PlatformEntity platformEntity = platformService.get(deviceEntity.getPlatformId());
if (ObjectUtils.isEmpty(platformEntity)) {
throw new AppException("当前设备未配置所属系统平台，请在后台配置后再激活！");
}
ProductEntity productEntity = productService.get(deviceEntity.getProductId()); ProductEntity productEntity = productService.get(deviceEntity.getProductId());
if (ObjectUtils.isEmpty(productEntity)) { if (ObjectUtils.isEmpty(productEntity)) {
throw new AppException("当前设备未配置所属产品，请在后台配置后再激活！"); throw new AppException(PRODUCT_IS_EMPTY, PRODUCT_IS_EMPTY_CONTENT);
}
if (ObjectUtils.isEmpty(productEntity.getPlatformId())) {
throw new AppException(PLATFORM_UNEXIST, PLATFORM_UNEXIST_CONTENT);
} }
PlatformEntity platformEntity = platformService.get(productEntity.getPlatformId());
if (ObjectUtils.isEmpty(platformEntity)) {
throw new AppException(PLATFORM_IS_EMPTY, PLATFORM_IS_EMPTY_CONTENT);
}
authInfo.setExchangeName(platformEntity.getPlatformSn() + Constant.EXCHANGE_SPLIT + productEntity.getProductCode()); authInfo.setExchangeName(platformEntity.getPlatformSn() + Constant.EXCHANGE_SPLIT + productEntity.getProductCode());
authInfo.setUploadTopicFilter(Constant.UPLOAD_TOPIC + deviceEntity.getDeviceCode()); authInfo.setUploadTopicFilter(Constant.UPLOAD_TOPIC + deviceEntity.getDeviceCode());
authInfo.setDownTopicFilter(Constant.DOWN_TOPIC + deviceEntity.getDeviceCode()); authInfo.setDownTopicFilter(Constant.DOWN_TOPIC + deviceEntity.getDeviceCode());
//authInfo.setHomeUrl(platformEntity.getHomeUrl());
// String content = AESUtil.encryptForApp(JSON.toJSONString(authInfo), secret);
RegisterResp registerResp = new RegisterResp(); RegisterResp registerResp = new RegisterResp();
registerResp.setRabbmitInfo(authInfo); registerResp.setRabbmitInfo(authInfo);
ServerInfo serverInfo = new ServerInfo(); ServerInfo serverInfo = new ServerInfo();
serverInfo.setHomeUrl(platformEntity.getHomeUrl()); serverInfo.setHomeUrl(platformEntity.getHomeUrl());
serverInfo.setServerUrl(platformEntity.getSendUrl()); serverInfo.setServerUrl(platformEntity.getSendUrl());
registerResp.setServiceInfo(serverInfo); registerResp.setServiceInfo(serverInfo);
DeviceInfo deviceInfo = new DeviceInfo();
deviceInfo.setSiteId(deviceEntity.getSiteId());
deviceInfo.setSiteCode(deviceEntity.getSiteCode());
deviceInfo.setSiteName(deviceEntity.getSiteName());
deviceInfo.setProductId(productEntity.getId());
deviceInfo.setProductName(productEntity.getProductName());
registerResp.setDeviceInfo(deviceInfo);
String content = EncryptUtil.myEnscrt(JSON.toJSONString(registerResp), 9, DES_STR, ENCRYPT_STR); String content = EncryptUtil.myEnscrt(JSON.toJSONString(registerResp), 9, DES_STR, ENCRYPT_STR);
deviceResp.setContent(content); deviceResp.setContent(content);
deviceEntity.setOnlineTime(new Date()); deviceEntity.setOnlineTime(new Date());
...@@ -220,7 +224,6 @@ public class DeviceApiController { ...@@ -220,7 +224,6 @@ public class DeviceApiController {
deviceInitResp.setProductList(productInfoList); deviceInitResp.setProductList(productInfoList);
if (ObjectUtils.isEmpty(productInfoList)) deviceInitResp.setProductList(new ArrayList<>()); if (ObjectUtils.isEmpty(productInfoList)) deviceInitResp.setProductList(new ArrayList<>());
List<FirmInfo> firmList = firmService.find(new FirmEntity()).stream().map(item -> { List<FirmInfo> firmList = firmService.find(new FirmEntity()).stream().map(item -> {
FirmInfo firmInfo = new FirmInfo(); FirmInfo firmInfo = new FirmInfo();
firmInfo.setDeviceFirmId(item.getId()); firmInfo.setDeviceFirmId(item.getId());
...@@ -273,19 +276,24 @@ public class DeviceApiController { ...@@ -273,19 +276,24 @@ public class DeviceApiController {
DeviceResp deviceResp = new DeviceResp(); DeviceResp deviceResp = new DeviceResp();
try { try {
if (ObjectUtils.isEmpty(req.getDeviceCode())) { if (ObjectUtils.isEmpty(req.getDeviceCode())) {
throw new AppException("设备编码不能为空！"); throw new AppException(DEVICE_CODE_IS_EMPTY, DEVICE_CODE_IS_EMPTY_CONTENT);
} }
if (ObjectUtils.isEmpty(req.getSiteId())) { if (ObjectUtils.isEmpty(req.getSiteId())) {
throw new AppException("站点ID不能为空！"); throw new AppException(SITEID_IS_EMPTY, SITEID_IS_EMPTY_CONTENT);
}
PlatformEntity platformEntity = platformService.get(req.getPlatformId());
if (ObjectUtils.isEmpty(platformEntity)) {
throw new AppException("当前平台不存在！");
} }
ProductEntity productEntity = productService.get(req.getProductId()); ProductEntity productEntity = productService.get(req.getProductId());
if (ObjectUtils.isEmpty(productEntity)) { if (ObjectUtils.isEmpty(productEntity)) {
throw new AppException("当前产品不存在！"); throw new AppException(PRODUCT_IS_EMPTY, PRODUCT_IS_EMPTY_CONTENT);
}
if (ObjectUtils.isEmpty(productEntity.getPlatformId())) {
throw new AppException(PLATFORM_UNEXIST, PLATFORM_UNEXIST_CONTENT);
}
PlatformEntity platformEntity = platformService.get(productEntity.getPlatformId());
if (ObjectUtils.isEmpty(platformEntity)) {
throw new AppException(PLATFORM_IS_EMPTY, PLATFORM_IS_EMPTY_CONTENT);
} }
DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode()); DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode());
...@@ -319,7 +327,6 @@ public class DeviceApiController { ...@@ -319,7 +327,6 @@ public class DeviceApiController {
authInfo.setExchangeName(platformEntity.getPlatformSn() + Constant.EXCHANGE_SPLIT + productEntity.getProductCode()); authInfo.setExchangeName(platformEntity.getPlatformSn() + Constant.EXCHANGE_SPLIT + productEntity.getProductCode());
authInfo.setUploadTopicFilter(Constant.UPLOAD_TOPIC + deviceEntity.getDeviceCode()); authInfo.setUploadTopicFilter(Constant.UPLOAD_TOPIC + deviceEntity.getDeviceCode());
authInfo.setDownTopicFilter(Constant.DOWN_TOPIC + deviceEntity.getDeviceCode()); authInfo.setDownTopicFilter(Constant.DOWN_TOPIC + deviceEntity.getDeviceCode());
//authInfo.setHomeUrl(platformEntity.getHomeUrl());
RegisterResp registerResp = new RegisterResp(); RegisterResp registerResp = new RegisterResp();
registerResp.setRabbmitInfo(authInfo); registerResp.setRabbmitInfo(authInfo);
...@@ -329,6 +336,15 @@ public class DeviceApiController { ...@@ -329,6 +336,15 @@ public class DeviceApiController {
serverInfo.setServerUrl(platformEntity.getSendUrl()); serverInfo.setServerUrl(platformEntity.getSendUrl());
registerResp.setServiceInfo(serverInfo); registerResp.setServiceInfo(serverInfo);
DeviceInfo deviceInfo = new DeviceInfo();
deviceInfo.setSiteId(deviceEntity.getSiteId());
deviceInfo.setSiteCode(deviceEntity.getSiteCode());
deviceInfo.setSiteName(deviceEntity.getSiteName());
deviceInfo.setProductId(productEntity.getId());
deviceInfo.setProductName(productEntity.getProductName());
registerResp.setDeviceInfo(deviceInfo);
String content = EncryptUtil.myEnscrt(JSON.toJSONString(registerResp), 9, DES_STR, ENCRYPT_STR); String content = EncryptUtil.myEnscrt(JSON.toJSONString(registerResp), 9, DES_STR, ENCRYPT_STR);
log.info("deEncrypt:{}", EncryptUtil.myReEnscrt(content, 9, DES_STR, ENCRYPT_STR)); log.info("deEncrypt:{}", EncryptUtil.myReEnscrt(content, 9, DES_STR, ENCRYPT_STR));
...@@ -348,6 +364,8 @@ public class DeviceApiController { ...@@ -348,6 +364,8 @@ public class DeviceApiController {
private void saveOrUpdate(DeviceReq req, PlatformEntity platformEntity, ProductEntity productEntity, DeviceEntity deviceEntity) { private void saveOrUpdate(DeviceReq req, PlatformEntity platformEntity, ProductEntity productEntity, DeviceEntity deviceEntity) {
BeanUtils.copyProperties(req, deviceEntity, BeanUtil.getNullPropertyNames(req)); BeanUtils.copyProperties(req, deviceEntity, BeanUtil.getNullPropertyNames(req));
deviceEntity.setPlatformId(platformEntity.getId()); deviceEntity.setPlatformId(platformEntity.getId());
deviceEntity.setPlatformName(platformEntity.getPlatformName()); deviceEntity.setPlatformName(platformEntity.getPlatformName());
...@@ -359,11 +377,9 @@ public class DeviceApiController { ...@@ -359,11 +377,9 @@ public class DeviceApiController {
deviceEntity.setSiteCode(req.getSiteCode()); deviceEntity.setSiteCode(req.getSiteCode());
deviceEntity.setSiteName(req.getSiteName()); deviceEntity.setSiteName(req.getSiteName());
deviceEntity.setDeviceMac(req.getDeviceCode()); deviceEntity.setDeviceMac(req.getDeviceCode());
deviceEntity.setDeviceCode(req.getDeviceCode()); deviceEntity.setDeviceCode(req.getDeviceCode());
deviceEntity.setEnabled(YesNoEnum.YES.getValue()); deviceEntity.setEnabled(YesNoEnum.YES.getValue());
deviceEntity.setDeviceStatus(DeviceStatusEnum.离线.getValue()); deviceEntity.setDeviceStatus(DeviceStatusEnum.离线.getValue());
} }
...@@ -496,20 +512,17 @@ public class DeviceApiController { ...@@ -496,20 +512,17 @@ public class DeviceApiController {
//根据设备编码查询设备 //根据设备编码查询设备
DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode()); DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode());
if (!ObjectUtils.isEmpty(deviceEntity)) { if (!ObjectUtils.isEmpty(deviceEntity)) {
throw new AppException("当前设备编码已存在！"); throw new AppException(DEVICE_CODE_IS_EXIST, DEVICE_CODE_IS_EXIST_CONTENT);
} }
if (ObjectUtils.isEmpty(req.getPlatformCode())) { ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(req.getProductCode()));
throw new AppException("当前平台编码为空！"); if (ObjectUtils.isEmpty(productEntity)) {
throw new AppException(PRODUCT_IS_EMPTY, PRODUCT_IS_EMPTY_CONTENT);
} }
PlatformEntity platformEntity = platformService.selectOne(new PlatformQuery().platformSn(req.getPlatformCode())); PlatformEntity platformEntity = platformService.get(productEntity.getPlatformId());
if (ObjectUtils.isEmpty(platformEntity)) { if (ObjectUtils.isEmpty(platformEntity)) {
throw new AppException("所属系统平台不存在！"); throw new AppException(PLATFORM_IS_EMPTY,PLATFORM_IS_EMPTY_CONTENT);
} }
ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(req.getProductCode()));
if (ObjectUtils.isEmpty(productEntity)) {
throw new AppException("所属产品编码不存在");
}
deviceEntity = new DeviceEntity(); deviceEntity = new DeviceEntity();
deviceEntity.initAttrValue(); deviceEntity.initAttrValue();
deviceEntity.setDeviceName(req.getDeviceName()); deviceEntity.setDeviceName(req.getDeviceName());
...@@ -539,23 +552,17 @@ public class DeviceApiController { ...@@ -539,23 +552,17 @@ public class DeviceApiController {
DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode()); DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode());
if (ObjectUtils.isEmpty(deviceEntity)) { if (ObjectUtils.isEmpty(deviceEntity)) {
throw new AppException("当前设备编码不存在！"); throw new AppException(DEVICE_CODE_IS_EMPTY,DEVICE_CODE_IS_EMPTY_CONTENT);
} }
if (ObjectUtils.isEmpty(req.getPlatformCode())) { ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(req.getProductCode()));
throw new AppException("当前平台编码为空！"); if (ObjectUtils.isEmpty(productEntity)) {
throw new AppException(PRODUCT_IS_EMPTY,PRODUCT_IS_EMPTY_CONTENT);
} }
PlatformEntity platformEntity = platformService.selectOne(new PlatformQuery().platformSn(req.getPlatformCode())); PlatformEntity platformEntity = platformService.get(productEntity.getPlatformId());
if (ObjectUtils.isEmpty(platformEntity)) { if (ObjectUtils.isEmpty(platformEntity)) {
throw new AppException("所属系统平台不存在！"); throw new AppException(PLATFORM_IS_EMPTY,PLATFORM_IS_EMPTY_CONTENT);
}
if (ObjectUtils.isEmpty(req.getPlatformCode())) {
throw new AppException("当前产品Code为空！");
}
ProductEntity productEntity = productService.selectOne(new ProductQuery().productCode(req.getProductCode()));
if (ObjectUtils.isEmpty(productEntity)) {
throw new AppException("所属产品编码不存在");
} }
deviceEntity.setDeviceName(req.getDeviceName()); deviceEntity.setDeviceName(req.getDeviceName());
...@@ -625,7 +632,7 @@ public class DeviceApiController { ...@@ -625,7 +632,7 @@ public class DeviceApiController {
private DeviceEntity checkDeviceExist(DeviceReq req) { private DeviceEntity checkDeviceExist(DeviceReq req) {
if (ObjectUtils.isEmpty(req.getDeviceCode())) { if (ObjectUtils.isEmpty(req.getDeviceCode())) {
throw new AppException("当前设备编码不存在！"); throw new AppException(DEVICE_CODE_IS_EMPTY, DEVICE_CODE_IS_EMPTY_CONTENT);
} }
DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode()); DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceCode());
if (ObjectUtils.isEmpty(deviceEntity)) { if (ObjectUtils.isEmpty(deviceEntity)) {
......
device-manager/src/main/java/com/mortals/xhx/common/exception/api/DeviceRegisterException.java 0 → 100644
View file @ 91ac7bfe
package com.mortals.xhx.common.exception.api;
import com.mortals.framework.exception.AppException;
/**
* @author: zxfei
* @date: 2022/7/11 10:16
* @description:
**/
public class DeviceRegisterException extends AppException {
public DeviceRegisterException(int code, String message) {
super(code, message);
}
}
device-manager/src/main/java/com/mortals/xhx/common/key/ErrorCode.java
View file @ 91ac7bfe
...@@ -28,7 +28,10 @@ public interface ErrorCode { ...@@ -28,7 +28,10 @@ public interface ErrorCode {
public static final int STATUS_TEL_ALREADY_REGI = 12; public static final int STATUS_TEL_ALREADY_REGI = 12;
public static final int STATUS_SAFETY_RISK = 13; public static final int STATUS_SAFETY_RISK = 13;
public static final int STATUS_LOGIN_CODE = 15; public static final int STATUS_LOGIN_CODE = 15;
public static final int BOOK_FAKUAN_CODE = 16;//还有未付款的订单code public static final int BOOK_FAKUAN_CODE = 16;
public static final String ERROR_TOKEN_EXPIRED = "登陆过期，请重新登录"; public static final String ERROR_TOKEN_EXPIRED = "登陆过期，请重新登录";
public static final String ERROR_TRADE_PWD_OVER_THREE_TIME = "支付密码错误，请15分钟后再试"; public static final String ERROR_TRADE_PWD_OVER_THREE_TIME = "支付密码错误，请15分钟后再试";
...@@ -75,4 +78,27 @@ public interface ErrorCode { ...@@ -75,4 +78,27 @@ public interface ErrorCode {
public static final String NOWER="没有权限"; public static final String NOWER="没有权限";
public static final String PAGEDATA="分页参数不能为空"; public static final String PAGEDATA="分页参数不能为空";
public static final String CARADD_MEMBERS="该司机已有绑定车辆，不能绑定多个"; public static final String CARADD_MEMBERS="该司机已有绑定车辆，不能绑定多个";
public static final int DEVICE_CODE_IS_EMPTY = 1001;
public static final String DEVICE_CODE_IS_EMPTY_CONTENT = "当前设备编码不存在！";
public static final int DEVICE_CODE_IS_EXIST = 1002;
public static final String DEVICE_CODE_IS_EXIST_CONTENT = "当前设备编码已存在！";
public static final int PRODUCT_IS_EMPTY = 1003;
public static final String PRODUCT_IS_EMPTY_CONTENT = "所属产品编码不存在！";
public static final int DEVICE_UNACTIVE = 1004;
public static final String DEVICE_UNACTIVE_CONTENT = "当前设备未激活，请在后台配置后再激活！";
public static final int PLATFORM_IS_EMPTY = 1005;
public static final String PLATFORM_IS_EMPTY_CONTENT = "当前设备编码不存在！";
public static final int PLATFORM_UNEXIST = 1006;
public static final String PLATFORM_UNEXIST_CONTENT = "当前设备所属产品平台未配置，请在后台配置后再激活！";
public static final int SITEID_IS_EMPTY = 1007;
public static final String SITEID_IS_EMPTY_CONTENT = "站点ID为空！";
} }
device-manager/src/main/java/com/mortals/xhx/daemon/applicationservice/DeviceMsgComsumerStartedService.java
View file @ 91ac7bfe
...@@ -71,7 +71,7 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi ...@@ -71,7 +71,7 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
Set<TopicPartitionInfo> topicPartitionInfoSet = deviceService.find(new DeviceEntity() Set<TopicPartitionInfo> topicPartitionInfoSet = deviceService.find(new DeviceEntity()
//.active(ActiveEnum.已激活.getValue()) //.active(ActiveEnum.已激活.getValue())
//.status(StatusEnum.启用.getValue()) //.status(StatusEnum.启用.getValue())
) )
.stream() .stream()
.filter(f -> !ObjectUtils.isEmpty(platformService.get(f.getPlatformId()))) .filter(f -> !ObjectUtils.isEmpty(platformService.get(f.getPlatformId())))
.filter(f -> !ObjectUtils.isEmpty(productService.get(f.getProductId()))) .filter(f -> !ObjectUtils.isEmpty(productService.get(f.getProductId())))
...@@ -83,7 +83,7 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi ...@@ -83,7 +83,7 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
} }
).collect(Collectors.toSet()); ).collect(Collectors.toSet());
mainConsumer.subscribe(topicPartitionInfoSet); mainConsumer.subscribe(topicPartitionInfoSet);
topicPartitionInfoSet.stream().forEach(item->{ topicPartitionInfoSet.stream().forEach(item -> {
log.info("消费线程订阅topic：{}", item.getTopic()); log.info("消费线程订阅topic：{}", item.getTopic());
}); });
this.consumersExecutor = Executors.newCachedThreadPool(IotThreadFactory.forName("消费queue线程")); this.consumersExecutor = Executors.newCachedThreadPool(IotThreadFactory.forName("消费queue线程"));
...@@ -156,9 +156,13 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi ...@@ -156,9 +156,13 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
for (TbQueueMsg queueMsg : messages) { for (TbQueueMsg queueMsg : messages) {
log.info("[WRITE MESSAGE] ->message:{}", JSON.toJSONString(queueMsg)); log.info("[WRITE MESSAGE] ->message:{}", JSON.toJSONString(queueMsg));
//做相应业务,做日志操作 //做相应业务,做日志操作
DeviceReq deviceReq = JSON.parseObject(new String(queueMsg.getData()), DeviceReq.class); // TODO: 2022/7/12 设备来源从设备编码中获取，内容不做处理
String deviceCode = queueMsg.getHeaders().get("deviceCode");
String messageType = queueMsg.getHeaders().get(MESSAGETYPE);
//DeviceReq deviceReq = JSON.parseObject(new String(queueMsg.getData()), DeviceReq.class);
boolean bool = false; boolean bool = false;
DeviceEntity deviceEntity = deviceService.getExtCache(deviceReq.getDeviceCode()); DeviceEntity deviceEntity = deviceService.getExtCache(deviceCode);
if (!ObjectUtils.isEmpty(deviceEntity)) { if (!ObjectUtils.isEmpty(deviceEntity)) {
cacheService.setnx(RedisKey.KEY_DEVICE_ONLINE_CACHE + deviceEntity.getDeviceCode(), "", GlobalSysInfo.getParamIntValue(Constant.HEARTBEAT_TIMEOUT, 180)); cacheService.setnx(RedisKey.KEY_DEVICE_ONLINE_CACHE + deviceEntity.getDeviceCode(), "", GlobalSysInfo.getParamIntValue(Constant.HEARTBEAT_TIMEOUT, 180));
if (deviceEntity.getDeviceStatus() == DeviceStatusEnum.离线.getValue()) { if (deviceEntity.getDeviceStatus() == DeviceStatusEnum.离线.getValue()) {
...@@ -176,14 +180,14 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi ...@@ -176,14 +180,14 @@ public class DeviceMsgComsumerStartedService implements IApplicationStartedServi
deviceService.sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.OFFLINE); deviceService.sendThirdParty(deviceEntity, productEntity, platformEntity, DeviceMethodEnum.OFFLINE);
} }
} }
if (!Constant.MESSAGETYPE_HEARTBEAT.equals(queueMsg.getHeaders().getData().get(MESSAGETYPE))) { if (!Constant.MESSAGETYPE_HEARTBEAT.equals(messageType)) {
DeviceLogEntity deviceLogEntity = new DeviceLogEntity(); DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
deviceLogEntity.initAttrValue(); deviceLogEntity.initAttrValue();
deviceLogEntity.setDeviceId(deviceEntity.getId()); deviceLogEntity.setDeviceId(deviceEntity.getId());
deviceLogEntity.setDeviceName(deviceEntity.getDeviceName()); deviceLogEntity.setDeviceName(deviceEntity.getDeviceName());
deviceLogEntity.setDeviceCode(deviceEntity.getDeviceCode()); deviceLogEntity.setDeviceCode(deviceEntity.getDeviceCode());
deviceLogEntity.setMessageHead(queueMsg.getHeaders().getData().get(MESSAGETYPE)); deviceLogEntity.setMessageHead(queueMsg.getHeaders().getData().get(MESSAGETYPE));
deviceLogEntity.setContent(JSONObject.toJSONString(deviceReq)); deviceLogEntity.setContent(new String(queueMsg.getData()));
deviceLogEntity.setLogType(LogTypeEnum.上报事件.getValue()); deviceLogEntity.setLogType(LogTypeEnum.上报事件.getValue());
deviceLogEntity.setCreateUserId(1L); deviceLogEntity.setCreateUserId(1L);
deviceLogEntity.setCreateTime(new Date()); deviceLogEntity.setCreateTime(new Date());
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
View file @ 91ac7bfe
...@@ -4,649 +4,663 @@ import java.util.Date; ...@@ -4,649 +4,663 @@ import java.util.Date;
import java.util.List; import java.util.List;
import java.util.ArrayList; import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.mortals.framework.annotation.Excel; import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
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;
/** /**
* 设备实体对象 * 设备实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-11
*/ */
public class DeviceEntity extends DeviceVo { public class DeviceEntity extends DeviceVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 设备名称 * 设备名称
*/ */
@Excel(name = "设备名称") @Excel(name = "设备名称")
private String deviceName; private String deviceName;
/** /**
* 设备编码,SN码等，默认为MAC地址 * 设备编码,SN码等，默认为MAC地址
*/ */
@Excel(name = "设备编码") @Excel(name = "设备编码,SN码等，默认为MAC地址")
private String deviceCode; private String deviceCode;
/** /**
* 设备的MAC地址 * 设备的MAC地址
*/ */
private String deviceMac; private String deviceMac;
/** /**
* 站点Id，来源基础服务平台 * 站点Id，来源基础服务平台
*/ */
//@Excel(name = "站点名称",cacheDict = "siteDict")
private Long siteId; private Long siteId;
/** /**
* 站点编号，来源基础服务平台 * 站点编号，来源基础服务平台
*/ */
private String siteCode; private String siteCode;
/** /**
* 站点名称 * 站点名称
*/ */
private String siteName; private String siteName;
/** /**
* 平台系统Id * 平台系统Id
*/ */
private Long platformId; private Long platformId;
/** /**
* 平台系统名称 * 平台系统名称
*/ */
private String platformName; private String platformName;
/** /**
* 产品Id * 产品Id
*/ */
private Long productId; private Long productId;
/** /**
* 产品名称 * 产品名称
*/ */
private String productName; private String productName;
/** /**
* 设备生产厂商ID * 设备生产厂商ID
*/ */
private Long deviceFirmId; private Long deviceFirmId;
/** /**
* 设备生产厂商名称 * 设备生产厂商名称
*/ */
@Excel(name = "设备生产厂商名称")
private String deviceFirmname; private String deviceFirmname;
/** /**
* 设备来源(0.子设备，1.网关设备，2.直连设备) * 设备来源(0.子设备，1.网关设备，2.直连设备)
*/ */
private Integer deviceSrc; private Integer deviceSrc;
/** /**
* 数据获取方式(0.主动上报，1.被动拉取) * 数据获取方式(0.主动上报，1.被动拉取)
*/ */
private Integer deviceDataSourceWay; private Integer deviceDataSourceWay;
/** /**
* 经度 * 经度
*/ */
private String lon; private String lon;
/** /**
* 经度 * 经度
*/ */
private String lati; private String lati;
/** /**
* 所属楼栋 * 所属楼栋
*/ */
private Integer deviceInBuilding; private Integer deviceInBuilding;
/** /**
* 所属楼层 * 所属楼层
*/ */
private Integer deviceInFloor; private Integer deviceInFloor;
/** /**
* 保修期至 * 保修期至
*/ */
@JsonDeserialize(using = CustomJsonDateDeserializer.class)
private Date defectsLiabilityPeriod; private Date defectsLiabilityPeriod;
/** /**
* 负责人 * 负责人
*/ */
private String leadingOfficial; private String leadingOfficial;
/** /**
* 联系电话 * 联系电话
*/ */
private String leadingOfficialTelephone; private String leadingOfficialTelephone;
/** /**
* 是否接收异常短(0.否，1.是) * 是否接收异常短(0.否，1.是)
*/ */
private Integer isReceiveMess; private Integer isReceiveMess;
/** /**
* 设备图片 * 设备图片
*/ */
@Excel(name = "设备图片",height = 90, type = Excel.Type.EXPORT, cellType = Excel.ColumnType.IMAGE)
private String devicePhotoPath; private String devicePhotoPath;
/** /**
* 设备访问ip * 设备访问ip
*/ */
private String ip; private String ip;
/** /**
* 中心设备编码 * 中心设备编码
*/ */
private String centernum; private String centernum;
/** /**
* 端口 * 端口
*/ */
private String port; private String port;
/** /**
* 设备topic信息 * 设备topic信息
*/ */
private String deviceTopic; private String deviceTopic;
/** /**
* 设备状态 (0.未激活，1.离线,2.在线) * 设备状态 (0.未激活，1.离线,2.在线)
*/ */
private Integer deviceStatus; private Integer deviceStatus;
/** /**
* 启用状态 (0.停止，1.启用) * 启用状态 (0.停止，1.启用)
*/ */
private Integer enabled; private Integer enabled;
/** /**
* 设备授权码 * 设备授权码
*/ */
private String deviceAuthCode; private String deviceAuthCode;
/** /**
* 备注 * 备注
*/ */
private String deviceRemark; private String deviceRemark;
/** /**
* 最近上线时间 * 最近上线时间
*/ */
private Date onlineTime; private Date onlineTime;
/** /**
* 最近离线时间 * 最近离线时间
*/ */
private Date offlineTime; private Date offlineTime;
/** /**
* 是否删除，(0.否，1.是) * 是否删除(0.否，1.是)
*/ */
private Integer deleted; private Integer deleted;
/**
* 收不来源(0.旧设备，1.新设备)
*/
private Integer source;
public DeviceEntity(){} public DeviceEntity(){}
/** /**
* 获取 设备名称 * 获取 设备名称
* @return String * @return String
*/ */
public String getDeviceName(){ public String getDeviceName(){
return deviceName; return deviceName;
} }
/** /**
* 设置 设备名称 * 设置 设备名称
* @param deviceName * @param deviceName
*/ */
public void setDeviceName(String deviceName){ public void setDeviceName(String deviceName){
this.deviceName = deviceName; this.deviceName = deviceName;
} }
/** /**
* 获取 设备编码,SN码等，默认为MAC地址 * 获取 设备编码,SN码等，默认为MAC地址
* @return String * @return String
*/ */
public String getDeviceCode(){ public String getDeviceCode(){
return deviceCode; return deviceCode;
} }
/** /**
* 设置 设备编码,SN码等，默认为MAC地址 * 设置 设备编码,SN码等，默认为MAC地址
* @param deviceCode * @param deviceCode
*/ */
public void setDeviceCode(String deviceCode){ public void setDeviceCode(String deviceCode){
this.deviceCode = deviceCode; this.deviceCode = deviceCode;
} }
/** /**
* 获取 设备的MAC地址 * 获取 设备的MAC地址
* @return String * @return String
*/ */
public String getDeviceMac(){ public String getDeviceMac(){
return deviceMac; return deviceMac;
} }
/** /**
* 设置 设备的MAC地址 * 设置 设备的MAC地址
* @param deviceMac * @param deviceMac
*/ */
public void setDeviceMac(String deviceMac){ public void setDeviceMac(String deviceMac){
this.deviceMac = deviceMac; this.deviceMac = deviceMac;
} }
/** /**
* 获取 站点Id，来源基础服务平台 * 获取 站点Id，来源基础服务平台
* @return Long * @return Long
*/ */
public Long getSiteId(){ public Long getSiteId(){
return siteId; return siteId;
} }
/** /**
* 设置 站点Id，来源基础服务平台 * 设置 站点Id，来源基础服务平台
* @param siteId * @param siteId
*/ */
public void setSiteId(Long siteId){ public void setSiteId(Long siteId){
this.siteId = siteId; this.siteId = siteId;
} }
/** /**
* 获取 站点编号，来源基础服务平台 * 获取 站点编号，来源基础服务平台
* @return String * @return String
*/ */
public String getSiteCode(){ public String getSiteCode(){
return siteCode; return siteCode;
} }
/** /**
* 设置 站点编号，来源基础服务平台 * 设置 站点编号，来源基础服务平台
* @param siteCode * @param siteCode
*/ */
public void setSiteCode(String siteCode){ public void setSiteCode(String siteCode){
this.siteCode = siteCode; this.siteCode = siteCode;
} }
/** /**
* 获取 站点名称 * 获取 站点名称
* @return String * @return String
*/ */
public String getSiteName(){ public String getSiteName(){
return siteName; return siteName;
} }
/** /**
* 设置 站点名称 * 设置 站点名称
* @param siteName * @param siteName
*/ */
public void setSiteName(String siteName){ public void setSiteName(String siteName){
this.siteName = siteName; this.siteName = siteName;
} }
/** /**
* 获取 平台系统Id * 获取 平台系统Id
* @return Long * @return Long
*/ */
public Long getPlatformId(){ public Long getPlatformId(){
return platformId; return platformId;
} }
/** /**
* 设置 平台系统Id * 设置 平台系统Id
* @param platformId * @param platformId
*/ */
public void setPlatformId(Long platformId){ public void setPlatformId(Long platformId){
this.platformId = platformId; this.platformId = platformId;
} }
/** /**
* 获取 平台系统名称 * 获取 平台系统名称
* @return String * @return String
*/ */
public String getPlatformName(){ public String getPlatformName(){
return platformName; return platformName;
} }
/** /**
* 设置 平台系统名称 * 设置 平台系统名称
* @param platformName * @param platformName
*/ */
public void setPlatformName(String platformName){ public void setPlatformName(String platformName){
this.platformName = platformName; this.platformName = platformName;
} }
/** /**
* 获取 产品Id * 获取 产品Id
* @return Long * @return Long
*/ */
public Long getProductId(){ public Long getProductId(){
return productId; return productId;
} }
/** /**
* 设置 产品Id * 设置 产品Id
* @param productId * @param productId
*/ */
public void setProductId(Long productId){ public void setProductId(Long productId){
this.productId = productId; this.productId = productId;
} }
/** /**
* 获取 产品名称 * 获取 产品名称
* @return String * @return String
*/ */
public String getProductName(){ public String getProductName(){
return productName; return productName;
} }
/** /**
* 设置 产品名称 * 设置 产品名称
* @param productName * @param productName
*/ */
public void setProductName(String productName){ public void setProductName(String productName){
this.productName = productName; this.productName = productName;
} }
/** /**
* 获取 设备生产厂商ID * 获取 设备生产厂商ID
* @return Long * @return Long
*/ */
public Long getDeviceFirmId(){ public Long getDeviceFirmId(){
return deviceFirmId; return deviceFirmId;
} }
/** /**
* 设置 设备生产厂商ID * 设置 设备生产厂商ID
* @param deviceFirmId * @param deviceFirmId
*/ */
public void setDeviceFirmId(Long deviceFirmId){ public void setDeviceFirmId(Long deviceFirmId){
this.deviceFirmId = deviceFirmId; this.deviceFirmId = deviceFirmId;
} }
/** /**
* 获取 设备生产厂商名称 * 获取 设备生产厂商名称
* @return String * @return String
*/ */
public String getDeviceFirmname(){ public String getDeviceFirmname(){
return deviceFirmname; return deviceFirmname;
} }
/** /**
* 设置 设备生产厂商名称 * 设置 设备生产厂商名称
* @param deviceFirmname * @param deviceFirmname
*/ */
public void setDeviceFirmname(String deviceFirmname){ public void setDeviceFirmname(String deviceFirmname){
this.deviceFirmname = deviceFirmname; this.deviceFirmname = deviceFirmname;
} }
/** /**
* 获取 设备来源(0.子设备，1.网关设备，2.直连设备) * 获取 设备来源(0.子设备，1.网关设备，2.直连设备)
* @return Integer * @return Integer
*/ */
public Integer getDeviceSrc(){ public Integer getDeviceSrc(){
return deviceSrc; return deviceSrc;
} }
/** /**
* 设置 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrc * @param deviceSrc
*/ */
public void setDeviceSrc(Integer deviceSrc){ public void setDeviceSrc(Integer deviceSrc){
this.deviceSrc = deviceSrc; this.deviceSrc = deviceSrc;
} }
/** /**
* 获取 数据获取方式(0.主动上报，1.被动拉取) * 获取 数据获取方式(0.主动上报，1.被动拉取)
* @return Integer * @return Integer
*/ */
public Integer getDeviceDataSourceWay(){ public Integer getDeviceDataSourceWay(){
return deviceDataSourceWay; return deviceDataSourceWay;
} }
/** /**
* 设置 数据获取方式(0.主动上报，1.被动拉取) * 设置 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWay * @param deviceDataSourceWay
*/ */
public void setDeviceDataSourceWay(Integer deviceDataSourceWay){ public void setDeviceDataSourceWay(Integer deviceDataSourceWay){
this.deviceDataSourceWay = deviceDataSourceWay; this.deviceDataSourceWay = deviceDataSourceWay;
} }
/** /**
* 获取 经度 * 获取 经度
* @return String * @return String
*/ */
public String getLon(){ public String getLon(){
return lon; return lon;
} }
/** /**
* 设置 经度 * 设置 经度
* @param lon * @param lon
*/ */
public void setLon(String lon){ public void setLon(String lon){
this.lon = lon; this.lon = lon;
} }
/** /**
* 获取 经度 * 获取 经度
* @return String * @return String
*/ */
public String getLati(){ public String getLati(){
return lati; return lati;
} }
/** /**
* 设置 经度 * 设置 经度
* @param lati * @param lati
*/ */
public void setLati(String lati){ public void setLati(String lati){
this.lati = lati; this.lati = lati;
} }
/** /**
* 获取 所属楼栋 * 获取 所属楼栋
* @return Integer * @return Integer
*/ */
public Integer getDeviceInBuilding(){ public Integer getDeviceInBuilding(){
return deviceInBuilding; return deviceInBuilding;
} }
/** /**
* 设置 所属楼栋 * 设置 所属楼栋
* @param deviceInBuilding * @param deviceInBuilding
*/ */
public void setDeviceInBuilding(Integer deviceInBuilding){ public void setDeviceInBuilding(Integer deviceInBuilding){
this.deviceInBuilding = deviceInBuilding; this.deviceInBuilding = deviceInBuilding;
} }
/** /**
* 获取 所属楼层 * 获取 所属楼层
* @return Integer * @return Integer
*/ */
public Integer getDeviceInFloor(){ public Integer getDeviceInFloor(){
return deviceInFloor; return deviceInFloor;
} }
/** /**
* 设置 所属楼层 * 设置 所属楼层
* @param deviceInFloor * @param deviceInFloor
*/ */
public void setDeviceInFloor(Integer deviceInFloor){ public void setDeviceInFloor(Integer deviceInFloor){
this.deviceInFloor = deviceInFloor; this.deviceInFloor = deviceInFloor;
} }
/** /**
* 获取 保修期至 * 获取 保修期至
* @return Date * @return Date
*/ */
public Date getDefectsLiabilityPeriod(){ public Date getDefectsLiabilityPeriod(){
return defectsLiabilityPeriod; return defectsLiabilityPeriod;
} }
/** /**
* 设置 保修期至 * 设置 保修期至
* @param defectsLiabilityPeriod * @param defectsLiabilityPeriod
*/ */
public void setDefectsLiabilityPeriod(Date defectsLiabilityPeriod){ public void setDefectsLiabilityPeriod(Date defectsLiabilityPeriod){
this.defectsLiabilityPeriod = defectsLiabilityPeriod; this.defectsLiabilityPeriod = defectsLiabilityPeriod;
} }
/** /**
* 获取 负责人 * 获取 负责人
* @return String * @return String
*/ */
public String getLeadingOfficial(){ public String getLeadingOfficial(){
return leadingOfficial; return leadingOfficial;
} }
/** /**
* 设置 负责人 * 设置 负责人
* @param leadingOfficial * @param leadingOfficial
*/ */
public void setLeadingOfficial(String leadingOfficial){ public void setLeadingOfficial(String leadingOfficial){
this.leadingOfficial = leadingOfficial; this.leadingOfficial = leadingOfficial;
} }
/** /**
* 获取 联系电话 * 获取 联系电话
* @return String * @return String
*/ */
public String getLeadingOfficialTelephone(){ public String getLeadingOfficialTelephone(){
return leadingOfficialTelephone; return leadingOfficialTelephone;
} }
/** /**
* 设置 联系电话 * 设置 联系电话
* @param leadingOfficialTelephone * @param leadingOfficialTelephone
*/ */
public void setLeadingOfficialTelephone(String leadingOfficialTelephone){ public void setLeadingOfficialTelephone(String leadingOfficialTelephone){
this.leadingOfficialTelephone = leadingOfficialTelephone; this.leadingOfficialTelephone = leadingOfficialTelephone;
} }
/** /**
* 获取 是否接收异常短(0.否，1.是) * 获取 是否接收异常短(0.否，1.是)
* @return Integer * @return Integer
*/ */
public Integer getIsReceiveMess(){ public Integer getIsReceiveMess(){
return isReceiveMess; return isReceiveMess;
} }
/** /**
* 设置 是否接收异常短(0.否，1.是) * 设置 是否接收异常短(0.否，1.是)
* @param isReceiveMess * @param isReceiveMess
*/ */
public void setIsReceiveMess(Integer isReceiveMess){ public void setIsReceiveMess(Integer isReceiveMess){
this.isReceiveMess = isReceiveMess; this.isReceiveMess = isReceiveMess;
} }
/** /**
* 获取 设备图片 * 获取 设备图片
* @return String * @return String
*/ */
public String getDevicePhotoPath(){ public String getDevicePhotoPath(){
return devicePhotoPath; return devicePhotoPath;
} }
/** /**
* 设置 设备图片 * 设置 设备图片
* @param devicePhotoPath * @param devicePhotoPath
*/ */
public void setDevicePhotoPath(String devicePhotoPath){ public void setDevicePhotoPath(String devicePhotoPath){
this.devicePhotoPath = devicePhotoPath; this.devicePhotoPath = devicePhotoPath;
} }
/** /**
* 获取 设备访问ip * 获取 设备访问ip
* @return String * @return String
*/ */
public String getIp(){ public String getIp(){
return ip; return ip;
} }
/** /**
* 设置 设备访问ip * 设置 设备访问ip
* @param ip * @param ip
*/ */
public void setIp(String ip){ public void setIp(String ip){
this.ip = ip; this.ip = ip;
} }
/** /**
* 获取 中心设备编码 * 获取 中心设备编码
* @return String * @return String
*/ */
public String getCenternum(){ public String getCenternum(){
return centernum; return centernum;
} }
/** /**
* 设置 中心设备编码 * 设置 中心设备编码
* @param centernum * @param centernum
*/ */
public void setCenternum(String centernum){ public void setCenternum(String centernum){
this.centernum = centernum; this.centernum = centernum;
} }
/** /**
* 获取 端口 * 获取 端口
* @return String * @return String
*/ */
public String getPort(){ public String getPort(){
return port; return port;
} }
/** /**
* 设置 端口 * 设置 端口
* @param port * @param port
*/ */
public void setPort(String port){ public void setPort(String port){
this.port = port; this.port = port;
} }
/** /**
* 获取 设备topic信息 * 获取 设备topic信息
* @return String * @return String
*/ */
public String getDeviceTopic(){ public String getDeviceTopic(){
return deviceTopic; return deviceTopic;
} }
/** /**
* 设置 设备topic信息 * 设置 设备topic信息
* @param deviceTopic * @param deviceTopic
*/ */
public void setDeviceTopic(String deviceTopic){ public void setDeviceTopic(String deviceTopic){
this.deviceTopic = deviceTopic; this.deviceTopic = deviceTopic;
} }
/** /**
* 获取 设备状态 (0.未激活，1.离线,2.在线) * 获取 设备状态 (0.未激活，1.离线,2.在线)
* @return Integer * @return Integer
*/ */
public Integer getDeviceStatus(){ public Integer getDeviceStatus(){
return deviceStatus; return deviceStatus;
} }
/** /**
* 设置 设备状态 (0.未激活，1.离线,2.在线) * 设置 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatus * @param deviceStatus
*/ */
public void setDeviceStatus(Integer deviceStatus){ public void setDeviceStatus(Integer deviceStatus){
this.deviceStatus = deviceStatus; this.deviceStatus = deviceStatus;
} }
/** /**
* 获取 启用状态 (0.停止，1.启用) * 获取 启用状态 (0.停止，1.启用)
* @return Integer * @return Integer
*/ */
public Integer getEnabled(){ public Integer getEnabled(){
return enabled; return enabled;
} }
/** /**
* 设置 启用状态 (0.停止，1.启用) * 设置 启用状态 (0.停止，1.启用)
* @param enabled * @param enabled
*/ */
public void setEnabled(Integer enabled){ public void setEnabled(Integer enabled){
this.enabled = enabled; this.enabled = enabled;
} }
/** /**
* 获取 设备授权码 * 获取 设备授权码
* @return String * @return String
*/ */
public String getDeviceAuthCode(){ public String getDeviceAuthCode(){
return deviceAuthCode; return deviceAuthCode;
} }
/** /**
* 设置 设备授权码 * 设置 设备授权码
* @param deviceAuthCode * @param deviceAuthCode
*/ */
public void setDeviceAuthCode(String deviceAuthCode){ public void setDeviceAuthCode(String deviceAuthCode){
this.deviceAuthCode = deviceAuthCode; this.deviceAuthCode = deviceAuthCode;
} }
/** /**
* 获取 备注 * 获取 备注
* @return String * @return String
*/ */
public String getDeviceRemark(){ public String getDeviceRemark(){
return deviceRemark; return deviceRemark;
} }
/** /**
* 设置 备注 * 设置 备注
* @param deviceRemark * @param deviceRemark
*/ */
public void setDeviceRemark(String deviceRemark){ public void setDeviceRemark(String deviceRemark){
this.deviceRemark = deviceRemark; this.deviceRemark = deviceRemark;
} }
/** /**
* 获取 最近上线时间 * 获取 最近上线时间
* @return Date * @return Date
*/ */
public Date getOnlineTime(){ public Date getOnlineTime(){
return onlineTime; return onlineTime;
} }
/** /**
* 设置 最近上线时间 * 设置 最近上线时间
* @param onlineTime * @param onlineTime
*/ */
public void setOnlineTime(Date onlineTime){ public void setOnlineTime(Date onlineTime){
this.onlineTime = onlineTime; this.onlineTime = onlineTime;
} }
/** /**
* 获取 最近离线时间 * 获取 最近离线时间
* @return Date * @return Date
*/ */
public Date getOfflineTime(){ public Date getOfflineTime(){
return offlineTime; return offlineTime;
} }
/** /**
* 设置 最近离线时间 * 设置 最近离线时间
* @param offlineTime * @param offlineTime
*/ */
public void setOfflineTime(Date offlineTime){ public void setOfflineTime(Date offlineTime){
this.offlineTime = offlineTime; this.offlineTime = offlineTime;
} }
/** /**
* 获取 是否删除，(0.否，1.是) * 获取 是否删除(0.否，1.是)
* @return Integer * @return Integer
*/ */
public Integer getDeleted(){ public Integer getDeleted(){
return deleted; return deleted;
} }
/** /**
* 设置 是否删除，(0.否，1.是) * 设置 是否删除(0.否，1.是)
* @param deleted * @param deleted
*/ */
public void setDeleted(Integer deleted){ public void setDeleted(Integer deleted){
this.deleted = deleted; this.deleted = deleted;
} }
/**
* 获取 收不来源(0.旧设备，1.新设备)
* @return Integer
*/
public Integer getSource(){
return source;
}
/**
* 设置 收不来源(0.旧设备，1.新设备)
* @param source
*/
public void setSource(Integer source){
this.source = source;
}
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -654,7 +668,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -654,7 +668,7 @@ public class DeviceEntity extends DeviceVo {
if (obj instanceof DeviceEntity) { if (obj instanceof DeviceEntity) {
DeviceEntity tmp = (DeviceEntity) obj; DeviceEntity tmp = (DeviceEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -696,77 +710,80 @@ public class DeviceEntity extends DeviceVo { ...@@ -696,77 +710,80 @@ public class DeviceEntity extends DeviceVo {
sb.append(",onlineTime:").append(getOnlineTime()); sb.append(",onlineTime:").append(getOnlineTime());
sb.append(",offlineTime:").append(getOfflineTime()); sb.append(",offlineTime:").append(getOfflineTime());
sb.append(",deleted:").append(getDeleted()); sb.append(",deleted:").append(getDeleted());
sb.append(",source:").append(getSource());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.deviceName = ""; this.deviceName = "";
this.deviceCode = "";
this.deviceCode = ""; this.deviceMac = "";
this.deviceMac = ""; this.siteId = null;
this.siteId = null; this.siteCode = "";
this.siteCode = ""; this.siteName = "";
this.siteName = ""; this.platformId = null;
this.platformId = null; this.platformName = "";
this.platformName = ""; this.productId = null;
this.productId = null; this.productName = "";
this.productName = ""; this.deviceFirmId = null;
this.deviceFirmId = null; this.deviceFirmname = "";
this.deviceFirmname = ""; this.deviceSrc = 2;
this.deviceSrc = 0; this.deviceDataSourceWay = 0;
this.deviceDataSourceWay = 0; this.lon = "";
this.lon = ""; this.lati = "";
this.lati = ""; this.deviceInBuilding = null;
this.deviceInBuilding = null; this.deviceInFloor = null;
this.deviceInFloor = null; this.defectsLiabilityPeriod = null;
this.defectsLiabilityPeriod = null; this.leadingOfficial = "";
this.leadingOfficial = ""; this.leadingOfficialTelephone = "";
this.leadingOfficialTelephone = ""; this.isReceiveMess = 0;
this.isReceiveMess = 0; this.devicePhotoPath = "";
this.devicePhotoPath = ""; this.ip = "";
this.ip = ""; this.centernum = "";
this.centernum = ""; this.port = "";
this.port = ""; this.deviceTopic = "";
this.deviceTopic = ""; this.deviceStatus = 0;
this.deviceStatus = 0; this.enabled = 0;
this.enabled = 0; this.deviceAuthCode = "";
this.deviceAuthCode = ""; this.deviceRemark = "";
this.deviceRemark = ""; this.onlineTime = null;
this.onlineTime = null; this.offlineTime = null;
this.offlineTime = null; this.deleted = 0;
this.deleted = 0; this.source = 1;
} }
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java
View file @ 91ac7bfe
...@@ -4,11 +4,11 @@ import java.util.Date; ...@@ -4,11 +4,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
/** /**
* 设备查询对象 * 设备查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-11
*/ */
public class DeviceQuery extends DeviceEntity { public class DeviceQuery extends DeviceEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -229,18 +229,30 @@ public class DeviceQuery extends DeviceEntity { ...@@ -229,18 +229,30 @@ public class DeviceQuery extends DeviceEntity {
/** 结束 最近离线时间 */ /** 结束 最近离线时间 */
private String offlineTimeEnd; private String offlineTimeEnd;
/** 开始 是否删除，(0.否，1.是) */ /** 开始 是否删除(0.否，1.是) */
private Integer deletedStart; private Integer deletedStart;
/** 结束 是否删除，(0.否，1.是) */ /** 结束 是否删除(0.否，1.是) */
private Integer deletedEnd; private Integer deletedEnd;
/** 增加 是否删除，(0.否，1.是) */ /** 增加 是否删除(0.否，1.是) */
private Integer deletedIncrement; private Integer deletedIncrement;
/** 是否删除，(0.否，1.是)列表 */ /** 是否删除(0.否，1.是)列表 */
private List <Integer> deletedList; private List <Integer> deletedList;
/** 开始 收不来源(0.旧设备，1.新设备) */
private Integer sourceStart;
/** 结束 收不来源(0.旧设备，1.新设备) */
private Integer sourceEnd;
/** 增加 收不来源(0.旧设备，1.新设备) */
private Integer sourceIncrement;
/** 收不来源(0.旧设备，1.新设备)列表 */
private List <Integer> sourceList;
/** 开始 创建用户 */ /** 开始 创建用户 */
private Long createUserIdStart; private Long createUserIdStart;
...@@ -286,2479 +298,2588 @@ public class DeviceQuery extends DeviceEntity { ...@@ -286,2479 +298,2588 @@ public class DeviceQuery extends DeviceEntity {
public DeviceQuery(){} public DeviceQuery(){}
/** /**
* 获取 开始 主键ID，主键，自增长 * 获取 开始 主键ID，主键，自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 主键ID，主键，自增长 * 获取 结束 主键ID，主键，自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 主键ID，主键，自增长 * 获取 增加 主键ID，主键，自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 主键ID，主键，自增长 * 获取 主键ID，主键，自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 设备名称 * 获取 设备名称
* @return deviceNameList * @return deviceNameList
*/ */
public List<String> getDeviceNameList(){ public List<String> getDeviceNameList(){
return this.deviceNameList; return this.deviceNameList;
} }
/** /**
* 设置 设备名称 * 设置 设备名称
* @param deviceNameList * @param deviceNameList
*/ */
public void setDeviceNameList(List<String> deviceNameList){ public void setDeviceNameList(List<String> deviceNameList){
this.deviceNameList = deviceNameList; this.deviceNameList = deviceNameList;
} }
/** /**
* 获取 设备编码,SN码等，默认为MAC地址 * 获取 设备编码,SN码等，默认为MAC地址
* @return deviceCodeList * @return deviceCodeList
*/ */
public List<String> getDeviceCodeList(){ public List<String> getDeviceCodeList(){
return this.deviceCodeList; return this.deviceCodeList;
} }
/** /**
* 设置 设备编码,SN码等，默认为MAC地址 * 设置 设备编码,SN码等，默认为MAC地址
* @param deviceCodeList * @param deviceCodeList
*/ */
public void setDeviceCodeList(List<String> deviceCodeList){ public void setDeviceCodeList(List<String> deviceCodeList){
this.deviceCodeList = deviceCodeList; this.deviceCodeList = deviceCodeList;
} }
/** /**
* 获取 设备的MAC地址 * 获取 设备的MAC地址
* @return deviceMacList * @return deviceMacList
*/ */
public List<String> getDeviceMacList(){ public List<String> getDeviceMacList(){
return this.deviceMacList; return this.deviceMacList;
} }
/** /**
* 设置 设备的MAC地址 * 设置 设备的MAC地址
* @param deviceMacList * @param deviceMacList
*/ */
public void setDeviceMacList(List<String> deviceMacList){ public void setDeviceMacList(List<String> deviceMacList){
this.deviceMacList = deviceMacList; this.deviceMacList = deviceMacList;
} }
/** /**
* 获取 开始 站点Id，来源基础服务平台 * 获取 开始 站点Id，来源基础服务平台
* @return siteIdStart * @return siteIdStart
*/ */
public Long getSiteIdStart(){ public Long getSiteIdStart(){
return this.siteIdStart; return this.siteIdStart;
} }
/** /**
* 设置 开始 站点Id，来源基础服务平台 * 设置 开始 站点Id，来源基础服务平台
* @param siteIdStart * @param siteIdStart
*/ */
public void setSiteIdStart(Long siteIdStart){ public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart; this.siteIdStart = siteIdStart;
} }
/** /**
* 获取 结束 站点Id，来源基础服务平台 * 获取 结束 站点Id，来源基础服务平台
* @return $siteIdEnd * @return $siteIdEnd
*/ */
public Long getSiteIdEnd(){ public Long getSiteIdEnd(){
return this.siteIdEnd; return this.siteIdEnd;
} }
/** /**
* 设置 结束 站点Id，来源基础服务平台 * 设置 结束 站点Id，来源基础服务平台
* @param siteIdEnd * @param siteIdEnd
*/ */
public void setSiteIdEnd(Long siteIdEnd){ public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd; this.siteIdEnd = siteIdEnd;
} }
/** /**
* 获取 增加 站点Id，来源基础服务平台 * 获取 增加 站点Id，来源基础服务平台
* @return siteIdIncrement * @return siteIdIncrement
*/ */
public Long getSiteIdIncrement(){ public Long getSiteIdIncrement(){
return this.siteIdIncrement; return this.siteIdIncrement;
} }
/** /**
* 设置 增加 站点Id，来源基础服务平台 * 设置 增加 站点Id，来源基础服务平台
* @param siteIdIncrement * @param siteIdIncrement
*/ */
public void setSiteIdIncrement(Long siteIdIncrement){ public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement; this.siteIdIncrement = siteIdIncrement;
} }
/** /**
* 获取 站点Id，来源基础服务平台 * 获取 站点Id，来源基础服务平台
* @return siteIdList * @return siteIdList
*/ */
public List<Long> getSiteIdList(){ public List<Long> getSiteIdList(){
return this.siteIdList; return this.siteIdList;
} }
/** /**
* 设置 站点Id，来源基础服务平台 * 设置 站点Id，来源基础服务平台
* @param siteIdList * @param siteIdList
*/ */
public void setSiteIdList(List<Long> siteIdList){ public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList; this.siteIdList = siteIdList;
} }
/** /**
* 获取 站点编号，来源基础服务平台 * 获取 站点编号，来源基础服务平台
* @return siteCodeList * @return siteCodeList
*/ */
public List<String> getSiteCodeList(){ public List<String> getSiteCodeList(){
return this.siteCodeList; return this.siteCodeList;
} }
/** /**
* 设置 站点编号，来源基础服务平台 * 设置 站点编号，来源基础服务平台
* @param siteCodeList * @param siteCodeList
*/ */
public void setSiteCodeList(List<String> siteCodeList){ public void setSiteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList; this.siteCodeList = siteCodeList;
} }
/** /**
* 获取 站点名称 * 获取 站点名称
* @return siteNameList * @return siteNameList
*/ */
public List<String> getSiteNameList(){ public List<String> getSiteNameList(){
return this.siteNameList; return this.siteNameList;
} }
/** /**
* 设置 站点名称 * 设置 站点名称
* @param siteNameList * @param siteNameList
*/ */
public void setSiteNameList(List<String> siteNameList){ public void setSiteNameList(List<String> siteNameList){
this.siteNameList = siteNameList; this.siteNameList = siteNameList;
} }
/** /**
* 获取 开始 平台系统Id * 获取 开始 平台系统Id
* @return platformIdStart * @return platformIdStart
*/ */
public Long getPlatformIdStart(){ public Long getPlatformIdStart(){
return this.platformIdStart; return this.platformIdStart;
} }
/** /**
* 设置 开始 平台系统Id * 设置 开始 平台系统Id
* @param platformIdStart * @param platformIdStart
*/ */
public void setPlatformIdStart(Long platformIdStart){ public void setPlatformIdStart(Long platformIdStart){
this.platformIdStart = platformIdStart; this.platformIdStart = platformIdStart;
} }
/** /**
* 获取 结束 平台系统Id * 获取 结束 平台系统Id
* @return $platformIdEnd * @return $platformIdEnd
*/ */
public Long getPlatformIdEnd(){ public Long getPlatformIdEnd(){
return this.platformIdEnd; return this.platformIdEnd;
} }
/** /**
* 设置 结束 平台系统Id * 设置 结束 平台系统Id
* @param platformIdEnd * @param platformIdEnd
*/ */
public void setPlatformIdEnd(Long platformIdEnd){ public void setPlatformIdEnd(Long platformIdEnd){
this.platformIdEnd = platformIdEnd; this.platformIdEnd = platformIdEnd;
} }
/** /**
* 获取 增加 平台系统Id * 获取 增加 平台系统Id
* @return platformIdIncrement * @return platformIdIncrement
*/ */
public Long getPlatformIdIncrement(){ public Long getPlatformIdIncrement(){
return this.platformIdIncrement; return this.platformIdIncrement;
} }
/** /**
* 设置 增加 平台系统Id * 设置 增加 平台系统Id
* @param platformIdIncrement * @param platformIdIncrement
*/ */
public void setPlatformIdIncrement(Long platformIdIncrement){ public void setPlatformIdIncrement(Long platformIdIncrement){
this.platformIdIncrement = platformIdIncrement; this.platformIdIncrement = platformIdIncrement;
} }
/** /**
* 获取 平台系统Id * 获取 平台系统Id
* @return platformIdList * @return platformIdList
*/ */
public List<Long> getPlatformIdList(){ public List<Long> getPlatformIdList(){
return this.platformIdList; return this.platformIdList;
} }
/** /**
* 设置 平台系统Id * 设置 平台系统Id
* @param platformIdList * @param platformIdList
*/ */
public void setPlatformIdList(List<Long> platformIdList){ public void setPlatformIdList(List<Long> platformIdList){
this.platformIdList = platformIdList; this.platformIdList = platformIdList;
} }
/** /**
* 获取 平台系统名称 * 获取 平台系统名称
* @return platformNameList * @return platformNameList
*/ */
public List<String> getPlatformNameList(){ public List<String> getPlatformNameList(){
return this.platformNameList; return this.platformNameList;
} }
/** /**
* 设置 平台系统名称 * 设置 平台系统名称
* @param platformNameList * @param platformNameList
*/ */
public void setPlatformNameList(List<String> platformNameList){ public void setPlatformNameList(List<String> platformNameList){
this.platformNameList = platformNameList; this.platformNameList = platformNameList;
} }
/** /**
* 获取 开始 产品Id * 获取 开始 产品Id
* @return productIdStart * @return productIdStart
*/ */
public Long getProductIdStart(){ public Long getProductIdStart(){
return this.productIdStart; return this.productIdStart;
} }
/** /**
* 设置 开始 产品Id * 设置 开始 产品Id
* @param productIdStart * @param productIdStart
*/ */
public void setProductIdStart(Long productIdStart){ public void setProductIdStart(Long productIdStart){
this.productIdStart = productIdStart; this.productIdStart = productIdStart;
} }
/** /**
* 获取 结束 产品Id * 获取 结束 产品Id
* @return $productIdEnd * @return $productIdEnd
*/ */
public Long getProductIdEnd(){ public Long getProductIdEnd(){
return this.productIdEnd; return this.productIdEnd;
} }
/** /**
* 设置 结束 产品Id * 设置 结束 产品Id
* @param productIdEnd * @param productIdEnd
*/ */
public void setProductIdEnd(Long productIdEnd){ public void setProductIdEnd(Long productIdEnd){
this.productIdEnd = productIdEnd; this.productIdEnd = productIdEnd;
} }
/** /**
* 获取 增加 产品Id * 获取 增加 产品Id
* @return productIdIncrement * @return productIdIncrement
*/ */
public Long getProductIdIncrement(){ public Long getProductIdIncrement(){
return this.productIdIncrement; return this.productIdIncrement;
} }
/** /**
* 设置 增加 产品Id * 设置 增加 产品Id
* @param productIdIncrement * @param productIdIncrement
*/ */
public void setProductIdIncrement(Long productIdIncrement){ public void setProductIdIncrement(Long productIdIncrement){
this.productIdIncrement = productIdIncrement; this.productIdIncrement = productIdIncrement;
} }
/** /**
* 获取 产品Id * 获取 产品Id
* @return productIdList * @return productIdList
*/ */
public List<Long> getProductIdList(){ public List<Long> getProductIdList(){
return this.productIdList; return this.productIdList;
} }
/** /**
* 设置 产品Id * 设置 产品Id
* @param productIdList * @param productIdList
*/ */
public void setProductIdList(List<Long> productIdList){ public void setProductIdList(List<Long> productIdList){
this.productIdList = productIdList; this.productIdList = productIdList;
} }
/** /**
* 获取 产品名称 * 获取 产品名称
* @return productNameList * @return productNameList
*/ */
public List<String> getProductNameList(){ public List<String> getProductNameList(){
return this.productNameList; return this.productNameList;
} }
/** /**
* 设置 产品名称 * 设置 产品名称
* @param productNameList * @param productNameList
*/ */
public void setProductNameList(List<String> productNameList){ public void setProductNameList(List<String> productNameList){
this.productNameList = productNameList; this.productNameList = productNameList;
} }
/** /**
* 获取 开始 设备生产厂商ID * 获取 开始 设备生产厂商ID
* @return deviceFirmIdStart * @return deviceFirmIdStart
*/ */
public Long getDeviceFirmIdStart(){ public Long getDeviceFirmIdStart(){
return this.deviceFirmIdStart; return this.deviceFirmIdStart;
} }
/** /**
* 设置 开始 设备生产厂商ID * 设置 开始 设备生产厂商ID
* @param deviceFirmIdStart * @param deviceFirmIdStart
*/ */
public void setDeviceFirmIdStart(Long deviceFirmIdStart){ public void setDeviceFirmIdStart(Long deviceFirmIdStart){
this.deviceFirmIdStart = deviceFirmIdStart; this.deviceFirmIdStart = deviceFirmIdStart;
} }
/** /**
* 获取 结束 设备生产厂商ID * 获取 结束 设备生产厂商ID
* @return $deviceFirmIdEnd * @return $deviceFirmIdEnd
*/ */
public Long getDeviceFirmIdEnd(){ public Long getDeviceFirmIdEnd(){
return this.deviceFirmIdEnd; return this.deviceFirmIdEnd;
} }
/** /**
* 设置 结束 设备生产厂商ID * 设置 结束 设备生产厂商ID
* @param deviceFirmIdEnd * @param deviceFirmIdEnd
*/ */
public void setDeviceFirmIdEnd(Long deviceFirmIdEnd){ public void setDeviceFirmIdEnd(Long deviceFirmIdEnd){
this.deviceFirmIdEnd = deviceFirmIdEnd; this.deviceFirmIdEnd = deviceFirmIdEnd;
} }
/** /**
* 获取 增加 设备生产厂商ID * 获取 增加 设备生产厂商ID
* @return deviceFirmIdIncrement * @return deviceFirmIdIncrement
*/ */
public Long getDeviceFirmIdIncrement(){ public Long getDeviceFirmIdIncrement(){
return this.deviceFirmIdIncrement; return this.deviceFirmIdIncrement;
} }
/** /**
* 设置 增加 设备生产厂商ID * 设置 增加 设备生产厂商ID
* @param deviceFirmIdIncrement * @param deviceFirmIdIncrement
*/ */
public void setDeviceFirmIdIncrement(Long deviceFirmIdIncrement){ public void setDeviceFirmIdIncrement(Long deviceFirmIdIncrement){
this.deviceFirmIdIncrement = deviceFirmIdIncrement; this.deviceFirmIdIncrement = deviceFirmIdIncrement;
} }
/** /**
* 获取 设备生产厂商ID * 获取 设备生产厂商ID
* @return deviceFirmIdList * @return deviceFirmIdList
*/ */
public List<Long> getDeviceFirmIdList(){ public List<Long> getDeviceFirmIdList(){
return this.deviceFirmIdList; return this.deviceFirmIdList;
} }
/** /**
* 设置 设备生产厂商ID * 设置 设备生产厂商ID
* @param deviceFirmIdList * @param deviceFirmIdList
*/ */
public void setDeviceFirmIdList(List<Long> deviceFirmIdList){ public void setDeviceFirmIdList(List<Long> deviceFirmIdList){
this.deviceFirmIdList = deviceFirmIdList; this.deviceFirmIdList = deviceFirmIdList;
} }
/** /**
* 获取 设备生产厂商名称 * 获取 设备生产厂商名称
* @return deviceFirmnameList * @return deviceFirmnameList
*/ */
public List<String> getDeviceFirmnameList(){ public List<String> getDeviceFirmnameList(){
return this.deviceFirmnameList; return this.deviceFirmnameList;
} }
/** /**
* 设置 设备生产厂商名称 * 设置 设备生产厂商名称
* @param deviceFirmnameList * @param deviceFirmnameList
*/ */
public void setDeviceFirmnameList(List<String> deviceFirmnameList){ public void setDeviceFirmnameList(List<String> deviceFirmnameList){
this.deviceFirmnameList = deviceFirmnameList; this.deviceFirmnameList = deviceFirmnameList;
} }
/** /**
* 获取 开始 设备来源(0.子设备，1.网关设备，2.直连设备) * 获取 开始 设备来源(0.子设备，1.网关设备，2.直连设备)
* @return deviceSrcStart * @return deviceSrcStart
*/ */
public Integer getDeviceSrcStart(){ public Integer getDeviceSrcStart(){
return this.deviceSrcStart; return this.deviceSrcStart;
} }
/** /**
* 设置 开始 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 开始 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrcStart * @param deviceSrcStart
*/ */
public void setDeviceSrcStart(Integer deviceSrcStart){ public void setDeviceSrcStart(Integer deviceSrcStart){
this.deviceSrcStart = deviceSrcStart; this.deviceSrcStart = deviceSrcStart;
} }
/** /**
* 获取 结束 设备来源(0.子设备，1.网关设备，2.直连设备) * 获取 结束 设备来源(0.子设备，1.网关设备，2.直连设备)
* @return $deviceSrcEnd * @return $deviceSrcEnd
*/ */
public Integer getDeviceSrcEnd(){ public Integer getDeviceSrcEnd(){
return this.deviceSrcEnd; return this.deviceSrcEnd;
} }
/** /**
* 设置 结束 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 结束 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrcEnd * @param deviceSrcEnd
*/ */
public void setDeviceSrcEnd(Integer deviceSrcEnd){ public void setDeviceSrcEnd(Integer deviceSrcEnd){
this.deviceSrcEnd = deviceSrcEnd; this.deviceSrcEnd = deviceSrcEnd;
} }
/** /**
* 获取 增加 设备来源(0.子设备，1.网关设备，2.直连设备) * 获取 增加 设备来源(0.子设备，1.网关设备，2.直连设备)
* @return deviceSrcIncrement * @return deviceSrcIncrement
*/ */
public Integer getDeviceSrcIncrement(){ public Integer getDeviceSrcIncrement(){
return this.deviceSrcIncrement; return this.deviceSrcIncrement;
} }
/** /**
* 设置 增加 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 增加 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrcIncrement * @param deviceSrcIncrement
*/ */
public void setDeviceSrcIncrement(Integer deviceSrcIncrement){ public void setDeviceSrcIncrement(Integer deviceSrcIncrement){
this.deviceSrcIncrement = deviceSrcIncrement; this.deviceSrcIncrement = deviceSrcIncrement;
} }
/** /**
* 获取 设备来源(0.子设备，1.网关设备，2.直连设备) * 获取 设备来源(0.子设备，1.网关设备，2.直连设备)
* @return deviceSrcList * @return deviceSrcList
*/ */
public List<Integer> getDeviceSrcList(){ public List<Integer> getDeviceSrcList(){
return this.deviceSrcList; return this.deviceSrcList;
} }
/** /**
* 设置 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrcList * @param deviceSrcList
*/ */
public void setDeviceSrcList(List<Integer> deviceSrcList){ public void setDeviceSrcList(List<Integer> deviceSrcList){
this.deviceSrcList = deviceSrcList; this.deviceSrcList = deviceSrcList;
} }
/** /**
* 获取 开始 数据获取方式(0.主动上报，1.被动拉取) * 获取 开始 数据获取方式(0.主动上报，1.被动拉取)
* @return deviceDataSourceWayStart * @return deviceDataSourceWayStart
*/ */
public Integer getDeviceDataSourceWayStart(){ public Integer getDeviceDataSourceWayStart(){
return this.deviceDataSourceWayStart; return this.deviceDataSourceWayStart;
} }
/** /**
* 设置 开始 数据获取方式(0.主动上报，1.被动拉取) * 设置 开始 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWayStart * @param deviceDataSourceWayStart
*/ */
public void setDeviceDataSourceWayStart(Integer deviceDataSourceWayStart){ public void setDeviceDataSourceWayStart(Integer deviceDataSourceWayStart){
this.deviceDataSourceWayStart = deviceDataSourceWayStart; this.deviceDataSourceWayStart = deviceDataSourceWayStart;
} }
/** /**
* 获取 结束 数据获取方式(0.主动上报，1.被动拉取) * 获取 结束 数据获取方式(0.主动上报，1.被动拉取)
* @return $deviceDataSourceWayEnd * @return $deviceDataSourceWayEnd
*/ */
public Integer getDeviceDataSourceWayEnd(){ public Integer getDeviceDataSourceWayEnd(){
return this.deviceDataSourceWayEnd; return this.deviceDataSourceWayEnd;
} }
/** /**
* 设置 结束 数据获取方式(0.主动上报，1.被动拉取) * 设置 结束 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWayEnd * @param deviceDataSourceWayEnd
*/ */
public void setDeviceDataSourceWayEnd(Integer deviceDataSourceWayEnd){ public void setDeviceDataSourceWayEnd(Integer deviceDataSourceWayEnd){
this.deviceDataSourceWayEnd = deviceDataSourceWayEnd; this.deviceDataSourceWayEnd = deviceDataSourceWayEnd;
} }
/** /**
* 获取 增加 数据获取方式(0.主动上报，1.被动拉取) * 获取 增加 数据获取方式(0.主动上报，1.被动拉取)
* @return deviceDataSourceWayIncrement * @return deviceDataSourceWayIncrement
*/ */
public Integer getDeviceDataSourceWayIncrement(){ public Integer getDeviceDataSourceWayIncrement(){
return this.deviceDataSourceWayIncrement; return this.deviceDataSourceWayIncrement;
} }
/** /**
* 设置 增加 数据获取方式(0.主动上报，1.被动拉取) * 设置 增加 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWayIncrement * @param deviceDataSourceWayIncrement
*/ */
public void setDeviceDataSourceWayIncrement(Integer deviceDataSourceWayIncrement){ public void setDeviceDataSourceWayIncrement(Integer deviceDataSourceWayIncrement){
this.deviceDataSourceWayIncrement = deviceDataSourceWayIncrement; this.deviceDataSourceWayIncrement = deviceDataSourceWayIncrement;
} }
/** /**
* 获取 数据获取方式(0.主动上报，1.被动拉取) * 获取 数据获取方式(0.主动上报，1.被动拉取)
* @return deviceDataSourceWayList * @return deviceDataSourceWayList
*/ */
public List<Integer> getDeviceDataSourceWayList(){ public List<Integer> getDeviceDataSourceWayList(){
return this.deviceDataSourceWayList; return this.deviceDataSourceWayList;
} }
/** /**
* 设置 数据获取方式(0.主动上报，1.被动拉取) * 设置 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWayList * @param deviceDataSourceWayList
*/ */
public void setDeviceDataSourceWayList(List<Integer> deviceDataSourceWayList){ public void setDeviceDataSourceWayList(List<Integer> deviceDataSourceWayList){
this.deviceDataSourceWayList = deviceDataSourceWayList; this.deviceDataSourceWayList = deviceDataSourceWayList;
} }
/** /**
* 获取 经度 * 获取 经度
* @return lonList * @return lonList
*/ */
public List<String> getLonList(){ public List<String> getLonList(){
return this.lonList; return this.lonList;
} }
/** /**
* 设置 经度 * 设置 经度
* @param lonList * @param lonList
*/ */
public void setLonList(List<String> lonList){ public void setLonList(List<String> lonList){
this.lonList = lonList; this.lonList = lonList;
} }
/** /**
* 获取 经度 * 获取 经度
* @return latiList * @return latiList
*/ */
public List<String> getLatiList(){ public List<String> getLatiList(){
return this.latiList; return this.latiList;
} }
/** /**
* 设置 经度 * 设置 经度
* @param latiList * @param latiList
*/ */
public void setLatiList(List<String> latiList){ public void setLatiList(List<String> latiList){
this.latiList = latiList; this.latiList = latiList;
} }
/** /**
* 获取 开始 所属楼栋 * 获取 开始 所属楼栋
* @return deviceInBuildingStart * @return deviceInBuildingStart
*/ */
public Integer getDeviceInBuildingStart(){ public Integer getDeviceInBuildingStart(){
return this.deviceInBuildingStart; return this.deviceInBuildingStart;
} }
/** /**
* 设置 开始 所属楼栋 * 设置 开始 所属楼栋
* @param deviceInBuildingStart * @param deviceInBuildingStart
*/ */
public void setDeviceInBuildingStart(Integer deviceInBuildingStart){ public void setDeviceInBuildingStart(Integer deviceInBuildingStart){
this.deviceInBuildingStart = deviceInBuildingStart; this.deviceInBuildingStart = deviceInBuildingStart;
} }
/** /**
* 获取 结束 所属楼栋 * 获取 结束 所属楼栋
* @return $deviceInBuildingEnd * @return $deviceInBuildingEnd
*/ */
public Integer getDeviceInBuildingEnd(){ public Integer getDeviceInBuildingEnd(){
return this.deviceInBuildingEnd; return this.deviceInBuildingEnd;
} }
/** /**
* 设置 结束 所属楼栋 * 设置 结束 所属楼栋
* @param deviceInBuildingEnd * @param deviceInBuildingEnd
*/ */
public void setDeviceInBuildingEnd(Integer deviceInBuildingEnd){ public void setDeviceInBuildingEnd(Integer deviceInBuildingEnd){
this.deviceInBuildingEnd = deviceInBuildingEnd; this.deviceInBuildingEnd = deviceInBuildingEnd;
} }
/** /**
* 获取 增加 所属楼栋 * 获取 增加 所属楼栋
* @return deviceInBuildingIncrement * @return deviceInBuildingIncrement
*/ */
public Integer getDeviceInBuildingIncrement(){ public Integer getDeviceInBuildingIncrement(){
return this.deviceInBuildingIncrement; return this.deviceInBuildingIncrement;
} }
/** /**
* 设置 增加 所属楼栋 * 设置 增加 所属楼栋
* @param deviceInBuildingIncrement * @param deviceInBuildingIncrement
*/ */
public void setDeviceInBuildingIncrement(Integer deviceInBuildingIncrement){ public void setDeviceInBuildingIncrement(Integer deviceInBuildingIncrement){
this.deviceInBuildingIncrement = deviceInBuildingIncrement; this.deviceInBuildingIncrement = deviceInBuildingIncrement;
} }
/** /**
* 获取 所属楼栋 * 获取 所属楼栋
* @return deviceInBuildingList * @return deviceInBuildingList
*/ */
public List<Integer> getDeviceInBuildingList(){ public List<Integer> getDeviceInBuildingList(){
return this.deviceInBuildingList; return this.deviceInBuildingList;
} }
/** /**
* 设置 所属楼栋 * 设置 所属楼栋
* @param deviceInBuildingList * @param deviceInBuildingList
*/ */
public void setDeviceInBuildingList(List<Integer> deviceInBuildingList){ public void setDeviceInBuildingList(List<Integer> deviceInBuildingList){
this.deviceInBuildingList = deviceInBuildingList; this.deviceInBuildingList = deviceInBuildingList;
} }
/** /**
* 获取 开始 所属楼层 * 获取 开始 所属楼层
* @return deviceInFloorStart * @return deviceInFloorStart
*/ */
public Integer getDeviceInFloorStart(){ public Integer getDeviceInFloorStart(){
return this.deviceInFloorStart; return this.deviceInFloorStart;
} }
/** /**
* 设置 开始 所属楼层 * 设置 开始 所属楼层
* @param deviceInFloorStart * @param deviceInFloorStart
*/ */
public void setDeviceInFloorStart(Integer deviceInFloorStart){ public void setDeviceInFloorStart(Integer deviceInFloorStart){
this.deviceInFloorStart = deviceInFloorStart; this.deviceInFloorStart = deviceInFloorStart;
} }
/** /**
* 获取 结束 所属楼层 * 获取 结束 所属楼层
* @return $deviceInFloorEnd * @return $deviceInFloorEnd
*/ */
public Integer getDeviceInFloorEnd(){ public Integer getDeviceInFloorEnd(){
return this.deviceInFloorEnd; return this.deviceInFloorEnd;
} }
/** /**
* 设置 结束 所属楼层 * 设置 结束 所属楼层
* @param deviceInFloorEnd * @param deviceInFloorEnd
*/ */
public void setDeviceInFloorEnd(Integer deviceInFloorEnd){ public void setDeviceInFloorEnd(Integer deviceInFloorEnd){
this.deviceInFloorEnd = deviceInFloorEnd; this.deviceInFloorEnd = deviceInFloorEnd;
} }
/** /**
* 获取 增加 所属楼层 * 获取 增加 所属楼层
* @return deviceInFloorIncrement * @return deviceInFloorIncrement
*/ */
public Integer getDeviceInFloorIncrement(){ public Integer getDeviceInFloorIncrement(){
return this.deviceInFloorIncrement; return this.deviceInFloorIncrement;
} }
/** /**
* 设置 增加 所属楼层 * 设置 增加 所属楼层
* @param deviceInFloorIncrement * @param deviceInFloorIncrement
*/ */
public void setDeviceInFloorIncrement(Integer deviceInFloorIncrement){ public void setDeviceInFloorIncrement(Integer deviceInFloorIncrement){
this.deviceInFloorIncrement = deviceInFloorIncrement; this.deviceInFloorIncrement = deviceInFloorIncrement;
} }
/** /**
* 获取 所属楼层 * 获取 所属楼层
* @return deviceInFloorList * @return deviceInFloorList
*/ */
public List<Integer> getDeviceInFloorList(){ public List<Integer> getDeviceInFloorList(){
return this.deviceInFloorList; return this.deviceInFloorList;
} }
/** /**
* 设置 所属楼层 * 设置 所属楼层
* @param deviceInFloorList * @param deviceInFloorList
*/ */
public void setDeviceInFloorList(List<Integer> deviceInFloorList){ public void setDeviceInFloorList(List<Integer> deviceInFloorList){
this.deviceInFloorList = deviceInFloorList; this.deviceInFloorList = deviceInFloorList;
} }
/** /**
* 获取 开始 保修期至 * 获取 开始 保修期至
* @return defectsLiabilityPeriodStart * @return defectsLiabilityPeriodStart
*/ */
public String getDefectsLiabilityPeriodStart(){ public String getDefectsLiabilityPeriodStart(){
return this.defectsLiabilityPeriodStart; return this.defectsLiabilityPeriodStart;
} }
/** /**
* 设置 开始 保修期至 * 设置 开始 保修期至
* @param defectsLiabilityPeriodStart * @param defectsLiabilityPeriodStart
*/ */
public void setDefectsLiabilityPeriodStart(String defectsLiabilityPeriodStart){ public void setDefectsLiabilityPeriodStart(String defectsLiabilityPeriodStart){
this.defectsLiabilityPeriodStart = defectsLiabilityPeriodStart; this.defectsLiabilityPeriodStart = defectsLiabilityPeriodStart;
} }
/** /**
* 获取 结束 保修期至 * 获取 结束 保修期至
* @return defectsLiabilityPeriodEnd * @return defectsLiabilityPeriodEnd
*/ */
public String getDefectsLiabilityPeriodEnd(){ public String getDefectsLiabilityPeriodEnd(){
return this.defectsLiabilityPeriodEnd; return this.defectsLiabilityPeriodEnd;
} }
/** /**
* 设置 结束 保修期至 * 设置 结束 保修期至
* @param defectsLiabilityPeriodEnd * @param defectsLiabilityPeriodEnd
*/ */
public void setDefectsLiabilityPeriodEnd(String defectsLiabilityPeriodEnd){ public void setDefectsLiabilityPeriodEnd(String defectsLiabilityPeriodEnd){
this.defectsLiabilityPeriodEnd = defectsLiabilityPeriodEnd; this.defectsLiabilityPeriodEnd = defectsLiabilityPeriodEnd;
} }
/** /**
* 获取 负责人 * 获取 负责人
* @return leadingOfficialList * @return leadingOfficialList
*/ */
public List<String> getLeadingOfficialList(){ public List<String> getLeadingOfficialList(){
return this.leadingOfficialList; return this.leadingOfficialList;
} }
/** /**
* 设置 负责人 * 设置 负责人
* @param leadingOfficialList * @param leadingOfficialList
*/ */
public void setLeadingOfficialList(List<String> leadingOfficialList){ public void setLeadingOfficialList(List<String> leadingOfficialList){
this.leadingOfficialList = leadingOfficialList; this.leadingOfficialList = leadingOfficialList;
} }
/** /**
* 获取 联系电话 * 获取 联系电话
* @return leadingOfficialTelephoneList * @return leadingOfficialTelephoneList
*/ */
public List<String> getLeadingOfficialTelephoneList(){ public List<String> getLeadingOfficialTelephoneList(){
return this.leadingOfficialTelephoneList; return this.leadingOfficialTelephoneList;
} }
/** /**
* 设置 联系电话 * 设置 联系电话
* @param leadingOfficialTelephoneList * @param leadingOfficialTelephoneList
*/ */
public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){ public void setLeadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
this.leadingOfficialTelephoneList = leadingOfficialTelephoneList; this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
} }
/** /**
* 获取 开始 是否接收异常短(0.否，1.是) * 获取 开始 是否接收异常短(0.否，1.是)
* @return isReceiveMessStart * @return isReceiveMessStart
*/ */
public Integer getIsReceiveMessStart(){ public Integer getIsReceiveMessStart(){
return this.isReceiveMessStart; return this.isReceiveMessStart;
} }
/** /**
* 设置 开始 是否接收异常短(0.否，1.是) * 设置 开始 是否接收异常短(0.否，1.是)
* @param isReceiveMessStart * @param isReceiveMessStart
*/ */
public void setIsReceiveMessStart(Integer isReceiveMessStart){ public void setIsReceiveMessStart(Integer isReceiveMessStart){
this.isReceiveMessStart = isReceiveMessStart; this.isReceiveMessStart = isReceiveMessStart;
} }
/** /**
* 获取 结束 是否接收异常短(0.否，1.是) * 获取 结束 是否接收异常短(0.否，1.是)
* @return $isReceiveMessEnd * @return $isReceiveMessEnd
*/ */
public Integer getIsReceiveMessEnd(){ public Integer getIsReceiveMessEnd(){
return this.isReceiveMessEnd; return this.isReceiveMessEnd;
} }
/** /**
* 设置 结束 是否接收异常短(0.否，1.是) * 设置 结束 是否接收异常短(0.否，1.是)
* @param isReceiveMessEnd * @param isReceiveMessEnd
*/ */
public void setIsReceiveMessEnd(Integer isReceiveMessEnd){ public void setIsReceiveMessEnd(Integer isReceiveMessEnd){
this.isReceiveMessEnd = isReceiveMessEnd; this.isReceiveMessEnd = isReceiveMessEnd;
} }
/** /**
* 获取 增加 是否接收异常短(0.否，1.是) * 获取 增加 是否接收异常短(0.否，1.是)
* @return isReceiveMessIncrement * @return isReceiveMessIncrement
*/ */
public Integer getIsReceiveMessIncrement(){ public Integer getIsReceiveMessIncrement(){
return this.isReceiveMessIncrement; return this.isReceiveMessIncrement;
} }
/** /**
* 设置 增加 是否接收异常短(0.否，1.是) * 设置 增加 是否接收异常短(0.否，1.是)
* @param isReceiveMessIncrement * @param isReceiveMessIncrement
*/ */
public void setIsReceiveMessIncrement(Integer isReceiveMessIncrement){ public void setIsReceiveMessIncrement(Integer isReceiveMessIncrement){
this.isReceiveMessIncrement = isReceiveMessIncrement; this.isReceiveMessIncrement = isReceiveMessIncrement;
} }
/** /**
* 获取 是否接收异常短(0.否，1.是) * 获取 是否接收异常短(0.否，1.是)
* @return isReceiveMessList * @return isReceiveMessList
*/ */
public List<Integer> getIsReceiveMessList(){ public List<Integer> getIsReceiveMessList(){
return this.isReceiveMessList; return this.isReceiveMessList;
} }
/** /**
* 设置 是否接收异常短(0.否，1.是) * 设置 是否接收异常短(0.否，1.是)
* @param isReceiveMessList * @param isReceiveMessList
*/ */
public void setIsReceiveMessList(List<Integer> isReceiveMessList){ public void setIsReceiveMessList(List<Integer> isReceiveMessList){
this.isReceiveMessList = isReceiveMessList; this.isReceiveMessList = isReceiveMessList;
} }
/** /**
* 获取 设备图片 * 获取 设备图片
* @return devicePhotoPathList * @return devicePhotoPathList
*/ */
public List<String> getDevicePhotoPathList(){ public List<String> getDevicePhotoPathList(){
return this.devicePhotoPathList; return this.devicePhotoPathList;
} }
/** /**
* 设置 设备图片 * 设置 设备图片
* @param devicePhotoPathList * @param devicePhotoPathList
*/ */
public void setDevicePhotoPathList(List<String> devicePhotoPathList){ public void setDevicePhotoPathList(List<String> devicePhotoPathList){
this.devicePhotoPathList = devicePhotoPathList; this.devicePhotoPathList = devicePhotoPathList;
} }
/** /**
* 获取 设备访问ip * 获取 设备访问ip
* @return ipList * @return ipList
*/ */
public List<String> getIpList(){ public List<String> getIpList(){
return this.ipList; return this.ipList;
} }
/** /**
* 设置 设备访问ip * 设置 设备访问ip
* @param ipList * @param ipList
*/ */
public void setIpList(List<String> ipList){ public void setIpList(List<String> ipList){
this.ipList = ipList; this.ipList = ipList;
} }
/** /**
* 获取 中心设备编码 * 获取 中心设备编码
* @return centernumList * @return centernumList
*/ */
public List<String> getCenternumList(){ public List<String> getCenternumList(){
return this.centernumList; return this.centernumList;
} }
/** /**
* 设置 中心设备编码 * 设置 中心设备编码
* @param centernumList * @param centernumList
*/ */
public void setCenternumList(List<String> centernumList){ public void setCenternumList(List<String> centernumList){
this.centernumList = centernumList; this.centernumList = centernumList;
} }
/** /**
* 获取 端口 * 获取 端口
* @return portList * @return portList
*/ */
public List<String> getPortList(){ public List<String> getPortList(){
return this.portList; return this.portList;
} }
/** /**
* 设置 端口 * 设置 端口
* @param portList * @param portList
*/ */
public void setPortList(List<String> portList){ public void setPortList(List<String> portList){
this.portList = portList; this.portList = portList;
} }
/** /**
* 获取 设备topic信息 * 获取 设备topic信息
* @return deviceTopicList * @return deviceTopicList
*/ */
public List<String> getDeviceTopicList(){ public List<String> getDeviceTopicList(){
return this.deviceTopicList; return this.deviceTopicList;
} }
/** /**
* 设置 设备topic信息 * 设置 设备topic信息
* @param deviceTopicList * @param deviceTopicList
*/ */
public void setDeviceTopicList(List<String> deviceTopicList){ public void setDeviceTopicList(List<String> deviceTopicList){
this.deviceTopicList = deviceTopicList; this.deviceTopicList = deviceTopicList;
} }
/** /**
* 获取 开始 设备状态 (0.未激活，1.离线,2.在线) * 获取 开始 设备状态 (0.未激活，1.离线,2.在线)
* @return deviceStatusStart * @return deviceStatusStart
*/ */
public Integer getDeviceStatusStart(){ public Integer getDeviceStatusStart(){
return this.deviceStatusStart; return this.deviceStatusStart;
} }
/** /**
* 设置 开始 设备状态 (0.未激活，1.离线,2.在线) * 设置 开始 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatusStart * @param deviceStatusStart
*/ */
public void setDeviceStatusStart(Integer deviceStatusStart){ public void setDeviceStatusStart(Integer deviceStatusStart){
this.deviceStatusStart = deviceStatusStart; this.deviceStatusStart = deviceStatusStart;
} }
/** /**
* 获取 结束 设备状态 (0.未激活，1.离线,2.在线) * 获取 结束 设备状态 (0.未激活，1.离线,2.在线)
* @return $deviceStatusEnd * @return $deviceStatusEnd
*/ */
public Integer getDeviceStatusEnd(){ public Integer getDeviceStatusEnd(){
return this.deviceStatusEnd; return this.deviceStatusEnd;
} }
/** /**
* 设置 结束 设备状态 (0.未激活，1.离线,2.在线) * 设置 结束 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatusEnd * @param deviceStatusEnd
*/ */
public void setDeviceStatusEnd(Integer deviceStatusEnd){ public void setDeviceStatusEnd(Integer deviceStatusEnd){
this.deviceStatusEnd = deviceStatusEnd; this.deviceStatusEnd = deviceStatusEnd;
} }
/** /**
* 获取 增加 设备状态 (0.未激活，1.离线,2.在线) * 获取 增加 设备状态 (0.未激活，1.离线,2.在线)
* @return deviceStatusIncrement * @return deviceStatusIncrement
*/ */
public Integer getDeviceStatusIncrement(){ public Integer getDeviceStatusIncrement(){
return this.deviceStatusIncrement; return this.deviceStatusIncrement;
} }
/** /**
* 设置 增加 设备状态 (0.未激活，1.离线,2.在线) * 设置 增加 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatusIncrement * @param deviceStatusIncrement
*/ */
public void setDeviceStatusIncrement(Integer deviceStatusIncrement){ public void setDeviceStatusIncrement(Integer deviceStatusIncrement){
this.deviceStatusIncrement = deviceStatusIncrement; this.deviceStatusIncrement = deviceStatusIncrement;
} }
/** /**
* 获取 设备状态 (0.未激活，1.离线,2.在线) * 获取 设备状态 (0.未激活，1.离线,2.在线)
* @return deviceStatusList * @return deviceStatusList
*/ */
public List<Integer> getDeviceStatusList(){ public List<Integer> getDeviceStatusList(){
return this.deviceStatusList; return this.deviceStatusList;
} }
/** /**
* 设置 设备状态 (0.未激活，1.离线,2.在线) * 设置 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatusList * @param deviceStatusList
*/ */
public void setDeviceStatusList(List<Integer> deviceStatusList){ public void setDeviceStatusList(List<Integer> deviceStatusList){
this.deviceStatusList = deviceStatusList; this.deviceStatusList = deviceStatusList;
} }
/** /**
* 获取 开始 启用状态 (0.停止，1.启用) * 获取 开始 启用状态 (0.停止，1.启用)
* @return enabledStart * @return enabledStart
*/ */
public Integer getEnabledStart(){ public Integer getEnabledStart(){
return this.enabledStart; return this.enabledStart;
} }
/** /**
* 设置 开始 启用状态 (0.停止，1.启用) * 设置 开始 启用状态 (0.停止，1.启用)
* @param enabledStart * @param enabledStart
*/ */
public void setEnabledStart(Integer enabledStart){ public void setEnabledStart(Integer enabledStart){
this.enabledStart = enabledStart; this.enabledStart = enabledStart;
} }
/** /**
* 获取 结束 启用状态 (0.停止，1.启用) * 获取 结束 启用状态 (0.停止，1.启用)
* @return $enabledEnd * @return $enabledEnd
*/ */
public Integer getEnabledEnd(){ public Integer getEnabledEnd(){
return this.enabledEnd; return this.enabledEnd;
} }
/** /**
* 设置 结束 启用状态 (0.停止，1.启用) * 设置 结束 启用状态 (0.停止，1.启用)
* @param enabledEnd * @param enabledEnd
*/ */
public void setEnabledEnd(Integer enabledEnd){ public void setEnabledEnd(Integer enabledEnd){
this.enabledEnd = enabledEnd; this.enabledEnd = enabledEnd;
} }
/** /**
* 获取 增加 启用状态 (0.停止，1.启用) * 获取 增加 启用状态 (0.停止，1.启用)
* @return enabledIncrement * @return enabledIncrement
*/ */
public Integer getEnabledIncrement(){ public Integer getEnabledIncrement(){
return this.enabledIncrement; return this.enabledIncrement;
} }
/** /**
* 设置 增加 启用状态 (0.停止，1.启用) * 设置 增加 启用状态 (0.停止，1.启用)
* @param enabledIncrement * @param enabledIncrement
*/ */
public void setEnabledIncrement(Integer enabledIncrement){ public void setEnabledIncrement(Integer enabledIncrement){
this.enabledIncrement = enabledIncrement; this.enabledIncrement = enabledIncrement;
} }
/** /**
* 获取 启用状态 (0.停止，1.启用) * 获取 启用状态 (0.停止，1.启用)
* @return enabledList * @return enabledList
*/ */
public List<Integer> getEnabledList(){ public List<Integer> getEnabledList(){
return this.enabledList; return this.enabledList;
} }
/** /**
* 设置 启用状态 (0.停止，1.启用) * 设置 启用状态 (0.停止，1.启用)
* @param enabledList * @param enabledList
*/ */
public void setEnabledList(List<Integer> enabledList){ public void setEnabledList(List<Integer> enabledList){
this.enabledList = enabledList; this.enabledList = enabledList;
} }
/** /**
* 获取 设备授权码 * 获取 设备授权码
* @return deviceAuthCodeList * @return deviceAuthCodeList
*/ */
public List<String> getDeviceAuthCodeList(){ public List<String> getDeviceAuthCodeList(){
return this.deviceAuthCodeList; return this.deviceAuthCodeList;
} }
/** /**
* 设置 设备授权码 * 设置 设备授权码
* @param deviceAuthCodeList * @param deviceAuthCodeList
*/ */
public void setDeviceAuthCodeList(List<String> deviceAuthCodeList){ public void setDeviceAuthCodeList(List<String> deviceAuthCodeList){
this.deviceAuthCodeList = deviceAuthCodeList; this.deviceAuthCodeList = deviceAuthCodeList;
} }
/** /**
* 获取 备注 * 获取 备注
* @return deviceRemarkList * @return deviceRemarkList
*/ */
public List<String> getDeviceRemarkList(){ public List<String> getDeviceRemarkList(){
return this.deviceRemarkList; return this.deviceRemarkList;
} }
/** /**
* 设置 备注 * 设置 备注
* @param deviceRemarkList * @param deviceRemarkList
*/ */
public void setDeviceRemarkList(List<String> deviceRemarkList){ public void setDeviceRemarkList(List<String> deviceRemarkList){
this.deviceRemarkList = deviceRemarkList; this.deviceRemarkList = deviceRemarkList;
} }
/** /**
* 获取 开始 最近上线时间 * 获取 开始 最近上线时间
* @return onlineTimeStart * @return onlineTimeStart
*/ */
public String getOnlineTimeStart(){ public String getOnlineTimeStart(){
return this.onlineTimeStart; return this.onlineTimeStart;
} }
/** /**
* 设置 开始 最近上线时间 * 设置 开始 最近上线时间
* @param onlineTimeStart * @param onlineTimeStart
*/ */
public void setOnlineTimeStart(String onlineTimeStart){ public void setOnlineTimeStart(String onlineTimeStart){
this.onlineTimeStart = onlineTimeStart; this.onlineTimeStart = onlineTimeStart;
} }
/** /**
* 获取 结束 最近上线时间 * 获取 结束 最近上线时间
* @return onlineTimeEnd * @return onlineTimeEnd
*/ */
public String getOnlineTimeEnd(){ public String getOnlineTimeEnd(){
return this.onlineTimeEnd; return this.onlineTimeEnd;
} }
/** /**
* 设置 结束 最近上线时间 * 设置 结束 最近上线时间
* @param onlineTimeEnd * @param onlineTimeEnd
*/ */
public void setOnlineTimeEnd(String onlineTimeEnd){ public void setOnlineTimeEnd(String onlineTimeEnd){
this.onlineTimeEnd = onlineTimeEnd; this.onlineTimeEnd = onlineTimeEnd;
} }
/** /**
* 获取 开始 最近离线时间 * 获取 开始 最近离线时间
* @return offlineTimeStart * @return offlineTimeStart
*/ */
public String getOfflineTimeStart(){ public String getOfflineTimeStart(){
return this.offlineTimeStart; return this.offlineTimeStart;
} }
/** /**
* 设置 开始 最近离线时间 * 设置 开始 最近离线时间
* @param offlineTimeStart * @param offlineTimeStart
*/ */
public void setOfflineTimeStart(String offlineTimeStart){ public void setOfflineTimeStart(String offlineTimeStart){
this.offlineTimeStart = offlineTimeStart; this.offlineTimeStart = offlineTimeStart;
} }
/** /**
* 获取 结束 最近离线时间 * 获取 结束 最近离线时间
* @return offlineTimeEnd * @return offlineTimeEnd
*/ */
public String getOfflineTimeEnd(){ public String getOfflineTimeEnd(){
return this.offlineTimeEnd; return this.offlineTimeEnd;
} }
/** /**
* 设置 结束 最近离线时间 * 设置 结束 最近离线时间
* @param offlineTimeEnd * @param offlineTimeEnd
*/ */
public void setOfflineTimeEnd(String offlineTimeEnd){ public void setOfflineTimeEnd(String offlineTimeEnd){
this.offlineTimeEnd = offlineTimeEnd; this.offlineTimeEnd = offlineTimeEnd;
} }
/** /**
* 获取 开始 是否删除，(0.否，1.是) * 获取 开始 是否删除(0.否，1.是)
* @return deletedStart * @return deletedStart
*/ */
public Integer getDeletedStart(){ public Integer getDeletedStart(){
return this.deletedStart; return this.deletedStart;
} }
/** /**
* 设置 开始 是否删除，(0.否，1.是) * 设置 开始 是否删除(0.否，1.是)
* @param deletedStart * @param deletedStart
*/ */
public void setDeletedStart(Integer deletedStart){ public void setDeletedStart(Integer deletedStart){
this.deletedStart = deletedStart; this.deletedStart = deletedStart;
} }
/** /**
* 获取 结束 是否删除，(0.否，1.是) * 获取 结束 是否删除(0.否，1.是)
* @return $deletedEnd * @return $deletedEnd
*/ */
public Integer getDeletedEnd(){ public Integer getDeletedEnd(){
return this.deletedEnd; return this.deletedEnd;
} }
/** /**
* 设置 结束 是否删除，(0.否，1.是) * 设置 结束 是否删除(0.否，1.是)
* @param deletedEnd * @param deletedEnd
*/ */
public void setDeletedEnd(Integer deletedEnd){ public void setDeletedEnd(Integer deletedEnd){
this.deletedEnd = deletedEnd; this.deletedEnd = deletedEnd;
} }
/** /**
* 获取 增加 是否删除，(0.否，1.是) * 获取 增加 是否删除(0.否，1.是)
* @return deletedIncrement * @return deletedIncrement
*/ */
public Integer getDeletedIncrement(){ public Integer getDeletedIncrement(){
return this.deletedIncrement; return this.deletedIncrement;
} }
/** /**
* 设置 增加 是否删除，(0.否，1.是) * 设置 增加 是否删除(0.否，1.是)
* @param deletedIncrement * @param deletedIncrement
*/ */
public void setDeletedIncrement(Integer deletedIncrement){ public void setDeletedIncrement(Integer deletedIncrement){
this.deletedIncrement = deletedIncrement; this.deletedIncrement = deletedIncrement;
} }
/** /**
* 获取 是否删除，(0.否，1.是) * 获取 是否删除(0.否，1.是)
* @return deletedList * @return deletedList
*/ */
public List<Integer> getDeletedList(){ public List<Integer> getDeletedList(){
return this.deletedList; return this.deletedList;
} }
/** /**
* 设置 是否删除，(0.否，1.是) * 设置 是否删除(0.否，1.是)
* @param deletedList * @param deletedList
*/ */
public void setDeletedList(List<Integer> deletedList){ public void setDeletedList(List<Integer> deletedList){
this.deletedList = deletedList; this.deletedList = deletedList;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 收不来源(0.旧设备，1.新设备)
* @return createUserIdStart * @return sourceStart
*/ */
public Integer getSourceStart(){
return this.sourceStart;
}
/**
* 设置 开始 收不来源(0.旧设备，1.新设备)
* @param sourceStart
*/
public void setSourceStart(Integer sourceStart){
this.sourceStart = sourceStart;
}
/**
* 获取 结束 收不来源(0.旧设备，1.新设备)
* @return $sourceEnd
*/
public Integer getSourceEnd(){
return this.sourceEnd;
}
/**
* 设置 结束 收不来源(0.旧设备，1.新设备)
* @param sourceEnd
*/
public void setSourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd;
}
/**
* 获取 增加 收不来源(0.旧设备，1.新设备)
* @return sourceIncrement
*/
public Integer getSourceIncrement(){
return this.sourceIncrement;
}
/**
* 设置 增加 收不来源(0.旧设备，1.新设备)
* @param sourceIncrement
*/
public void setSourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement;
}
/**
* 获取 收不来源(0.旧设备，1.新设备)
* @return sourceList
*/
public List<Integer> getSourceList(){
return this.sourceList;
}
/**
* 设置 收不来源(0.旧设备，1.新设备)
* @param sourceList
*/
public void setSourceList(List<Integer> sourceList){
this.sourceList = sourceList;
}
/**
* 获取 开始 创建用户
* @return createUserIdStart
*/
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 更新用户 * 获取 开始 更新用户
* @return updateUserIdStart * @return updateUserIdStart
*/ */
public Long getUpdateUserIdStart(){ public Long getUpdateUserIdStart(){
return this.updateUserIdStart; return this.updateUserIdStart;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
} }
/** /**
* 获取 结束 更新用户 * 获取 结束 更新用户
* @return $updateUserIdEnd * @return $updateUserIdEnd
*/ */
public Long getUpdateUserIdEnd(){ public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd; return this.updateUserIdEnd;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
} }
/** /**
* 获取 增加 更新用户 * 获取 增加 更新用户
* @return updateUserIdIncrement * @return updateUserIdIncrement
*/ */
public Long getUpdateUserIdIncrement(){ public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement; return this.updateUserIdIncrement;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdList * @return updateUserIdList
*/ */
public List<Long> getUpdateUserIdList(){ public List<Long> getUpdateUserIdList(){
return this.updateUserIdList; return this.updateUserIdList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 更新时间 * 设置 开始 更新时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 更新时间 * 获取 结束 更新时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 更新时间 * 设置 结束 更新时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
*/ */
public DeviceQuery id(Long id){ public DeviceQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public DeviceQuery idStart(Long idStart){ public DeviceQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public DeviceQuery idEnd(Long idEnd){ public DeviceQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public DeviceQuery idIncrement(Long idIncrement){ public DeviceQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public DeviceQuery idList(List<Long> idList){ public DeviceQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 设备名称 * 设置 设备名称
* @param deviceName * @param deviceName
*/ */
public DeviceQuery deviceName(String deviceName){ public DeviceQuery deviceName(String deviceName){
setDeviceName(deviceName); setDeviceName(deviceName);
return this; return this;
} }
/** /**
* 设置 设备名称 * 设置 设备名称
* @param deviceNameList * @param deviceNameList
*/ */
public DeviceQuery deviceNameList(List<String> deviceNameList){ public DeviceQuery deviceNameList(List<String> deviceNameList){
this.deviceNameList = deviceNameList; this.deviceNameList = deviceNameList;
return this; return this;
} }
/** /**
* 设置 设备编码,SN码等，默认为MAC地址 * 设置 设备编码,SN码等，默认为MAC地址
* @param deviceCode * @param deviceCode
*/ */
public DeviceQuery deviceCode(String deviceCode){ public DeviceQuery deviceCode(String deviceCode){
setDeviceCode(deviceCode); setDeviceCode(deviceCode);
return this; return this;
} }
/** /**
* 设置 设备编码,SN码等，默认为MAC地址 * 设置 设备编码,SN码等，默认为MAC地址
* @param deviceCodeList * @param deviceCodeList
*/ */
public DeviceQuery deviceCodeList(List<String> deviceCodeList){ public DeviceQuery deviceCodeList(List<String> deviceCodeList){
this.deviceCodeList = deviceCodeList; this.deviceCodeList = deviceCodeList;
return this; return this;
} }
/** /**
* 设置 设备的MAC地址 * 设置 设备的MAC地址
* @param deviceMac * @param deviceMac
*/ */
public DeviceQuery deviceMac(String deviceMac){ public DeviceQuery deviceMac(String deviceMac){
setDeviceMac(deviceMac); setDeviceMac(deviceMac);
return this; return this;
} }
/** /**
* 设置 设备的MAC地址 * 设置 设备的MAC地址
* @param deviceMacList * @param deviceMacList
*/ */
public DeviceQuery deviceMacList(List<String> deviceMacList){ public DeviceQuery deviceMacList(List<String> deviceMacList){
this.deviceMacList = deviceMacList; this.deviceMacList = deviceMacList;
return this; return this;
} }
/** /**
* 设置 站点Id，来源基础服务平台 * 设置 站点Id，来源基础服务平台
* @param siteId * @param siteId
*/ */
public DeviceQuery siteId(Long siteId){ public DeviceQuery siteId(Long siteId){
setSiteId(siteId); setSiteId(siteId);
return this; return this;
} }
/** /**
* 设置 开始 站点Id，来源基础服务平台 * 设置 开始 站点Id，来源基础服务平台
* @param siteIdStart * @param siteIdStart
*/ */
public DeviceQuery siteIdStart(Long siteIdStart){ public DeviceQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart; this.siteIdStart = siteIdStart;
return this; return this;
} }
/** /**
* 设置 结束 站点Id，来源基础服务平台 * 设置 结束 站点Id，来源基础服务平台
* @param siteIdEnd * @param siteIdEnd
*/ */
public DeviceQuery siteIdEnd(Long siteIdEnd){ public DeviceQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd; this.siteIdEnd = siteIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 站点Id，来源基础服务平台 * 设置 增加 站点Id，来源基础服务平台
* @param siteIdIncrement * @param siteIdIncrement
*/ */
public DeviceQuery siteIdIncrement(Long siteIdIncrement){ public DeviceQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement; this.siteIdIncrement = siteIdIncrement;
return this; return this;
} }
/** /**
* 设置 站点Id，来源基础服务平台 * 设置 站点Id，来源基础服务平台
* @param siteIdList * @param siteIdList
*/ */
public DeviceQuery siteIdList(List<Long> siteIdList){ public DeviceQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList; this.siteIdList = siteIdList;
return this; return this;
} }
/** /**
* 设置 站点编号，来源基础服务平台 * 设置 站点编号，来源基础服务平台
* @param siteCode * @param siteCode
*/ */
public DeviceQuery siteCode(String siteCode){ public DeviceQuery siteCode(String siteCode){
setSiteCode(siteCode); setSiteCode(siteCode);
return this; return this;
} }
/** /**
* 设置 站点编号，来源基础服务平台 * 设置 站点编号，来源基础服务平台
* @param siteCodeList * @param siteCodeList
*/ */
public DeviceQuery siteCodeList(List<String> siteCodeList){ public DeviceQuery siteCodeList(List<String> siteCodeList){
this.siteCodeList = siteCodeList; this.siteCodeList = siteCodeList;
return this; return this;
} }
/** /**
* 设置 站点名称 * 设置 站点名称
* @param siteName * @param siteName
*/ */
public DeviceQuery siteName(String siteName){ public DeviceQuery siteName(String siteName){
setSiteName(siteName); setSiteName(siteName);
return this; return this;
} }
/** /**
* 设置 站点名称 * 设置 站点名称
* @param siteNameList * @param siteNameList
*/ */
public DeviceQuery siteNameList(List<String> siteNameList){ public DeviceQuery siteNameList(List<String> siteNameList){
this.siteNameList = siteNameList; this.siteNameList = siteNameList;
return this; return this;
} }
/** /**
* 设置 平台系统Id * 设置 平台系统Id
* @param platformId * @param platformId
*/ */
public DeviceQuery platformId(Long platformId){ public DeviceQuery platformId(Long platformId){
setPlatformId(platformId); setPlatformId(platformId);
return this; return this;
} }
/** /**
* 设置 开始 平台系统Id * 设置 开始 平台系统Id
* @param platformIdStart * @param platformIdStart
*/ */
public DeviceQuery platformIdStart(Long platformIdStart){ public DeviceQuery platformIdStart(Long platformIdStart){
this.platformIdStart = platformIdStart; this.platformIdStart = platformIdStart;
return this; return this;
} }
/** /**
* 设置 结束 平台系统Id * 设置 结束 平台系统Id
* @param platformIdEnd * @param platformIdEnd
*/ */
public DeviceQuery platformIdEnd(Long platformIdEnd){ public DeviceQuery platformIdEnd(Long platformIdEnd){
this.platformIdEnd = platformIdEnd; this.platformIdEnd = platformIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 平台系统Id * 设置 增加 平台系统Id
* @param platformIdIncrement * @param platformIdIncrement
*/ */
public DeviceQuery platformIdIncrement(Long platformIdIncrement){ public DeviceQuery platformIdIncrement(Long platformIdIncrement){
this.platformIdIncrement = platformIdIncrement; this.platformIdIncrement = platformIdIncrement;
return this; return this;
} }
/** /**
* 设置 平台系统Id * 设置 平台系统Id
* @param platformIdList * @param platformIdList
*/ */
public DeviceQuery platformIdList(List<Long> platformIdList){ public DeviceQuery platformIdList(List<Long> platformIdList){
this.platformIdList = platformIdList; this.platformIdList = platformIdList;
return this; return this;
} }
/** /**
* 设置 平台系统名称 * 设置 平台系统名称
* @param platformName * @param platformName
*/ */
public DeviceQuery platformName(String platformName){ public DeviceQuery platformName(String platformName){
setPlatformName(platformName); setPlatformName(platformName);
return this; return this;
} }
/** /**
* 设置 平台系统名称 * 设置 平台系统名称
* @param platformNameList * @param platformNameList
*/ */
public DeviceQuery platformNameList(List<String> platformNameList){ public DeviceQuery platformNameList(List<String> platformNameList){
this.platformNameList = platformNameList; this.platformNameList = platformNameList;
return this; return this;
} }
/** /**
* 设置 产品Id * 设置 产品Id
* @param productId * @param productId
*/ */
public DeviceQuery productId(Long productId){ public DeviceQuery productId(Long productId){
setProductId(productId); setProductId(productId);
return this; return this;
} }
/** /**
* 设置 开始 产品Id * 设置 开始 产品Id
* @param productIdStart * @param productIdStart
*/ */
public DeviceQuery productIdStart(Long productIdStart){ public DeviceQuery productIdStart(Long productIdStart){
this.productIdStart = productIdStart; this.productIdStart = productIdStart;
return this; return this;
} }
/** /**
* 设置 结束 产品Id * 设置 结束 产品Id
* @param productIdEnd * @param productIdEnd
*/ */
public DeviceQuery productIdEnd(Long productIdEnd){ public DeviceQuery productIdEnd(Long productIdEnd){
this.productIdEnd = productIdEnd; this.productIdEnd = productIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 产品Id * 设置 增加 产品Id
* @param productIdIncrement * @param productIdIncrement
*/ */
public DeviceQuery productIdIncrement(Long productIdIncrement){ public DeviceQuery productIdIncrement(Long productIdIncrement){
this.productIdIncrement = productIdIncrement; this.productIdIncrement = productIdIncrement;
return this; return this;
} }
/** /**
* 设置 产品Id * 设置 产品Id
* @param productIdList * @param productIdList
*/ */
public DeviceQuery productIdList(List<Long> productIdList){ public DeviceQuery productIdList(List<Long> productIdList){
this.productIdList = productIdList; this.productIdList = productIdList;
return this; return this;
} }
/** /**
* 设置 产品名称 * 设置 产品名称
* @param productName * @param productName
*/ */
public DeviceQuery productName(String productName){ public DeviceQuery productName(String productName){
setProductName(productName); setProductName(productName);
return this; return this;
} }
/** /**
* 设置 产品名称 * 设置 产品名称
* @param productNameList * @param productNameList
*/ */
public DeviceQuery productNameList(List<String> productNameList){ public DeviceQuery productNameList(List<String> productNameList){
this.productNameList = productNameList; this.productNameList = productNameList;
return this; return this;
} }
/** /**
* 设置 设备生产厂商ID * 设置 设备生产厂商ID
* @param deviceFirmId * @param deviceFirmId
*/ */
public DeviceQuery deviceFirmId(Long deviceFirmId){ public DeviceQuery deviceFirmId(Long deviceFirmId){
setDeviceFirmId(deviceFirmId); setDeviceFirmId(deviceFirmId);
return this; return this;
} }
/** /**
* 设置 开始 设备生产厂商ID * 设置 开始 设备生产厂商ID
* @param deviceFirmIdStart * @param deviceFirmIdStart
*/ */
public DeviceQuery deviceFirmIdStart(Long deviceFirmIdStart){ public DeviceQuery deviceFirmIdStart(Long deviceFirmIdStart){
this.deviceFirmIdStart = deviceFirmIdStart; this.deviceFirmIdStart = deviceFirmIdStart;
return this; return this;
} }
/** /**
* 设置 结束 设备生产厂商ID * 设置 结束 设备生产厂商ID
* @param deviceFirmIdEnd * @param deviceFirmIdEnd
*/ */
public DeviceQuery deviceFirmIdEnd(Long deviceFirmIdEnd){ public DeviceQuery deviceFirmIdEnd(Long deviceFirmIdEnd){
this.deviceFirmIdEnd = deviceFirmIdEnd; this.deviceFirmIdEnd = deviceFirmIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 设备生产厂商ID * 设置 增加 设备生产厂商ID
* @param deviceFirmIdIncrement * @param deviceFirmIdIncrement
*/ */
public DeviceQuery deviceFirmIdIncrement(Long deviceFirmIdIncrement){ public DeviceQuery deviceFirmIdIncrement(Long deviceFirmIdIncrement){
this.deviceFirmIdIncrement = deviceFirmIdIncrement; this.deviceFirmIdIncrement = deviceFirmIdIncrement;
return this; return this;
} }
/** /**
* 设置 设备生产厂商ID * 设置 设备生产厂商ID
* @param deviceFirmIdList * @param deviceFirmIdList
*/ */
public DeviceQuery deviceFirmIdList(List<Long> deviceFirmIdList){ public DeviceQuery deviceFirmIdList(List<Long> deviceFirmIdList){
this.deviceFirmIdList = deviceFirmIdList; this.deviceFirmIdList = deviceFirmIdList;
return this; return this;
} }
/** /**
* 设置 设备生产厂商名称 * 设置 设备生产厂商名称
* @param deviceFirmname * @param deviceFirmname
*/ */
public DeviceQuery deviceFirmname(String deviceFirmname){ public DeviceQuery deviceFirmname(String deviceFirmname){
setDeviceFirmname(deviceFirmname); setDeviceFirmname(deviceFirmname);
return this; return this;
} }
/** /**
* 设置 设备生产厂商名称 * 设置 设备生产厂商名称
* @param deviceFirmnameList * @param deviceFirmnameList
*/ */
public DeviceQuery deviceFirmnameList(List<String> deviceFirmnameList){ public DeviceQuery deviceFirmnameList(List<String> deviceFirmnameList){
this.deviceFirmnameList = deviceFirmnameList; this.deviceFirmnameList = deviceFirmnameList;
return this; return this;
} }
/** /**
* 设置 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrc * @param deviceSrc
*/ */
public DeviceQuery deviceSrc(Integer deviceSrc){ public DeviceQuery deviceSrc(Integer deviceSrc){
setDeviceSrc(deviceSrc); setDeviceSrc(deviceSrc);
return this; return this;
} }
/** /**
* 设置 开始 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 开始 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrcStart * @param deviceSrcStart
*/ */
public DeviceQuery deviceSrcStart(Integer deviceSrcStart){ public DeviceQuery deviceSrcStart(Integer deviceSrcStart){
this.deviceSrcStart = deviceSrcStart; this.deviceSrcStart = deviceSrcStart;
return this; return this;
} }
/** /**
* 设置 结束 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 结束 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrcEnd * @param deviceSrcEnd
*/ */
public DeviceQuery deviceSrcEnd(Integer deviceSrcEnd){ public DeviceQuery deviceSrcEnd(Integer deviceSrcEnd){
this.deviceSrcEnd = deviceSrcEnd; this.deviceSrcEnd = deviceSrcEnd;
return this; return this;
} }
/** /**
* 设置 增加 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 增加 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrcIncrement * @param deviceSrcIncrement
*/ */
public DeviceQuery deviceSrcIncrement(Integer deviceSrcIncrement){ public DeviceQuery deviceSrcIncrement(Integer deviceSrcIncrement){
this.deviceSrcIncrement = deviceSrcIncrement; this.deviceSrcIncrement = deviceSrcIncrement;
return this; return this;
} }
/** /**
* 设置 设备来源(0.子设备，1.网关设备，2.直连设备) * 设置 设备来源(0.子设备，1.网关设备，2.直连设备)
* @param deviceSrcList * @param deviceSrcList
*/ */
public DeviceQuery deviceSrcList(List<Integer> deviceSrcList){ public DeviceQuery deviceSrcList(List<Integer> deviceSrcList){
this.deviceSrcList = deviceSrcList; this.deviceSrcList = deviceSrcList;
return this; return this;
} }
/** /**
* 设置 数据获取方式(0.主动上报，1.被动拉取) * 设置 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWay * @param deviceDataSourceWay
*/ */
public DeviceQuery deviceDataSourceWay(Integer deviceDataSourceWay){ public DeviceQuery deviceDataSourceWay(Integer deviceDataSourceWay){
setDeviceDataSourceWay(deviceDataSourceWay); setDeviceDataSourceWay(deviceDataSourceWay);
return this; return this;
} }
/** /**
* 设置 开始 数据获取方式(0.主动上报，1.被动拉取) * 设置 开始 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWayStart * @param deviceDataSourceWayStart
*/ */
public DeviceQuery deviceDataSourceWayStart(Integer deviceDataSourceWayStart){ public DeviceQuery deviceDataSourceWayStart(Integer deviceDataSourceWayStart){
this.deviceDataSourceWayStart = deviceDataSourceWayStart; this.deviceDataSourceWayStart = deviceDataSourceWayStart;
return this; return this;
} }
/** /**
* 设置 结束 数据获取方式(0.主动上报，1.被动拉取) * 设置 结束 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWayEnd * @param deviceDataSourceWayEnd
*/ */
public DeviceQuery deviceDataSourceWayEnd(Integer deviceDataSourceWayEnd){ public DeviceQuery deviceDataSourceWayEnd(Integer deviceDataSourceWayEnd){
this.deviceDataSourceWayEnd = deviceDataSourceWayEnd; this.deviceDataSourceWayEnd = deviceDataSourceWayEnd;
return this; return this;
} }
/** /**
* 设置 增加 数据获取方式(0.主动上报，1.被动拉取) * 设置 增加 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWayIncrement * @param deviceDataSourceWayIncrement
*/ */
public DeviceQuery deviceDataSourceWayIncrement(Integer deviceDataSourceWayIncrement){ public DeviceQuery deviceDataSourceWayIncrement(Integer deviceDataSourceWayIncrement){
this.deviceDataSourceWayIncrement = deviceDataSourceWayIncrement; this.deviceDataSourceWayIncrement = deviceDataSourceWayIncrement;
return this; return this;
} }
/** /**
* 设置 数据获取方式(0.主动上报，1.被动拉取) * 设置 数据获取方式(0.主动上报，1.被动拉取)
* @param deviceDataSourceWayList * @param deviceDataSourceWayList
*/ */
public DeviceQuery deviceDataSourceWayList(List<Integer> deviceDataSourceWayList){ public DeviceQuery deviceDataSourceWayList(List<Integer> deviceDataSourceWayList){
this.deviceDataSourceWayList = deviceDataSourceWayList; this.deviceDataSourceWayList = deviceDataSourceWayList;
return this; return this;
} }
/** /**
* 设置 经度 * 设置 经度
* @param lon * @param lon
*/ */
public DeviceQuery lon(String lon){ public DeviceQuery lon(String lon){
setLon(lon); setLon(lon);
return this; return this;
} }
/** /**
* 设置 经度 * 设置 经度
* @param lonList * @param lonList
*/ */
public DeviceQuery lonList(List<String> lonList){ public DeviceQuery lonList(List<String> lonList){
this.lonList = lonList; this.lonList = lonList;
return this; return this;
} }
/** /**
* 设置 经度 * 设置 经度
* @param lati * @param lati
*/ */
public DeviceQuery lati(String lati){ public DeviceQuery lati(String lati){
setLati(lati); setLati(lati);
return this; return this;
} }
/** /**
* 设置 经度 * 设置 经度
* @param latiList * @param latiList
*/ */
public DeviceQuery latiList(List<String> latiList){ public DeviceQuery latiList(List<String> latiList){
this.latiList = latiList; this.latiList = latiList;
return this; return this;
} }
/** /**
* 设置 所属楼栋 * 设置 所属楼栋
* @param deviceInBuilding * @param deviceInBuilding
*/ */
public DeviceQuery deviceInBuilding(Integer deviceInBuilding){ public DeviceQuery deviceInBuilding(Integer deviceInBuilding){
setDeviceInBuilding(deviceInBuilding); setDeviceInBuilding(deviceInBuilding);
return this; return this;
} }
/** /**
* 设置 开始 所属楼栋 * 设置 开始 所属楼栋
* @param deviceInBuildingStart * @param deviceInBuildingStart
*/ */
public DeviceQuery deviceInBuildingStart(Integer deviceInBuildingStart){ public DeviceQuery deviceInBuildingStart(Integer deviceInBuildingStart){
this.deviceInBuildingStart = deviceInBuildingStart; this.deviceInBuildingStart = deviceInBuildingStart;
return this; return this;
} }
/** /**
* 设置 结束 所属楼栋 * 设置 结束 所属楼栋
* @param deviceInBuildingEnd * @param deviceInBuildingEnd
*/ */
public DeviceQuery deviceInBuildingEnd(Integer deviceInBuildingEnd){ public DeviceQuery deviceInBuildingEnd(Integer deviceInBuildingEnd){
this.deviceInBuildingEnd = deviceInBuildingEnd; this.deviceInBuildingEnd = deviceInBuildingEnd;
return this; return this;
} }
/** /**
* 设置 增加 所属楼栋 * 设置 增加 所属楼栋
* @param deviceInBuildingIncrement * @param deviceInBuildingIncrement
*/ */
public DeviceQuery deviceInBuildingIncrement(Integer deviceInBuildingIncrement){ public DeviceQuery deviceInBuildingIncrement(Integer deviceInBuildingIncrement){
this.deviceInBuildingIncrement = deviceInBuildingIncrement; this.deviceInBuildingIncrement = deviceInBuildingIncrement;
return this; return this;
} }
/** /**
* 设置 所属楼栋 * 设置 所属楼栋
* @param deviceInBuildingList * @param deviceInBuildingList
*/ */
public DeviceQuery deviceInBuildingList(List<Integer> deviceInBuildingList){ public DeviceQuery deviceInBuildingList(List<Integer> deviceInBuildingList){
this.deviceInBuildingList = deviceInBuildingList; this.deviceInBuildingList = deviceInBuildingList;
return this; return this;
} }
/** /**
* 设置 所属楼层 * 设置 所属楼层
* @param deviceInFloor * @param deviceInFloor
*/ */
public DeviceQuery deviceInFloor(Integer deviceInFloor){ public DeviceQuery deviceInFloor(Integer deviceInFloor){
setDeviceInFloor(deviceInFloor); setDeviceInFloor(deviceInFloor);
return this; return this;
} }
/** /**
* 设置 开始 所属楼层 * 设置 开始 所属楼层
* @param deviceInFloorStart * @param deviceInFloorStart
*/ */
public DeviceQuery deviceInFloorStart(Integer deviceInFloorStart){ public DeviceQuery deviceInFloorStart(Integer deviceInFloorStart){
this.deviceInFloorStart = deviceInFloorStart; this.deviceInFloorStart = deviceInFloorStart;
return this; return this;
} }
/** /**
* 设置 结束 所属楼层 * 设置 结束 所属楼层
* @param deviceInFloorEnd * @param deviceInFloorEnd
*/ */
public DeviceQuery deviceInFloorEnd(Integer deviceInFloorEnd){ public DeviceQuery deviceInFloorEnd(Integer deviceInFloorEnd){
this.deviceInFloorEnd = deviceInFloorEnd; this.deviceInFloorEnd = deviceInFloorEnd;
return this; return this;
} }
/** /**
* 设置 增加 所属楼层 * 设置 增加 所属楼层
* @param deviceInFloorIncrement * @param deviceInFloorIncrement
*/ */
public DeviceQuery deviceInFloorIncrement(Integer deviceInFloorIncrement){ public DeviceQuery deviceInFloorIncrement(Integer deviceInFloorIncrement){
this.deviceInFloorIncrement = deviceInFloorIncrement; this.deviceInFloorIncrement = deviceInFloorIncrement;
return this; return this;
} }
/** /**
* 设置 所属楼层 * 设置 所属楼层
* @param deviceInFloorList * @param deviceInFloorList
*/ */
public DeviceQuery deviceInFloorList(List<Integer> deviceInFloorList){ public DeviceQuery deviceInFloorList(List<Integer> deviceInFloorList){
this.deviceInFloorList = deviceInFloorList; this.deviceInFloorList = deviceInFloorList;
return this; return this;
} }
/** /**
* 设置 负责人 * 设置 负责人
* @param leadingOfficial * @param leadingOfficial
*/ */
public DeviceQuery leadingOfficial(String leadingOfficial){ public DeviceQuery leadingOfficial(String leadingOfficial){
setLeadingOfficial(leadingOfficial); setLeadingOfficial(leadingOfficial);
return this; return this;
} }
/** /**
* 设置 负责人 * 设置 负责人
* @param leadingOfficialList * @param leadingOfficialList
*/ */
public DeviceQuery leadingOfficialList(List<String> leadingOfficialList){ public DeviceQuery leadingOfficialList(List<String> leadingOfficialList){
this.leadingOfficialList = leadingOfficialList; this.leadingOfficialList = leadingOfficialList;
return this; return this;
} }
/** /**
* 设置 联系电话 * 设置 联系电话
* @param leadingOfficialTelephone * @param leadingOfficialTelephone
*/ */
public DeviceQuery leadingOfficialTelephone(String leadingOfficialTelephone){ public DeviceQuery leadingOfficialTelephone(String leadingOfficialTelephone){
setLeadingOfficialTelephone(leadingOfficialTelephone); setLeadingOfficialTelephone(leadingOfficialTelephone);
return this; return this;
} }
/** /**
* 设置 联系电话 * 设置 联系电话
* @param leadingOfficialTelephoneList * @param leadingOfficialTelephoneList
*/ */
public DeviceQuery leadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){ public DeviceQuery leadingOfficialTelephoneList(List<String> leadingOfficialTelephoneList){
this.leadingOfficialTelephoneList = leadingOfficialTelephoneList; this.leadingOfficialTelephoneList = leadingOfficialTelephoneList;
return this; return this;
} }
/** /**
* 设置 是否接收异常短(0.否，1.是) * 设置 是否接收异常短(0.否，1.是)
* @param isReceiveMess * @param isReceiveMess
*/ */
public DeviceQuery isReceiveMess(Integer isReceiveMess){ public DeviceQuery isReceiveMess(Integer isReceiveMess){
setIsReceiveMess(isReceiveMess); setIsReceiveMess(isReceiveMess);
return this; return this;
} }
/** /**
* 设置 开始 是否接收异常短(0.否，1.是) * 设置 开始 是否接收异常短(0.否，1.是)
* @param isReceiveMessStart * @param isReceiveMessStart
*/ */
public DeviceQuery isReceiveMessStart(Integer isReceiveMessStart){ public DeviceQuery isReceiveMessStart(Integer isReceiveMessStart){
this.isReceiveMessStart = isReceiveMessStart; this.isReceiveMessStart = isReceiveMessStart;
return this; return this;
} }
/** /**
* 设置 结束 是否接收异常短(0.否，1.是) * 设置 结束 是否接收异常短(0.否，1.是)
* @param isReceiveMessEnd * @param isReceiveMessEnd
*/ */
public DeviceQuery isReceiveMessEnd(Integer isReceiveMessEnd){ public DeviceQuery isReceiveMessEnd(Integer isReceiveMessEnd){
this.isReceiveMessEnd = isReceiveMessEnd; this.isReceiveMessEnd = isReceiveMessEnd;
return this; return this;
} }
/** /**
* 设置 增加 是否接收异常短(0.否，1.是) * 设置 增加 是否接收异常短(0.否，1.是)
* @param isReceiveMessIncrement * @param isReceiveMessIncrement
*/ */
public DeviceQuery isReceiveMessIncrement(Integer isReceiveMessIncrement){ public DeviceQuery isReceiveMessIncrement(Integer isReceiveMessIncrement){
this.isReceiveMessIncrement = isReceiveMessIncrement; this.isReceiveMessIncrement = isReceiveMessIncrement;
return this; return this;
} }
/** /**
* 设置 是否接收异常短(0.否，1.是) * 设置 是否接收异常短(0.否，1.是)
* @param isReceiveMessList * @param isReceiveMessList
*/ */
public DeviceQuery isReceiveMessList(List<Integer> isReceiveMessList){ public DeviceQuery isReceiveMessList(List<Integer> isReceiveMessList){
this.isReceiveMessList = isReceiveMessList; this.isReceiveMessList = isReceiveMessList;
return this; return this;
} }
/** /**
* 设置 设备图片 * 设置 设备图片
* @param devicePhotoPath * @param devicePhotoPath
*/ */
public DeviceQuery devicePhotoPath(String devicePhotoPath){ public DeviceQuery devicePhotoPath(String devicePhotoPath){
setDevicePhotoPath(devicePhotoPath); setDevicePhotoPath(devicePhotoPath);
return this; return this;
} }
/** /**
* 设置 设备图片 * 设置 设备图片
* @param devicePhotoPathList * @param devicePhotoPathList
*/ */
public DeviceQuery devicePhotoPathList(List<String> devicePhotoPathList){ public DeviceQuery devicePhotoPathList(List<String> devicePhotoPathList){
this.devicePhotoPathList = devicePhotoPathList; this.devicePhotoPathList = devicePhotoPathList;
return this; return this;
} }
/** /**
* 设置 设备访问ip * 设置 设备访问ip
* @param ip * @param ip
*/ */
public DeviceQuery ip(String ip){ public DeviceQuery ip(String ip){
setIp(ip); setIp(ip);
return this; return this;
} }
/** /**
* 设置 设备访问ip * 设置 设备访问ip
* @param ipList * @param ipList
*/ */
public DeviceQuery ipList(List<String> ipList){ public DeviceQuery ipList(List<String> ipList){
this.ipList = ipList; this.ipList = ipList;
return this; return this;
} }
/** /**
* 设置 中心设备编码 * 设置 中心设备编码
* @param centernum * @param centernum
*/ */
public DeviceQuery centernum(String centernum){ public DeviceQuery centernum(String centernum){
setCenternum(centernum); setCenternum(centernum);
return this; return this;
} }
/** /**
* 设置 中心设备编码 * 设置 中心设备编码
* @param centernumList * @param centernumList
*/ */
public DeviceQuery centernumList(List<String> centernumList){ public DeviceQuery centernumList(List<String> centernumList){
this.centernumList = centernumList; this.centernumList = centernumList;
return this; return this;
} }
/** /**
* 设置 端口 * 设置 端口
* @param port * @param port
*/ */
public DeviceQuery port(String port){ public DeviceQuery port(String port){
setPort(port); setPort(port);
return this; return this;
} }
/** /**
* 设置 端口 * 设置 端口
* @param portList * @param portList
*/ */
public DeviceQuery portList(List<String> portList){ public DeviceQuery portList(List<String> portList){
this.portList = portList; this.portList = portList;
return this; return this;
} }
/** /**
* 设置 设备topic信息 * 设置 设备topic信息
* @param deviceTopic * @param deviceTopic
*/ */
public DeviceQuery deviceTopic(String deviceTopic){ public DeviceQuery deviceTopic(String deviceTopic){
setDeviceTopic(deviceTopic); setDeviceTopic(deviceTopic);
return this; return this;
} }
/** /**
* 设置 设备topic信息 * 设置 设备topic信息
* @param deviceTopicList * @param deviceTopicList
*/ */
public DeviceQuery deviceTopicList(List<String> deviceTopicList){ public DeviceQuery deviceTopicList(List<String> deviceTopicList){
this.deviceTopicList = deviceTopicList; this.deviceTopicList = deviceTopicList;
return this; return this;
} }
/** /**
* 设置 设备状态 (0.未激活，1.离线,2.在线) * 设置 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatus * @param deviceStatus
*/ */
public DeviceQuery deviceStatus(Integer deviceStatus){ public DeviceQuery deviceStatus(Integer deviceStatus){
setDeviceStatus(deviceStatus); setDeviceStatus(deviceStatus);
return this; return this;
} }
/** /**
* 设置 开始 设备状态 (0.未激活，1.离线,2.在线) * 设置 开始 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatusStart * @param deviceStatusStart
*/ */
public DeviceQuery deviceStatusStart(Integer deviceStatusStart){ public DeviceQuery deviceStatusStart(Integer deviceStatusStart){
this.deviceStatusStart = deviceStatusStart; this.deviceStatusStart = deviceStatusStart;
return this; return this;
} }
/** /**
* 设置 结束 设备状态 (0.未激活，1.离线,2.在线) * 设置 结束 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatusEnd * @param deviceStatusEnd
*/ */
public DeviceQuery deviceStatusEnd(Integer deviceStatusEnd){ public DeviceQuery deviceStatusEnd(Integer deviceStatusEnd){
this.deviceStatusEnd = deviceStatusEnd; this.deviceStatusEnd = deviceStatusEnd;
return this; return this;
} }
/** /**
* 设置 增加 设备状态 (0.未激活，1.离线,2.在线) * 设置 增加 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatusIncrement * @param deviceStatusIncrement
*/ */
public DeviceQuery deviceStatusIncrement(Integer deviceStatusIncrement){ public DeviceQuery deviceStatusIncrement(Integer deviceStatusIncrement){
this.deviceStatusIncrement = deviceStatusIncrement; this.deviceStatusIncrement = deviceStatusIncrement;
return this; return this;
} }
/** /**
* 设置 设备状态 (0.未激活，1.离线,2.在线) * 设置 设备状态 (0.未激活，1.离线,2.在线)
* @param deviceStatusList * @param deviceStatusList
*/ */
public DeviceQuery deviceStatusList(List<Integer> deviceStatusList){ public DeviceQuery deviceStatusList(List<Integer> deviceStatusList){
this.deviceStatusList = deviceStatusList; this.deviceStatusList = deviceStatusList;
return this; return this;
} }
/** /**
* 设置 启用状态 (0.停止，1.启用) * 设置 启用状态 (0.停止，1.启用)
* @param enabled * @param enabled
*/ */
public DeviceQuery enabled(Integer enabled){ public DeviceQuery enabled(Integer enabled){
setEnabled(enabled); setEnabled(enabled);
return this; return this;
} }
/** /**
* 设置 开始 启用状态 (0.停止，1.启用) * 设置 开始 启用状态 (0.停止，1.启用)
* @param enabledStart * @param enabledStart
*/ */
public DeviceQuery enabledStart(Integer enabledStart){ public DeviceQuery enabledStart(Integer enabledStart){
this.enabledStart = enabledStart; this.enabledStart = enabledStart;
return this; return this;
} }
/** /**
* 设置 结束 启用状态 (0.停止，1.启用) * 设置 结束 启用状态 (0.停止，1.启用)
* @param enabledEnd * @param enabledEnd
*/ */
public DeviceQuery enabledEnd(Integer enabledEnd){ public DeviceQuery enabledEnd(Integer enabledEnd){
this.enabledEnd = enabledEnd; this.enabledEnd = enabledEnd;
return this; return this;
} }
/** /**
* 设置 增加 启用状态 (0.停止，1.启用) * 设置 增加 启用状态 (0.停止，1.启用)
* @param enabledIncrement * @param enabledIncrement
*/ */
public DeviceQuery enabledIncrement(Integer enabledIncrement){ public DeviceQuery enabledIncrement(Integer enabledIncrement){
this.enabledIncrement = enabledIncrement; this.enabledIncrement = enabledIncrement;
return this; return this;
} }
/** /**
* 设置 启用状态 (0.停止，1.启用) * 设置 启用状态 (0.停止，1.启用)
* @param enabledList * @param enabledList
*/ */
public DeviceQuery enabledList(List<Integer> enabledList){ public DeviceQuery enabledList(List<Integer> enabledList){
this.enabledList = enabledList; this.enabledList = enabledList;
return this; return this;
} }
/** /**
* 设置 设备授权码 * 设置 设备授权码
* @param deviceAuthCode * @param deviceAuthCode
*/ */
public DeviceQuery deviceAuthCode(String deviceAuthCode){ public DeviceQuery deviceAuthCode(String deviceAuthCode){
setDeviceAuthCode(deviceAuthCode); setDeviceAuthCode(deviceAuthCode);
return this; return this;
} }
/** /**
* 设置 设备授权码 * 设置 设备授权码
* @param deviceAuthCodeList * @param deviceAuthCodeList
*/ */
public DeviceQuery deviceAuthCodeList(List<String> deviceAuthCodeList){ public DeviceQuery deviceAuthCodeList(List<String> deviceAuthCodeList){
this.deviceAuthCodeList = deviceAuthCodeList; this.deviceAuthCodeList = deviceAuthCodeList;
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param deviceRemark * @param deviceRemark
*/ */
public DeviceQuery deviceRemark(String deviceRemark){ public DeviceQuery deviceRemark(String deviceRemark){
setDeviceRemark(deviceRemark); setDeviceRemark(deviceRemark);
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param deviceRemarkList * @param deviceRemarkList
*/ */
public DeviceQuery deviceRemarkList(List<String> deviceRemarkList){ public DeviceQuery deviceRemarkList(List<String> deviceRemarkList){
this.deviceRemarkList = deviceRemarkList; this.deviceRemarkList = deviceRemarkList;
return this; return this;
} }
/** /**
* 设置 是否删除，(0.否，1.是) * 设置 是否删除(0.否，1.是)
* @param deleted * @param deleted
*/ */
public DeviceQuery deleted(Integer deleted){ public DeviceQuery deleted(Integer deleted){
setDeleted(deleted); setDeleted(deleted);
return this; return this;
} }
/** /**
* 设置 开始 是否删除，(0.否，1.是) * 设置 开始 是否删除(0.否，1.是)
* @param deletedStart * @param deletedStart
*/ */
public DeviceQuery deletedStart(Integer deletedStart){ public DeviceQuery deletedStart(Integer deletedStart){
this.deletedStart = deletedStart; this.deletedStart = deletedStart;
return this; return this;
} }
/** /**
* 设置 结束 是否删除，(0.否，1.是) * 设置 结束 是否删除(0.否，1.是)
* @param deletedEnd * @param deletedEnd
*/ */
public DeviceQuery deletedEnd(Integer deletedEnd){ public DeviceQuery deletedEnd(Integer deletedEnd){
this.deletedEnd = deletedEnd; this.deletedEnd = deletedEnd;
return this; return this;
} }
/** /**
* 设置 增加 是否删除，(0.否，1.是) * 设置 增加 是否删除(0.否，1.是)
* @param deletedIncrement * @param deletedIncrement
*/ */
public DeviceQuery deletedIncrement(Integer deletedIncrement){ public DeviceQuery deletedIncrement(Integer deletedIncrement){
this.deletedIncrement = deletedIncrement; this.deletedIncrement = deletedIncrement;
return this; return this;
} }
/** /**
* 设置 是否删除，(0.否，1.是) * 设置 是否删除(0.否，1.是)
* @param deletedList * @param deletedList
*/ */
public DeviceQuery deletedList(List<Integer> deletedList){ public DeviceQuery deletedList(List<Integer> deletedList){
this.deletedList = deletedList; this.deletedList = deletedList;
return this; return this;
} }
/**
* 设置 收不来源(0.旧设备，1.新设备)
* @param source
*/
public DeviceQuery source(Integer source){
setSource(source);
return this;
}
/**
* 设置 开始 收不来源(0.旧设备，1.新设备)
* @param sourceStart
*/
public DeviceQuery sourceStart(Integer sourceStart){
this.sourceStart = sourceStart;
return this;
}
/**
* 设置 结束 收不来源(0.旧设备，1.新设备)
* @param sourceEnd
*/
public DeviceQuery sourceEnd(Integer sourceEnd){
this.sourceEnd = sourceEnd;
return this;
}
/** /**
* 设置 创建用户 * 设置 增加 收不来源(0.旧设备，1.新设备)
* @param createUserId * @param sourceIncrement
*/ */
public DeviceQuery sourceIncrement(Integer sourceIncrement){
this.sourceIncrement = sourceIncrement;
return this;
}
/**
* 设置 收不来源(0.旧设备，1.新设备)
* @param sourceList
*/
public DeviceQuery sourceList(List<Integer> sourceList){
this.sourceList = sourceList;
return this;
}
/**
* 设置 创建用户
* @param createUserId
*/
public DeviceQuery createUserId(Long createUserId){ public DeviceQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public DeviceQuery createUserIdStart(Long createUserIdStart){ public DeviceQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public DeviceQuery createUserIdEnd(Long createUserIdEnd){ public DeviceQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public DeviceQuery createUserIdIncrement(Long createUserIdIncrement){ public DeviceQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public DeviceQuery createUserIdList(List<Long> createUserIdList){ public DeviceQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserId * @param updateUserId
*/ */
public DeviceQuery updateUserId(Long updateUserId){ public DeviceQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public DeviceQuery updateUserIdStart(Long updateUserIdStart){ public DeviceQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public DeviceQuery updateUserIdEnd(Long updateUserIdEnd){ public DeviceQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public DeviceQuery updateUserIdIncrement(Long updateUserIdIncrement){ public DeviceQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public DeviceQuery updateUserIdList(List<Long> updateUserIdList){ public DeviceQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
return this; return this;
} }
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
*/ */
public List<DeviceQuery> getOrConditionList(){ public List<DeviceQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 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)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<DeviceQuery> orConditionList){ public void setOrConditionList(List<DeviceQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<DeviceQuery> getAndConditionList(){ public List<DeviceQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<DeviceQuery> andConditionList){ public void setAndConditionList(List<DeviceQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
View file @ 91ac7bfe
...@@ -210,7 +210,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D ...@@ -210,7 +210,7 @@ public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, D
BeanUtils.copyProperties(entity, deviceReq, BeanUtil.getNullPropertyNames(entity)); BeanUtils.copyProperties(entity, deviceReq, BeanUtil.getNullPropertyNames(entity));
deviceReq.setReceiveMethod(update.getValue()); deviceReq.setReceiveMethod(update.getValue());
deviceReq.setProductCode(productEntity.getProductCode()); deviceReq.setProductCode(productEntity.getProductCode());
deviceReq.setPlatformCode(platformEntity.getPlatformSn()); //deviceReq.setPlatformCode(platformEntity.getPlatformSn());
if (!ObjectUtils.isEmpty(platformEntity.getSendUrl()) if (!ObjectUtils.isEmpty(platformEntity.getSendUrl())
//&& platformEntity.getSendSwitch() == SendSwitchEnum.启用.getValue() //&& platformEntity.getSendSwitch() == SendSwitchEnum.启用.getValue()
&& entity.getSwitchSend()) { && entity.getSwitchSend()) {
......
device-manager/src/main/java/com/mortals/xhx/module/platform/service/impl/PlatformServiceImpl.java
View file @ 91ac7bfe
package com.mortals.xhx.module.platform.service.impl; package com.mortals.xhx.module.platform.service.impl;
import cn.hutool.core.lang.PatternPool;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.platform.dao.PlatformDao; import com.mortals.xhx.module.platform.dao.PlatformDao;
import com.mortals.xhx.module.platform.model.PlatformEntity; import com.mortals.xhx.module.platform.model.PlatformEntity;
import com.mortals.xhx.module.platform.service.PlatformService; import com.mortals.xhx.module.platform.service.PlatformService;
import org.springframework.util.ObjectUtils;
/** /**
* PlatformService * PlatformService
* 平台系统 service实现 * 平台系统 service实现
...@@ -13,5 +18,16 @@ import com.mortals.xhx.module.platform.service.PlatformService; ...@@ -13,5 +18,16 @@ import com.mortals.xhx.module.platform.service.PlatformService;
*/ */
@Service("platformService") @Service("platformService")
public class PlatformServiceImpl extends AbstractCRUDServiceImpl<PlatformDao, PlatformEntity, Long> implements PlatformService { public class PlatformServiceImpl extends AbstractCRUDServiceImpl<PlatformDao, PlatformEntity, Long> implements PlatformService {
@Override
protected void validData(PlatformEntity entity, Context context) throws AppException {
if(!ObjectUtils.isEmpty(entity.getSendUrl())){
//UrlValidator urlValidator = new UrlValidator();
}
super.validData(entity, context);
}
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/product/model/ProductEntity.java
View file @ 91ac7bfe
...@@ -7,89 +7,89 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,89 +7,89 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.product.model.vo.ProductVo; import com.mortals.xhx.module.product.model.vo.ProductVo;
/** /**
* 产品实体对象 * 产品实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-11
*/ */
public class ProductEntity extends ProductVo { public class ProductEntity extends ProductVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 产品名称，名称唯一 * 关联平台
*/ */
private Long platformId;
/**
* 产品名称，名称唯一
*/
@Excel(name = "产品名称，名称唯一") @Excel(name = "产品名称，名称唯一")
private String productName; private String productName;
/** /**
* 产品编码 * 产品编码
*/ */
private String productCode; private String productCode;
/** /**
* 交换机名称,英文必填 * 备注
*/ */
private String exchangeName;
/**
* 备注
*/
private String productRemark; private String productRemark;
public ProductEntity(){} public ProductEntity(){}
/** /**
* 获取 产品名称，名称唯一 * 获取 关联平台
* @return String * @return Long
*/ */
public Long getPlatformId(){
return platformId;
}
/**
* 设置 关联平台
* @param platformId
*/
public void setPlatformId(Long platformId){
this.platformId = platformId;
}
/**
* 获取 产品名称，名称唯一
* @return String
*/
public String getProductName(){ public String getProductName(){
return productName; return productName;
} }
/** /**
* 设置 产品名称，名称唯一 * 设置 产品名称，名称唯一
* @param productName * @param productName
*/ */
public void setProductName(String productName){ public void setProductName(String productName){
this.productName = productName; this.productName = productName;
} }
/** /**
* 获取 产品编码 * 获取 产品编码
* @return String * @return String
*/ */
public String getProductCode(){ public String getProductCode(){
return productCode; return productCode;
} }
/** /**
* 设置 产品编码 * 设置 产品编码
* @param productCode * @param productCode
*/ */
public void setProductCode(String productCode){ public void setProductCode(String productCode){
this.productCode = productCode; this.productCode = productCode;
} }
/** /**
* 获取 交换机名称,英文必填 * 获取 备注
* @return String * @return String
*/ */
public String getExchangeName(){
return exchangeName;
}
/**
* 设置 交换机名称,英文必填
* @param exchangeName
*/
public void setExchangeName(String exchangeName){
this.exchangeName = exchangeName;
}
/**
* 获取 备注
* @return String
*/
public String getProductRemark(){ public String getProductRemark(){
return productRemark; return productRemark;
} }
/** /**
* 设置 备注 * 设置 备注
* @param productRemark * @param productRemark
*/ */
public void setProductRemark(String productRemark){ public void setProductRemark(String productRemark){
this.productRemark = productRemark; this.productRemark = productRemark;
} }
...@@ -99,7 +99,7 @@ public class ProductEntity extends ProductVo { ...@@ -99,7 +99,7 @@ public class ProductEntity extends ProductVo {
@Override @Override
public int hashCode() { public int hashCode() {
return this.getId().hashCode(); return this.getId().hashCode();
} }
@Override @Override
public boolean equals(Object obj) { public boolean equals(Object obj) {
...@@ -107,7 +107,7 @@ public class ProductEntity extends ProductVo { ...@@ -107,7 +107,7 @@ public class ProductEntity extends ProductVo {
if (obj instanceof ProductEntity) { if (obj instanceof ProductEntity) {
ProductEntity tmp = (ProductEntity) obj; ProductEntity tmp = (ProductEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -115,21 +115,21 @@ public class ProductEntity extends ProductVo { ...@@ -115,21 +115,21 @@ public class ProductEntity extends ProductVo {
public String toString(){ public String toString(){
StringBuilder sb = new StringBuilder(""); StringBuilder sb = new StringBuilder("");
sb.append(",platformId:").append(getPlatformId());
sb.append(",productName:").append(getProductName()); sb.append(",productName:").append(getProductName());
sb.append(",productCode:").append(getProductCode()); sb.append(",productCode:").append(getProductCode());
sb.append(",exchangeName:").append(getExchangeName());
sb.append(",productRemark:").append(getProductRemark()); sb.append(",productRemark:").append(getProductRemark());
return sb.toString(); return sb.toString();
} }
public void initAttrValue(){ public void initAttrValue(){
this.productName = ""; this.platformId = null;
this.productCode = ""; this.productName = "";
this.exchangeName = ""; this.productCode = "";
this.productRemark = ""; this.productRemark = "";
} }
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/product/model/ProductQuery.java
View file @ 91ac7bfe
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.product.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.product.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.product.model.ProductEntity; import com.mortals.xhx.module.product.model.ProductEntity;
/** /**
* 产品查询对象 * 产品查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-07-01 * @date 2022-07-11
*/ */
public class ProductQuery extends ProductEntity { public class ProductQuery extends ProductEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -21,15 +21,24 @@ public class ProductQuery extends ProductEntity { ...@@ -21,15 +21,24 @@ public class ProductQuery extends ProductEntity {
/** 主键ID，主键，自增长列表 */ /** 主键ID，主键，自增长列表 */
private List <Long> idList; private List <Long> idList;
/** 开始 关联平台 */
private Long platformIdStart;
/** 结束 关联平台 */
private Long platformIdEnd;
/** 增加 关联平台 */
private Long platformIdIncrement;
/** 关联平台列表 */
private List <Long> platformIdList;
/** 产品名称，名称唯一 */ /** 产品名称，名称唯一 */
private List<String> productNameList; private List<String> productNameList;
/** 产品编码 */ /** 产品编码 */
private List<String> productCodeList; private List<String> productCodeList;
/** 交换机名称,英文必填 */
private List<String> exchangeNameList;
/** 备注 */ /** 备注 */
private List<String> productRemarkList; private List<String> productRemarkList;
...@@ -78,562 +87,637 @@ public class ProductQuery extends ProductEntity { ...@@ -78,562 +87,637 @@ public class ProductQuery extends ProductEntity {
public ProductQuery(){} public ProductQuery(){}
/** /**
* 获取 开始 主键ID，主键，自增长 * 获取 开始 主键ID，主键，自增长
* @return idStart * @return idStart
*/ */
public Long getIdStart(){ public Long getIdStart(){
return this.idStart; return this.idStart;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public void setIdStart(Long idStart){ public void setIdStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
} }
/** /**
* 获取 结束 主键ID，主键，自增长 * 获取 结束 主键ID，主键，自增长
* @return $idEnd * @return $idEnd
*/ */
public Long getIdEnd(){ public Long getIdEnd(){
return this.idEnd; return this.idEnd;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public void setIdEnd(Long idEnd){ public void setIdEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
} }
/** /**
* 获取 增加 主键ID，主键，自增长 * 获取 增加 主键ID，主键，自增长
* @return idIncrement * @return idIncrement
*/ */
public Long getIdIncrement(){ public Long getIdIncrement(){
return this.idIncrement; return this.idIncrement;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public void setIdIncrement(Long idIncrement){ public void setIdIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
} }
/** /**
* 获取 主键ID，主键，自增长 * 获取 主键ID，主键，自增长
* @return idList * @return idList
*/ */
public List<Long> getIdList(){ public List<Long> getIdList(){
return this.idList; return this.idList;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public void setIdList(List<Long> idList){ public void setIdList(List<Long> idList){
this.idList = idList; this.idList = idList;
} }
/** /**
* 获取 产品名称，名称唯一 * 获取 开始 关联平台
* @return productNameList * @return platformIdStart
*/ */
public Long getPlatformIdStart(){
return this.platformIdStart;
}
/**
* 设置 开始 关联平台
* @param platformIdStart
*/
public void setPlatformIdStart(Long platformIdStart){
this.platformIdStart = platformIdStart;
}
/**
* 获取 结束 关联平台
* @return $platformIdEnd
*/
public Long getPlatformIdEnd(){
return this.platformIdEnd;
}
/**
* 设置 结束 关联平台
* @param platformIdEnd
*/
public void setPlatformIdEnd(Long platformIdEnd){
this.platformIdEnd = platformIdEnd;
}
/**
* 获取 增加 关联平台
* @return platformIdIncrement
*/
public Long getPlatformIdIncrement(){
return this.platformIdIncrement;
}
/**
* 设置 增加 关联平台
* @param platformIdIncrement
*/
public void setPlatformIdIncrement(Long platformIdIncrement){
this.platformIdIncrement = platformIdIncrement;
}
/**
* 获取 关联平台
* @return platformIdList
*/
public List<Long> getPlatformIdList(){
return this.platformIdList;
}
/**
* 设置 关联平台
* @param platformIdList
*/
public void setPlatformIdList(List<Long> platformIdList){
this.platformIdList = platformIdList;
}
/**
* 获取 产品名称，名称唯一
* @return productNameList
*/
public List<String> getProductNameList(){ public List<String> getProductNameList(){
return this.productNameList; return this.productNameList;
} }
/** /**
* 设置 产品名称，名称唯一 * 设置 产品名称，名称唯一
* @param productNameList * @param productNameList
*/ */
public void setProductNameList(List<String> productNameList){ public void setProductNameList(List<String> productNameList){
this.productNameList = productNameList; this.productNameList = productNameList;
} }
/** /**
* 获取 产品编码 * 获取 产品编码
* @return productCodeList * @return productCodeList
*/ */
public List<String> getProductCodeList(){ public List<String> getProductCodeList(){
return this.productCodeList; return this.productCodeList;
} }
/** /**
* 设置 产品编码 * 设置 产品编码
* @param productCodeList * @param productCodeList
*/ */
public void setProductCodeList(List<String> productCodeList){ public void setProductCodeList(List<String> productCodeList){
this.productCodeList = productCodeList; this.productCodeList = productCodeList;
} }
/** /**
* 获取 交换机名称,英文必填 * 获取 备注
* @return exchangeNameList * @return productRemarkList
*/ */
public List<String> getExchangeNameList(){
return this.exchangeNameList;
}
/**
* 设置 交换机名称,英文必填
* @param exchangeNameList
*/
public void setExchangeNameList(List<String> exchangeNameList){
this.exchangeNameList = exchangeNameList;
}
/**
* 获取 备注
* @return productRemarkList
*/
public List<String> getProductRemarkList(){ public List<String> getProductRemarkList(){
return this.productRemarkList; return this.productRemarkList;
} }
/** /**
* 设置 备注 * 设置 备注
* @param productRemarkList * @param productRemarkList
*/ */
public void setProductRemarkList(List<String> productRemarkList){ public void setProductRemarkList(List<String> productRemarkList){
this.productRemarkList = productRemarkList; this.productRemarkList = productRemarkList;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @return createUserIdStart * @return createUserIdStart
*/ */
public Long getCreateUserIdStart(){ public Long getCreateUserIdStart(){
return this.createUserIdStart; return this.createUserIdStart;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public void setCreateUserIdStart(Long createUserIdStart){ public void setCreateUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
} }
/** /**
* 获取 结束 创建用户 * 获取 结束 创建用户
* @return $createUserIdEnd * @return $createUserIdEnd
*/ */
public Long getCreateUserIdEnd(){ public Long getCreateUserIdEnd(){
return this.createUserIdEnd; return this.createUserIdEnd;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public void setCreateUserIdEnd(Long createUserIdEnd){ public void setCreateUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
} }
/** /**
* 获取 增加 创建用户 * 获取 增加 创建用户
* @return createUserIdIncrement * @return createUserIdIncrement
*/ */
public Long getCreateUserIdIncrement(){ public Long getCreateUserIdIncrement(){
return this.createUserIdIncrement; return this.createUserIdIncrement;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public void setCreateUserIdIncrement(Long createUserIdIncrement){ public void setCreateUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
} }
/** /**
* 获取 创建用户 * 获取 创建用户
* @return createUserIdList * @return createUserIdList
*/ */
public List<Long> getCreateUserIdList(){ public List<Long> getCreateUserIdList(){
return this.createUserIdList; return this.createUserIdList;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public void setCreateUserIdList(List<Long> createUserIdList){ public void setCreateUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
} }
/** /**
* 获取 开始 创建时间 * 获取 开始 创建时间
* @return createTimeStart * @return createTimeStart
*/ */
public String getCreateTimeStart(){ public String getCreateTimeStart(){
return this.createTimeStart; return this.createTimeStart;
} }
/** /**
* 设置 开始 创建时间 * 设置 开始 创建时间
* @param createTimeStart * @param createTimeStart
*/ */
public void setCreateTimeStart(String createTimeStart){ public void setCreateTimeStart(String createTimeStart){
this.createTimeStart = createTimeStart; this.createTimeStart = createTimeStart;
} }
/** /**
* 获取 结束 创建时间 * 获取 结束 创建时间
* @return createTimeEnd * @return createTimeEnd
*/ */
public String getCreateTimeEnd(){ public String getCreateTimeEnd(){
return this.createTimeEnd; return this.createTimeEnd;
} }
/** /**
* 设置 结束 创建时间 * 设置 结束 创建时间
* @param createTimeEnd * @param createTimeEnd
*/ */
public void setCreateTimeEnd(String createTimeEnd){ public void setCreateTimeEnd(String createTimeEnd){
this.createTimeEnd = createTimeEnd; this.createTimeEnd = createTimeEnd;
} }
/** /**
* 获取 开始 更新用户 * 获取 开始 更新用户
* @return updateUserIdStart * @return updateUserIdStart
*/ */
public Long getUpdateUserIdStart(){ public Long getUpdateUserIdStart(){
return this.updateUserIdStart; return this.updateUserIdStart;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public void setUpdateUserIdStart(Long updateUserIdStart){ public void setUpdateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
} }
/** /**
* 获取 结束 更新用户 * 获取 结束 更新用户
* @return $updateUserIdEnd * @return $updateUserIdEnd
*/ */
public Long getUpdateUserIdEnd(){ public Long getUpdateUserIdEnd(){
return this.updateUserIdEnd; return this.updateUserIdEnd;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public void setUpdateUserIdEnd(Long updateUserIdEnd){ public void setUpdateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
} }
/** /**
* 获取 增加 更新用户 * 获取 增加 更新用户
* @return updateUserIdIncrement * @return updateUserIdIncrement
*/ */
public Long getUpdateUserIdIncrement(){ public Long getUpdateUserIdIncrement(){
return this.updateUserIdIncrement; return this.updateUserIdIncrement;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public void setUpdateUserIdIncrement(Long updateUserIdIncrement){ public void setUpdateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
} }
/** /**
* 获取 更新用户 * 获取 更新用户
* @return updateUserIdList * @return updateUserIdList
*/ */
public List<Long> getUpdateUserIdList(){ public List<Long> getUpdateUserIdList(){
return this.updateUserIdList; return this.updateUserIdList;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public void setUpdateUserIdList(List<Long> updateUserIdList){ public void setUpdateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
} }
/** /**
* 获取 开始 更新时间 * 获取 开始 更新时间
* @return updateTimeStart * @return updateTimeStart
*/ */
public String getUpdateTimeStart(){ public String getUpdateTimeStart(){
return this.updateTimeStart; return this.updateTimeStart;
} }
/** /**
* 设置 开始 更新时间 * 设置 开始 更新时间
* @param updateTimeStart * @param updateTimeStart
*/ */
public void setUpdateTimeStart(String updateTimeStart){ public void setUpdateTimeStart(String updateTimeStart){
this.updateTimeStart = updateTimeStart; this.updateTimeStart = updateTimeStart;
} }
/** /**
* 获取 结束 更新时间 * 获取 结束 更新时间
* @return updateTimeEnd * @return updateTimeEnd
*/ */
public String getUpdateTimeEnd(){ public String getUpdateTimeEnd(){
return this.updateTimeEnd; return this.updateTimeEnd;
} }
/** /**
* 设置 结束 更新时间 * 设置 结束 更新时间
* @param updateTimeEnd * @param updateTimeEnd
*/ */
public void setUpdateTimeEnd(String updateTimeEnd){ public void setUpdateTimeEnd(String updateTimeEnd){
this.updateTimeEnd = updateTimeEnd; this.updateTimeEnd = updateTimeEnd;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param id * @param id
*/ */
public ProductQuery id(Long id){ public ProductQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public ProductQuery idStart(Long idStart){ public ProductQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public ProductQuery idEnd(Long idEnd){ public ProductQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public ProductQuery idIncrement(Long idIncrement){ public ProductQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public ProductQuery idList(List<Long> idList){ public ProductQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/**
* 设置 关联平台
* @param platformId
*/
public ProductQuery platformId(Long platformId){
setPlatformId(platformId);
return this;
}
/**
* 设置 开始 关联平台
* @param platformIdStart
*/
public ProductQuery platformIdStart(Long platformIdStart){
this.platformIdStart = platformIdStart;
return this;
}
/**
* 设置 结束 关联平台
* @param platformIdEnd
*/
public ProductQuery platformIdEnd(Long platformIdEnd){
this.platformIdEnd = platformIdEnd;
return this;
}
/** /**
* 设置 产品名称，名称唯一 * 设置 增加 关联平台
* @param productName * @param platformIdIncrement
*/ */
public ProductQuery platformIdIncrement(Long platformIdIncrement){
this.platformIdIncrement = platformIdIncrement;
return this;
}
/**
* 设置 关联平台
* @param platformIdList
*/
public ProductQuery platformIdList(List<Long> platformIdList){
this.platformIdList = platformIdList;
return this;
}
/**
* 设置 产品名称，名称唯一
* @param productName
*/
public ProductQuery productName(String productName){ public ProductQuery productName(String productName){
setProductName(productName); setProductName(productName);
return this; return this;
} }
/** /**
* 设置 产品名称，名称唯一 * 设置 产品名称，名称唯一
* @param productNameList * @param productNameList
*/ */
public ProductQuery productNameList(List<String> productNameList){ public ProductQuery productNameList(List<String> productNameList){
this.productNameList = productNameList; this.productNameList = productNameList;
return this; return this;
} }
/** /**
* 设置 产品编码 * 设置 产品编码
* @param productCode * @param productCode
*/ */
public ProductQuery productCode(String productCode){ public ProductQuery productCode(String productCode){
setProductCode(productCode); setProductCode(productCode);
return this; return this;
} }
/** /**
* 设置 产品编码 * 设置 产品编码
* @param productCodeList * @param productCodeList
*/ */
public ProductQuery productCodeList(List<String> productCodeList){ public ProductQuery productCodeList(List<String> productCodeList){
this.productCodeList = productCodeList; this.productCodeList = productCodeList;
return this; return this;
} }
/**
* 设置 交换机名称,英文必填
* @param exchangeName
*/
public ProductQuery exchangeName(String exchangeName){
setExchangeName(exchangeName);
return this;
}
/** /**
* 设置 交换机名称,英文必填 * 设置 备注
* @param exchangeNameList * @param productRemark
*/ */
public ProductQuery exchangeNameList(List<String> exchangeNameList){
this.exchangeNameList = exchangeNameList;
return this;
}
/**
* 设置 备注
* @param productRemark
*/
public ProductQuery productRemark(String productRemark){ public ProductQuery productRemark(String productRemark){
setProductRemark(productRemark); setProductRemark(productRemark);
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param productRemarkList * @param productRemarkList
*/ */
public ProductQuery productRemarkList(List<String> productRemarkList){ public ProductQuery productRemarkList(List<String> productRemarkList){
this.productRemarkList = productRemarkList; this.productRemarkList = productRemarkList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public ProductQuery createUserId(Long createUserId){ public ProductQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public ProductQuery createUserIdStart(Long createUserIdStart){ public ProductQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public ProductQuery createUserIdEnd(Long createUserIdEnd){ public ProductQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public ProductQuery createUserIdIncrement(Long createUserIdIncrement){ public ProductQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public ProductQuery createUserIdList(List<Long> createUserIdList){ public ProductQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserId * @param updateUserId
*/ */
public ProductQuery updateUserId(Long updateUserId){ public ProductQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public ProductQuery updateUserIdStart(Long updateUserIdStart){ public ProductQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public ProductQuery updateUserIdEnd(Long updateUserIdEnd){ public ProductQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public ProductQuery updateUserIdIncrement(Long updateUserIdIncrement){ public ProductQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public ProductQuery updateUserIdList(List<Long> updateUserIdList){ public ProductQuery updateUserIdList(List<Long> updateUserIdList){
this.updateUserIdList = updateUserIdList; this.updateUserIdList = updateUserIdList;
return this; return this;
} }
/** /**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) * 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
* @return orConditionList * @return orConditionList
*/ */
public List<ProductQuery> getOrConditionList(){ public List<ProductQuery> getOrConditionList(){
return this.orConditionList; return this.orConditionList;
} }
/** /**
* 设置 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)
* @param orConditionList * @param orConditionList
*/ */
public void setOrConditionList(List<ProductQuery> orConditionList){ public void setOrConditionList(List<ProductQuery> orConditionList){
this.orConditionList = orConditionList; this.orConditionList = orConditionList;
} }
/** /**
* 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 获取 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @return andConditionList * @return andConditionList
*/ */
public List<ProductQuery> getAndConditionList(){ public List<ProductQuery> getAndConditionList(){
return this.andConditionList; return this.andConditionList;
} }
/** /**
* 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4) * 设置 AND条件集合，列表项之间是AND，项内容之间是OR，如：(list[0].1 or list[0].2) and (list[1].3 or list[1].4)
* @param andConditionList * @param andConditionList
*/ */
public void setAndConditionList(List<ProductQuery> andConditionList){ public void setAndConditionList(List<ProductQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
device-manager/src/main/java/com/mortals/xhx/module/product/service/impl/ProductServiceImpl.java
View file @ 91ac7bfe
package com.mortals.xhx.module.product.service.impl; package com.mortals.xhx.module.product.service.impl;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.xhx.module.product.model.ProductQuery;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
import com.mortals.xhx.module.product.dao.ProductDao; import com.mortals.xhx.module.product.dao.ProductDao;
import com.mortals.xhx.module.product.model.ProductEntity; import com.mortals.xhx.module.product.model.ProductEntity;
import com.mortals.xhx.module.product.service.ProductService; import com.mortals.xhx.module.product.service.ProductService;
import org.springframework.util.ObjectUtils;
/** /**
* ProductService * ProductService
* 产品 service实现 * 产品 service实现
...@@ -13,5 +18,24 @@ import com.mortals.xhx.module.product.service.ProductService; ...@@ -13,5 +18,24 @@ import com.mortals.xhx.module.product.service.ProductService;
*/ */
@Service("productService") @Service("productService")
public class ProductServiceImpl extends AbstractCRUDServiceImpl<ProductDao, ProductEntity, Long> implements ProductService { public class ProductServiceImpl extends AbstractCRUDServiceImpl<ProductDao, ProductEntity, Long> implements ProductService {
@Override
protected void saveBefore(ProductEntity entity, Context context) throws AppException {
//新增产品编码不能重复
ProductEntity productEntity = this.selectOne(new ProductQuery().productCode(entity.getProductCode()));
if(!ObjectUtils.isEmpty(productEntity))throw new AppException("当前产品编码已存在！");
super.saveBefore(entity, context);
}
@Override
protected void updateBefore(ProductEntity entity, Context context) throws AppException {
ProductEntity productEntity = this.get(entity.getId());
if(!productEntity.getProductCode().equals(entity.getProductCode())){
ProductEntity productEntity1 = this.selectOne(new ProductQuery().productCode(entity.getProductCode()));
if(!ObjectUtils.isEmpty(productEntity1))throw new AppException("当前产品编码已存在！");
}
super.updateBefore(entity, context);
}
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/product/web/ProductController.java
View file @ 91ac7bfe
...@@ -3,6 +3,8 @@ package com.mortals.xhx.module.product.web; ...@@ -3,6 +3,8 @@ package com.mortals.xhx.module.product.web;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController; import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.module.platform.model.PlatformQuery;
import com.mortals.xhx.module.platform.service.PlatformService;
import com.mortals.xhx.module.product.model.ProductEntity; import com.mortals.xhx.module.product.model.ProductEntity;
import com.mortals.xhx.module.product.service.ProductService; import com.mortals.xhx.module.product.service.ProductService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -10,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -10,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Map; import java.util.Map;
import java.util.stream.Collectors;
/** /**
* *
* 产品 * 产品
...@@ -23,6 +27,8 @@ public class ProductController extends BaseCRUDJsonBodyMappingController<Product ...@@ -23,6 +27,8 @@ public class ProductController extends BaseCRUDJsonBodyMappingController<Product
@Autowired @Autowired
private ParamService paramService; private ParamService paramService;
@Autowired
private PlatformService platformService;
public ProductController(){ public ProductController(){
super.setModuleDesc( "产品"); super.setModuleDesc( "产品");
...@@ -30,6 +36,7 @@ public class ProductController extends BaseCRUDJsonBodyMappingController<Product ...@@ -30,6 +36,7 @@ public class ProductController extends BaseCRUDJsonBodyMappingController<Product
@Override @Override
protected void init(Map<String, Object> model, Context context) { protected void init(Map<String, Object> model, Context context) {
this.addDict(model,"platformId",platformService.find(new PlatformQuery()).stream().collect(Collectors.toMap(x->x.getId().toString(),y->y.getPlatformName())));
super.init(model, context); super.init(model, context);
} }
......
device-manager/src/main/resources/bootstrap.yml
View file @ 91ac7bfe
...@@ -77,7 +77,9 @@ cookie: ...@@ -77,7 +77,9 @@ cookie:
port: 11010 port: 11010
upload: upload:
path: @profiles.filepath@ path: @profiles.filepath@
feign:
hystrix:
enabled: true
queue: queue:
type: @profiles.queue.type@ # memory or kafka (Apache Kafka) or rabbitmq (RabbitMQ) type: @profiles.queue.type@ # memory or kafka (Apache Kafka) or rabbitmq (RabbitMQ)
core: core:
......
device-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml
View file @ 91ac7bfe
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
<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="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" />
...@@ -156,6 +157,9 @@ ...@@ -156,6 +157,9 @@
<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('source') or colPickMode == 1 and data.containsKey('source')))">
a.source,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
...@@ -173,18 +177,18 @@ ...@@ -173,18 +177,18 @@
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<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,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,deviceFirmId,deviceFirmname,deviceSrc,deviceDataSourceWay,lon,lati,deviceInBuilding,deviceInFloor,defectsLiabilityPeriod,leadingOfficial,leadingOfficialTelephone,isReceiveMess,devicePhotoPath,ip,centernum,port,deviceTopic,deviceStatus,enabled,deviceAuthCode,deviceRemark,onlineTime,offlineTime,deleted,createUserId,createTime,updateUserId,updateTime) (deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,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)
VALUES VALUES
(#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{platformId},#{platformName},#{productId},#{productName},#{deviceFirmId},#{deviceFirmname},#{deviceSrc},#{deviceDataSourceWay},#{lon},#{lati},#{deviceInBuilding},#{deviceInFloor},#{defectsLiabilityPeriod},#{leadingOfficial},#{leadingOfficialTelephone},#{isReceiveMess},#{devicePhotoPath},#{ip},#{centernum},#{port},#{deviceTopic},#{deviceStatus},#{enabled},#{deviceAuthCode},#{deviceRemark},#{onlineTime},#{offlineTime},#{deleted},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{deviceName},#{deviceCode},#{deviceMac},#{siteId},#{siteCode},#{siteName},#{platformId},#{platformName},#{productId},#{productName},#{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})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device insert into mortals_xhx_device
(deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,deviceFirmId,deviceFirmname,deviceSrc,deviceDataSourceWay,lon,lati,deviceInBuilding,deviceInFloor,defectsLiabilityPeriod,leadingOfficial,leadingOfficialTelephone,isReceiveMess,devicePhotoPath,ip,centernum,port,deviceTopic,deviceStatus,enabled,deviceAuthCode,deviceRemark,onlineTime,offlineTime,deleted,createUserId,createTime,updateUserId,updateTime) (deviceName,deviceCode,deviceMac,siteId,siteCode,siteName,platformId,platformName,productId,productName,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)
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.deviceMac},#{item.siteId},#{item.siteCode},#{item.siteName},#{item.platformId},#{item.platformName},#{item.productId},#{item.productName},#{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.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.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})
</foreach> </foreach>
</insert> </insert>
...@@ -332,6 +336,12 @@ ...@@ -332,6 +336,12 @@
<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('source')) or (colPickMode==1 and !data.containsKey('source'))">
a.source=#{data.source},
</if>
<if test="(colPickMode==0 and data.containsKey('sourceIncrement')) or (colPickMode==1 and !data.containsKey('sourceIncrement'))">
a.source=ifnull(a.source,0) + #{data.sourceIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))"> <if test="(colPickMode==0 and data.containsKey('createUserId')) or (colPickMode==1 and !data.containsKey('createUserId'))">
a.createUserId=#{data.createUserId}, a.createUserId=#{data.createUserId},
</if> </if>
...@@ -660,6 +670,18 @@ ...@@ -660,6 +670,18 @@
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="source=(case" suffix="ELSE source end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('source')) or (colPickMode==1 and !item.containsKey('source'))">
when a.id=#{item.id} then #{item.source}
</when>
<when test="(colPickMode==0 and item.containsKey('sourceIncrement')) or (colPickMode==1 and !item.containsKey('sourceIncrement'))">
when a.id=#{item.id} then ifnull(a.source,0) + #{item.sourceIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
...@@ -1402,6 +1424,27 @@ ...@@ -1402,6 +1424,27 @@
${_conditionType_} a.deleted <![CDATA[ <= ]]> #{${_conditionParam_}.deletedEnd} ${_conditionType_} a.deleted <![CDATA[ <= ]]> #{${_conditionParam_}.deletedEnd}
</if> </if>
<if test="conditionParamRef.containsKey('source')">
<if test="conditionParamRef.source != null ">
${_conditionType_} a.source = #{${_conditionParam_}.source}
</if>
<if test="conditionParamRef.source == null">
${_conditionType_} a.source is null
</if>
</if>
<if test="conditionParamRef.containsKey('sourceList')">
${_conditionType_} a.source in
<foreach collection="conditionParamRef.sourceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('sourceStart') and conditionParamRef.sourceStart != null">
${_conditionType_} a.source <![CDATA[ >= ]]> #{${_conditionParam_}.sourceStart}
</if>
<if test="conditionParamRef.containsKey('sourceEnd') and conditionParamRef.sourceEnd != null">
${_conditionType_} a.source <![CDATA[ <= ]]> #{${_conditionParam_}.sourceEnd}
</if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
...@@ -1662,6 +1705,11 @@ ...@@ -1662,6 +1705,11 @@
<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('source')">
a.source
<if test='orderCol.source != null and "DESC".equalsIgnoreCase(orderCol.source)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
a.createUserId a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
......
device-manager/src/main/resources/sqlmap/module/product/ProductMapper.xml
View file @ 91ac7bfe
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"mybatis-3-mapper.dtd"> "mybatis-3-mapper.dtd">
<mapper namespace="com.mortals.xhx.module.product.dao.ibatis.ProductDaoImpl"> <mapper namespace="com.mortals.xhx.module.product.dao.ibatis.ProductDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="ProductEntity" id="ProductEntity-Map"> <resultMap type="ProductEntity" id="ProductEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="productName" column="productName" /> <id property="platformId" column="platformId" />
<result property="productCode" column="productCode" /> <result property="productName" column="productName" />
<result property="exchangeName" column="exchangeName" /> <result property="productCode" column="productCode" />
<result property="productRemark" column="productRemark" /> <result property="productRemark" column="productRemark" />
<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" />
</resultMap> </resultMap>
<!-- 表所有列 --> <!-- 表所有列 -->
<sql id="_columns"> <sql id="_columns">
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('id') or colPickMode == 1 and data.containsKey('id')))">
a.id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productName') or colPickMode == 1 and data.containsKey('productName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('platformId') or colPickMode == 1 and data.containsKey('platformId')))">
a.productName, a.platformId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productCode') or colPickMode == 1 and data.containsKey('productCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productName') or colPickMode == 1 and data.containsKey('productName')))">
a.productCode, a.productName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('exchangeName') or colPickMode == 1 and data.containsKey('exchangeName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productCode') or colPickMode == 1 and data.containsKey('productCode')))">
a.exchangeName, a.productCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productRemark') or colPickMode == 1 and data.containsKey('productRemark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('productRemark') or colPickMode == 1 and data.containsKey('productRemark')))">
a.productRemark, a.productRemark,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createUserId, a.createUserId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.createTime, a.createTime,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateUserId, a.updateUserId,
</if> </if>
<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>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="ProductEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="ProductEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_product insert into mortals_xhx_product
(productName,productCode,exchangeName,productRemark,createUserId,createTime,updateUserId,updateTime) (platformId,productName,productCode,productRemark,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{productName},#{productCode},#{exchangeName},#{productRemark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{platformId},#{productName},#{productCode},#{productRemark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_product insert into mortals_xhx_product
(productName,productCode,exchangeName,productRemark,createUserId,createTime,updateUserId,updateTime) (platformId,productName,productCode,productRemark,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.productName},#{item.productCode},#{item.exchangeName},#{item.productRemark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.platformId},#{item.productName},#{item.productCode},#{item.productRemark},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
...@@ -74,15 +74,18 @@ ...@@ -74,15 +74,18 @@
update mortals_xhx_product as a update mortals_xhx_product as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('platformId')) or (colPickMode==1 and !data.containsKey('platformId'))">
a.platformId=#{data.platformId},
</if>
<if test="(colPickMode==0 and data.containsKey('platformIdIncrement')) or (colPickMode==1 and !data.containsKey('platformIdIncrement'))">
a.platformId=ifnull(a.platformId,0) + #{data.platformIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('productName')) or (colPickMode==1 and !data.containsKey('productName'))"> <if test="(colPickMode==0 and data.containsKey('productName')) or (colPickMode==1 and !data.containsKey('productName'))">
a.productName=#{data.productName}, a.productName=#{data.productName},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('productCode')) or (colPickMode==1 and !data.containsKey('productCode'))"> <if test="(colPickMode==0 and data.containsKey('productCode')) or (colPickMode==1 and !data.containsKey('productCode'))">
a.productCode=#{data.productCode}, a.productCode=#{data.productCode},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('exchangeName')) or (colPickMode==1 and !data.containsKey('exchangeName'))">
a.exchangeName=#{data.exchangeName},
</if>
<if test="(colPickMode==0 and data.containsKey('productRemark')) or (colPickMode==1 and !data.containsKey('productRemark'))"> <if test="(colPickMode==0 and data.containsKey('productRemark')) or (colPickMode==1 and !data.containsKey('productRemark'))">
a.productRemark=#{data.productRemark}, a.productRemark=#{data.productRemark},
</if> </if>
...@@ -116,72 +119,77 @@ ...@@ -116,72 +119,77 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_product as a update mortals_xhx_product as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="productName=(case" suffix="ELSE productName end),"> <trim prefix="platformId=(case" suffix="ELSE platformId 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('productName')) or (colPickMode==1 and !item.containsKey('productName'))"> <choose>
when a.id=#{item.id} then #{item.productName} <when test="(colPickMode==0 and item.containsKey('platformId')) or (colPickMode==1 and !item.containsKey('platformId'))">
</if> when a.id=#{item.id} then #{item.platformId}
</foreach> </when>
</trim> <when test="(colPickMode==0 and item.containsKey('platformIdIncrement')) or (colPickMode==1 and !item.containsKey('platformIdIncrement'))">
<trim prefix="productCode=(case" suffix="ELSE productCode end),"> when a.id=#{item.id} then ifnull(a.platformId,0) + #{item.platformIdIncrement}
<foreach collection="data.dataList" item="item" index="index" separator="" > </when>
<if test="(colPickMode==0 and item.containsKey('productCode')) or (colPickMode==1 and !item.containsKey('productCode'))"> </choose>
when a.id=#{item.id} then #{item.productCode} </foreach>
</if> </trim>
</foreach> <trim prefix="productName=(case" suffix="ELSE productName end),">
</trim> <foreach collection="data.dataList" item="item" index="index" separator="" >
<trim prefix="exchangeName=(case" suffix="ELSE exchangeName end),"> <if test="(colPickMode==0 and item.containsKey('productName')) or (colPickMode==1 and !item.containsKey('productName'))">
<foreach collection="data.dataList" item="item" index="index" separator="" > when a.id=#{item.id} then #{item.productName}
<if test="(colPickMode==0 and item.containsKey('exchangeName')) or (colPickMode==1 and !item.containsKey('exchangeName'))"> </if>
when a.id=#{item.id} then #{item.exchangeName} </foreach>
</if> </trim>
</foreach> <trim prefix="productCode=(case" suffix="ELSE productCode end),">
</trim> <foreach collection="data.dataList" item="item" index="index" separator="" >
<trim prefix="productRemark=(case" suffix="ELSE productRemark end),"> <if test="(colPickMode==0 and item.containsKey('productCode')) or (colPickMode==1 and !item.containsKey('productCode'))">
<foreach collection="data.dataList" item="item" index="index" separator="" > when a.id=#{item.id} then #{item.productCode}
<if test="(colPickMode==0 and item.containsKey('productRemark')) or (colPickMode==1 and !item.containsKey('productRemark'))"> </if>
when a.id=#{item.id} then #{item.productRemark} </foreach>
</if> </trim>
</foreach> <trim prefix="productRemark=(case" suffix="ELSE productRemark end),">
</trim> <foreach collection="data.dataList" item="item" index="index" separator="" >
<trim prefix="createUserId=(case" suffix="ELSE createUserId end),"> <if test="(colPickMode==0 and item.containsKey('productRemark')) or (colPickMode==1 and !item.containsKey('productRemark'))">
<foreach collection="data.dataList" item="item" index="index" separator="" > when a.id=#{item.id} then #{item.productRemark}
<choose> </if>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> </foreach>
when a.id=#{item.id} then #{item.createUserId} </trim>
</when> <trim prefix="createUserId=(case" suffix="ELSE createUserId end),">
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <foreach collection="data.dataList" item="item" index="index" separator="" >
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} <choose>
</when> <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
</choose> when a.id=#{item.id} then #{item.createUserId}
</foreach> </when>
</trim> <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
<foreach collection="data.dataList" item="item" index="index" separator="" > </when>
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> </choose>
when a.id=#{item.id} then #{item.createTime} </foreach>
</if> </trim>
</foreach> <trim prefix="createTime=(case" suffix="ELSE createTime end),">
</trim> <foreach collection="data.dataList" item="item" index="index" separator="" >
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
<foreach collection="data.dataList" item="item" index="index" separator="" > when a.id=#{item.id} then #{item.createTime}
<choose> </if>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> </foreach>
when a.id=#{item.id} then #{item.updateUserId} </trim>
</when> <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> <foreach collection="data.dataList" item="item" index="index" separator="" >
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement} <choose>
</when> <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
</choose> when a.id=#{item.id} then #{item.updateUserId}
</foreach> </when>
</trim> <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
<foreach collection="data.dataList" item="item" index="index" separator="" > </when>
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> </choose>
when a.id=#{item.id} then #{item.updateTime} </foreach>
</if> </trim>
</foreach> <trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
</trim> <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime}
</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=")">
...@@ -283,217 +291,223 @@ ...@@ -283,217 +291,223 @@
${_conditionType_} a.id=#{${_conditionParam_}.id} ${_conditionType_} a.id=#{${_conditionParam_}.id}
</if> </if>
</if> </if>
<if test="conditionParamRef.containsKey('id')"> <if test="conditionParamRef.containsKey('id')">
<if test="conditionParamRef.id != null "> <if test="conditionParamRef.id != null ">
${_conditionType_} a.id = #{${_conditionParam_}.id} ${_conditionType_} a.id = #{${_conditionParam_}.id}
</if>
<if test="conditionParamRef.id == null">
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if> </if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null"> <if test="conditionParamRef.id == null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd} ${_conditionType_} a.id is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('idList')">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
<if test="conditionParamRef.containsKey('idEnd') and conditionParamRef.idEnd != null">
${_conditionType_} a.id <![CDATA[ <= ]]> #{${_conditionParam_}.idEnd}
</if>
<if test="conditionParamRef.containsKey('platformId')">
<if test="conditionParamRef.containsKey('productName')"> <if test="conditionParamRef.platformId != null ">
<if test="conditionParamRef.productName != null and conditionParamRef.productName != ''"> ${_conditionType_} a.platformId = #{${_conditionParam_}.platformId}
${_conditionType_} a.productName like #{${_conditionParam_}.productName}
</if>
<if test="conditionParamRef.productName == null">
${_conditionType_} a.productName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('productNameList')"> <if test="conditionParamRef.platformId == null">
${_conditionType_} a.productName in ${_conditionType_} a.platformId is null
<foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('platformIdList')">
${_conditionType_} a.platformId in
<foreach collection="conditionParamRef.platformIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('platformIdStart') and conditionParamRef.platformIdStart != null">
${_conditionType_} a.platformId <![CDATA[ >= ]]> #{${_conditionParam_}.platformIdStart}
</if>
<if test="conditionParamRef.containsKey('platformIdEnd') and conditionParamRef.platformIdEnd != null">
${_conditionType_} a.platformId <![CDATA[ <= ]]> #{${_conditionParam_}.platformIdEnd}
</if>
<if test="conditionParamRef.containsKey('productCode')">
<if test="conditionParamRef.productCode != null and conditionParamRef.productCode != ''"> <if test="conditionParamRef.containsKey('productName')">
${_conditionType_} a.productCode like #{${_conditionParam_}.productCode} <if test="conditionParamRef.productName != null and conditionParamRef.productName != ''">
</if> ${_conditionType_} a.productName like #{${_conditionParam_}.productName}
<if test="conditionParamRef.productCode == null">
${_conditionType_} a.productCode is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('productCodeList')"> <if test="conditionParamRef.productName == null">
${_conditionType_} a.productCode in ${_conditionType_} a.productName is null
<foreach collection="conditionParamRef.productCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('productNameList')">
${_conditionType_} a.productName in
<foreach collection="conditionParamRef.productNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('exchangeName')"> <if test="conditionParamRef.containsKey('productCode')">
<if test="conditionParamRef.exchangeName != null and conditionParamRef.exchangeName != ''"> <if test="conditionParamRef.productCode != null and conditionParamRef.productCode != ''">
${_conditionType_} a.exchangeName like #{${_conditionParam_}.exchangeName} ${_conditionType_} a.productCode like #{${_conditionParam_}.productCode}
</if>
<if test="conditionParamRef.exchangeName == null">
${_conditionType_} a.exchangeName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('exchangeNameList')"> <if test="conditionParamRef.productCode == null">
${_conditionType_} a.exchangeName in ${_conditionType_} a.productCode is null
<foreach collection="conditionParamRef.exchangeNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('productCodeList')">
${_conditionType_} a.productCode in
<foreach collection="conditionParamRef.productCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('productRemark')"> <if test="conditionParamRef.containsKey('productRemark')">
<if test="conditionParamRef.productRemark != null and conditionParamRef.productRemark != ''"> <if test="conditionParamRef.productRemark != null and conditionParamRef.productRemark != ''">
${_conditionType_} a.productRemark like #{${_conditionParam_}.productRemark} ${_conditionType_} a.productRemark like #{${_conditionParam_}.productRemark}
</if>
<if test="conditionParamRef.productRemark == null">
${_conditionType_} a.productRemark is null
</if>
</if>
<if test="conditionParamRef.containsKey('productRemarkList')">
${_conditionType_} a.productRemark in
<foreach collection="conditionParamRef.productRemarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserId')"> <if test="conditionParamRef.productRemark == null">
<if test="conditionParamRef.createUserId != null "> ${_conditionType_} a.productRemark is null
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if>
<if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdList')"> </if>
${_conditionType_} a.createUserId in <if test="conditionParamRef.containsKey('productRemarkList')">
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=","> ${_conditionType_} a.productRemark in
#{item} <foreach collection="conditionParamRef.productRemarkList" open="(" close=")" index="index" item="item" separator=",">
</foreach> #{item}
</if> </foreach>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> </if>
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} <if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != null ">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null"> <if test="conditionParamRef.createUserId == null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd} ${_conditionType_} a.createUserId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('createUserIdList')">
${_conditionType_} a.createUserId in
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null">
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart}
</if>
<if test="conditionParamRef.containsKey('createUserIdEnd') and conditionParamRef.createUserIdEnd != null">
${_conditionType_} a.createUserId <![CDATA[ <= ]]> #{${_conditionParam_}.createUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('createTime')"> <if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null "> <if test="conditionParamRef.createTime != null ">
${_conditionType_} a.createTime = #{${_conditionParam_}.createTime} ${_conditionType_} a.createTime = #{${_conditionParam_}.createTime}
</if>
<if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.createTime is null
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if>
<if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null"> </if>
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart} <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</if> </if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null"> <if test="conditionParamRef.updateUserId == null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd} ${_conditionType_} a.updateUserId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
<if test="conditionParamRef.containsKey('updateUserIdEnd') and conditionParamRef.updateUserIdEnd != null">
${_conditionType_} a.updateUserId <![CDATA[ <= ]]> #{${_conditionParam_}.updateUserIdEnd}
</if>
<if test="conditionParamRef.containsKey('updateTime')"> <if test="conditionParamRef.containsKey('updateTime')">
<if test="conditionParamRef.updateTime != null "> <if test="conditionParamRef.updateTime != null ">
${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime} ${_conditionType_} a.updateTime = #{${_conditionParam_}.updateTime}
</if>
<if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.containsKey('updateTimeEnd') and conditionParamRef.updateTimeEnd != null and conditionParamRef.updateTimeEnd!=''"> <if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<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')
</if>
</sql> </sql>
<sql id="_orderCols_"> <sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()"> <if test="orderColList != null and !orderColList.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<foreach collection="orderColList" open="" close="" index="index" item="item" separator=","> <foreach collection="orderColList" open="" close="" index="index" item="item" separator=",">
${item.colName} ${item.sortKind} ${item.colName} ${item.sortKind}
</foreach> </foreach>
</trim> </trim>
</if> </if>
<if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()"> <if test="(orderColList == null or orderColList.isEmpty()) and orderCol != null and !orderCol.isEmpty()">
order by order by
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="orderCol.containsKey('id')"> <if test="orderCol.containsKey('id')">
a.id a.id
<if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if> <if test='orderCol.id != null and "DESC".equalsIgnoreCase(orderCol.id)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('productName')"> <if test="orderCol.containsKey('platformId')">
a.productName a.platformId
<if test='orderCol.productName != null and "DESC".equalsIgnoreCase(orderCol.productName)'>DESC</if> <if test='orderCol.platformId != null and "DESC".equalsIgnoreCase(orderCol.platformId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('productCode')"> <if test="orderCol.containsKey('productName')">
a.productCode a.productName
<if test='orderCol.productCode != null and "DESC".equalsIgnoreCase(orderCol.productCode)'>DESC</if> <if test='orderCol.productName != null and "DESC".equalsIgnoreCase(orderCol.productName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('exchangeName')"> <if test="orderCol.containsKey('productCode')">
a.exchangeName a.productCode
<if test='orderCol.exchangeName != null and "DESC".equalsIgnoreCase(orderCol.exchangeName)'>DESC</if> <if test='orderCol.productCode != null and "DESC".equalsIgnoreCase(orderCol.productCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('productRemark')"> <if test="orderCol.containsKey('productRemark')">
a.productRemark a.productRemark
<if test='orderCol.productRemark != null and "DESC".equalsIgnoreCase(orderCol.productRemark)'>DESC</if> <if test='orderCol.productRemark != null and "DESC".equalsIgnoreCase(orderCol.productRemark)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('createUserId')">
a.createUserId a.createUserId
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createTime')">
a.createTime a.createTime
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateUserId')"> <if test="orderCol.containsKey('updateUserId')">
a.updateUserId a.updateUserId
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('updateTime')">
a.updateTime a.updateTime
<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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
device-manager/src/test/java/com/mortals/httpclient/device/DeviceController.http
View file @ 91ac7bfe
...@@ -136,7 +136,7 @@ Content-Type: application/json ...@@ -136,7 +136,7 @@ Content-Type: application/json
Authorization: {{authToken}} Authorization: {{authToken}}
{ {
"deviceCode": "c12345678", "deviceCode": "a101",
"action": "upload" "action": "upload"
} }
......
doc/api.md
View file @ 91ac7bfe
...@@ -315,9 +315,8 @@ data|object|数据对象|- ...@@ -315,9 +315,8 @@ data|object|数据对象|-
deviceName|String|否|设备名称 deviceName|String|否|设备名称
deviceCode|String|是|设备编码,默认为MAC地址 deviceCode|String|是|设备编码,默认为MAC地址
siteId|Long|是|站点Id siteId|Long|是|站点Id
siteCode|String|是|站点编号 siteCode|String|否|站点编号
siteName|String|是|站点名称 siteName|String|否|站点名称
platformId|Long|是|平台系统Id
productId|Long|是|产品Id productId|Long|是|产品Id
deviceFirmId|Long|否|设备生产厂商ID deviceFirmId|Long|否|设备生产厂商ID
deviceFirmname|String|否|设备生产厂商名称 deviceFirmname|String|否|设备生产厂商名称
...@@ -328,6 +327,7 @@ deviceInFloor|Integer|否|所属楼层 ...@@ -328,6 +327,7 @@ deviceInFloor|Integer|否|所属楼层
defectsLiabilityPeriod|Date|否|保修期，如2020-08-12 15:00:00 defectsLiabilityPeriod|Date|否|保修期，如2020-08-12 15:00:00
leadingOfficial|String|否|负责人 leadingOfficial|String|否|负责人
leadingOfficialTelephone|String|否|联系电话 leadingOfficialTelephone|String|否|联系电话
source|Integer|否|设备来源,默认1(0.旧设备，1.新设备)
**请求样例:** **请求样例:**
``` ```
...@@ -337,7 +337,6 @@ leadingOfficialTelephone|String|否|联系电话 ...@@ -337,7 +337,6 @@ leadingOfficialTelephone|String|否|联系电话
"siteId":1, "siteId":1,
"siteCode":"510105521000-0001", "siteCode":"510105521000-0001",
"siteName":"测试站点1", "siteName":"测试站点1",
"platformId":1,
"productId":1, "productId":1,
"deviceFirmId":1, "deviceFirmId":1,
"lon":"12", "lon":"12",
...@@ -346,7 +345,8 @@ leadingOfficialTelephone|String|否|联系电话 ...@@ -346,7 +345,8 @@ leadingOfficialTelephone|String|否|联系电话
"deviceInFloor":22, "deviceInFloor":22,
"defectsLiabilityPeriod":"2022-06-30", "defectsLiabilityPeriod":"2022-06-30",
"leadingOfficial":"张三", "leadingOfficial":"张三",
"leadingOfficialTelephone":"13281114856" "leadingOfficialTelephone":"13281114856",,
"source":1
} }
``` ```
...@@ -354,7 +354,7 @@ leadingOfficialTelephone|String|否|联系电话 ...@@ -354,7 +354,7 @@ leadingOfficialTelephone|String|否|联系电话
参数名称 |参数类型|备注|其它 参数名称 |参数类型|备注|其它
---|---|---|--- ---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|- code|Integer|结果码|见附录码表
msg|String|消息|- msg|String|消息|-
data|object|数据对象|- data|object|数据对象|-
&emsp;content|String|加密后的内容|AES加密 &emsp;content|String|加密后的内容|AES加密
...@@ -416,7 +416,7 @@ password|String|平台用户密码|是|- ...@@ -416,7 +416,7 @@ password|String|平台用户密码|是|-
参数名称 |参数类型|备注|其它 参数名称 |参数类型|备注|其它
---|---|---|--- ---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|- code|Integer|结果码|见附录码表
msg|String|消息|- msg|String|消息|-
data|object|数据对象|- data|object|数据对象|-
...@@ -464,7 +464,7 @@ deviceRemark|String|备注|是|- ...@@ -464,7 +464,7 @@ deviceRemark|String|备注|是|-
参数名称 |参数类型|备注|其它 参数名称 |参数类型|备注|其它
---|---|---|--- ---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|- code|Integer|结果码|见附录码表
msg|String|消息|- msg|String|消息|-
data|object|数据对象|- data|object|数据对象|-
...@@ -490,7 +490,7 @@ data|object|数据对象|- ...@@ -490,7 +490,7 @@ data|object|数据对象|-
:------|:---|:---|:---|:--- :------|:---|:---|:---|:---
deviceCode|String|设备编码，如MAC地址|是|- deviceCode|String|设备编码，如MAC地址|是|-
messageType|String|消息类型|是|如heart_beat messageType|String|消息类型|是|如heart_beat
timestamp|Long|产品编码|是|见产品编码附录 timestamp|Long|时间戳|是|-
data|String|数据体，内容自行定义|否|- data|String|数据体，内容自行定义|否|-
...@@ -516,7 +516,7 @@ data|String|数据体，内容自行定义|否|- ...@@ -516,7 +516,7 @@ data|String|数据体，内容自行定义|否|-
参数名称 |参数类型|备注|其它 参数名称 |参数类型|备注|其它
---|---|---|--- ---|---|---|---
code|Integer|结果码（-1.失败，1.接收成功）|- code|Integer|结果码|见附录码表
msg|String|消息|- msg|String|消息|-
**响应消息样例:** **响应消息样例:**
...@@ -545,7 +545,6 @@ data|object|数据对象|是|- ...@@ -545,7 +545,6 @@ data|object|数据对象|是|-
&emsp;deviceStatus|Integer||是|状态，1：新增，2：修改，3：删除，4：激活，5：启用，6：停用，7：上线，8：下线 &emsp;deviceStatus|Integer||是|状态，1：新增，2：修改，3：删除，4：激活，5：启用，6：停用，7：上线，8：下线
&emsp;deviceName|String|设备名称|否|- &emsp;deviceName|String|设备名称|否|-
&emsp;deviceCode|String|设备编码，如MAC地址|是|- &emsp;deviceCode|String|设备编码，如MAC地址|是|-
&emsp;platformCode|String|平台系统编码|是|见附录
&emsp;productCode|String|产品编码|是|见附录 &emsp;productCode|String|产品编码|是|见附录
&emsp;ip|String|设备访问ip|否|- &emsp;ip|String|设备访问ip|否|-
&emsp;port|String|设备端口|否|- &emsp;port|String|设备端口|否|-
...@@ -563,7 +562,7 @@ data|object|数据对象|是|- ...@@ -563,7 +562,7 @@ data|object|数据对象|是|-
参数名称 |参数类型|备注|其它 参数名称 |参数类型|备注|其它
---|---|---|--- ---|---|---|---
code|Integer|结果码（-1.失败，1.成功）|- code|Integer|结果码|见附录码表
msg|String|消息|- msg|String|消息|-
data|object|数据对象|- data|object|数据对象|-
...@@ -657,4 +656,26 @@ key|String|消息唯一标识|是|- ...@@ -657,4 +656,26 @@ key|String|消息唯一标识|是|-
} }
``` ```
## 码表
### 响应结果码表
结果码|结果|其它
---|---|---
1|成功|-
1001|当前设备编码不存在|-
1002|当前设备编码已存在|-
1003|所属产品编码不存在|-
1004|当前设备未激活，请在后台配置后再激活|-
1005|所属平台不存在！请在后台添加后再激活|-
1006|当前设备所属产品平台未配置，请在后台配置后再激活|-
1007|站点ID为空|-
-1|系统内部异常|-
## 附录
### 业务上行下行消息类型
编码|说明|其它
---|---|---
HEART_BEAT|设备心跳消息|设备上行发送
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