Skip to content

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

设备token验证添加

parent f84acfe5
Hide whitespace changes
Inline Side-by-side
Showing with 3006 additions and 2255 deletions
common-lib/pom.xml
View file @ 53a350d8
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<parent> <parent>
<groupId>com.mortals.xhx</groupId> <groupId>com.mortals.xhx</groupId>
<artifactId>device-platform</artifactId> <artifactId>device-new-platform</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
</parent> </parent>
......
db/base.sql
View file @ 53a350d8
...@@ -77,54 +77,6 @@ INSERT INTO `mortals_xhx_menu` VALUES (9106, '任务信息', '/task/list', 91, 6 ...@@ -77,54 +77,6 @@ INSERT INTO `mortals_xhx_menu` VALUES (9106, '任务信息', '/task/list', 91, 6
INSERT INTO `mortals_xhx_menu` VALUES (9107, '操作日志', '/oper/log/list', 91, 70, 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, 3, NULL, NULL, NULL); INSERT INTO `mortals_xhx_menu` VALUES (9107, '操作日志', '/oper/log/list', 91, 70, 1, 0, 0, NULL, NULL, NULL, NULL, 0, 0, 3, NULL, NULL, NULL);
INSERT INTO `mortals_xhx_menu` VALUES (9133, '站点管理', '/site/list', 91, NULL, 1, 0, 1, NULL, 'view', NULL, NULL, 0, 0, 3, '2021-11-03 21:51:48', 1, '系统管理员'); INSERT INTO `mortals_xhx_menu` VALUES (9133, '站点管理', '/site/list', 91, NULL, 1, 0, 1, NULL, 'view', NULL, NULL, 0, 0, 3, '2021-11-03 21:51:48', 1, '系统管理员');
-- ----------------------------
-- Table structure for mortals_xhx_one_site
-- ----------------------------
DROP TABLE IF EXISTS `mortals_xhx_one_site`;
CREATE TABLE `mortals_xhx_one_site` (
`id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键，自增长',
`site_name` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点名称',
`is_site` tinyint(2) NULL DEFAULT NULL COMMENT '是否是站点 1是 0是展示数据',
`iid` bigint(20) NULL DEFAULT NULL COMMENT '标识ID',
`p_id` bigint(20) NULL DEFAULT NULL COMMENT '父级id',
`region_code` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区域编号',
`site_code` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点编号',
`pro_code` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '省编码',
`area_code` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '区编码',
`city_code` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '市编码',
`site_ip` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点服务器ip',
`site_port` varchar(8) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点服务器端口',
`site_one_code_mac` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '站点一码通mac地址',
`longitude` decimal(10, 6) NULL DEFAULT NULL COMMENT '经度',
`latitude` decimal(10, 6) NULL DEFAULT NULL COMMENT '纬度',
`haveSonArea` char(5) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '是否有下级',
`site_tel` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '中心联系电话',
`detail_address` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '中心详细地址',
`site_remark` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '中心介绍',
`am_work_start_time` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '上午上班开始时间',
`am_work_end_time` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '上午上班结束时间',
`pm_work_start_time` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '下午上班开始时间',
`pm_work_end_time` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '下午上班结束时间',
`average_time` bigint(20) NULL DEFAULT NULL COMMENT '平均等待时间,后期删除,单位毫秒',
`waiting_number` int(5) NULL DEFAULT NULL COMMENT '等待人数,后期删除',
`workday1` tinyint(1) NULL DEFAULT NULL COMMENT '周一 1上班 0不上',
`workday2` tinyint(1) NULL DEFAULT NULL COMMENT '周二 1上班 0不上',
`workday3` tinyint(1) NULL DEFAULT NULL COMMENT '周三 1上班 0不上',
`workday4` tinyint(1) NULL DEFAULT NULL COMMENT '周四 1上班 0不上',
`workday5` tinyint(1) NULL DEFAULT NULL COMMENT '周五 1上班 0不上',
`workday6` tinyint(1) NULL DEFAULT NULL COMMENT '周六 1上班 0不上',
`workday7` tinyint(1) NULL DEFAULT NULL COMMENT '周日 1上班 0不上',
`lv` tinyint(4) NULL DEFAULT NULL COMMENT '楼层',
`building` tinyint(4) NULL DEFAULT NULL COMMENT '楼栋',
`deleted` tinyint(1) NULL DEFAULT 0 COMMENT '删除状态 0未删除 1已删除',
`createUserId` bigint(20) NULL DEFAULT NULL COMMENT '创建人id',
`createUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '创建人名称',
`createTime` datetime(0) NULL DEFAULT NULL COMMENT '创建时间',
`updateUserId` bigint(20) NULL DEFAULT NULL COMMENT '修改人',
`updateUserName` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '修改人名称',
`updateTime` datetime(0) NULL DEFAULT NULL COMMENT '更新时间',
PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '站点表' ROW_FORMAT = Dynamic;
-- ---------------------------- -- ----------------------------
-- Table structure for mortals_xhx_oper_log -- Table structure for mortals_xhx_oper_log
...@@ -277,14 +229,6 @@ CREATE TABLE `mortals_xhx_site` ( ...@@ -277,14 +229,6 @@ CREATE TABLE `mortals_xhx_site` (
PRIMARY KEY (`id`) USING BTREE PRIMARY KEY (`id`) USING BTREE
) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '站点信息表' ROW_FORMAT = Dynamic; ) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '站点信息表' ROW_FORMAT = Dynamic;
-- ----------------------------
-- Records of mortals_xhx_site
-- ----------------------------
INSERT INTO `mortals_xhx_site` VALUES (5, '测试站点1', 0, '', '12313', '13281114856', '123123', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '12313', '213132123', 0, 1, '2021-09-27 13:53:53', 'admin', '2021-09-27 11:34:20', 'admin');
INSERT INTO `mortals_xhx_site` VALUES (6, '测试站点1-1', 10, ',10', '啊啊啊', '13908095770', 'asd', NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'adadf', 'dsaasdf', 0, 1, '2021-09-27 12:04:31', 'admin', '2021-09-27 11:35:11', 'admin');
INSERT INTO `mortals_xhx_site` VALUES (7, '测试站点1-2', 5, ',5', '达到', '13808095771', '111', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '对对对', '222', 0, 1, '2021-09-27 12:04:31', 'admin', '2021-09-27 11:36:19', 'admin');
INSERT INTO `mortals_xhx_site` VALUES (10, '测试站点2', 0, '', '2222', '13808095774', '22', NULL, NULL, NULL, NULL, NULL, NULL, NULL, '111', '333', 0, 1, '2021-09-27 12:04:31', 'admin', '2021-09-27 12:03:50', 'admin');
-- ---------------------------- -- ----------------------------
-- Table structure for mortals_xhx_table_index -- Table structure for mortals_xhx_table_index
-- ---------------------------- -- ----------------------------
......
db/module.sql
View file @ 53a350d8
-- ---------------------------- -- ----------------------------
-- 设备表 -- 设备表
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_stp_device`; DROP TABLE IF EXISTS `mortals_xhx_device`;
CREATE TABLE mortals_stp_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) NOT NULL COMMENT '设备名称',
`deviceCode` varchar(256) COMMENT '设备编码', `deviceCode` varchar(256) COMMENT '设备编码',
...@@ -16,6 +16,7 @@ CREATE TABLE mortals_stp_device( ...@@ -16,6 +16,7 @@ CREATE TABLE mortals_stp_device(
`deviceFirmname` varchar(20) COMMENT '设备生产厂商名称', `deviceFirmname` varchar(20) COMMENT '设备生产厂商名称',
`deviceOnlineStatus` tinyint(2) NOT NULL COMMENT '在线状态 (0.离线，1.在线)', `deviceOnlineStatus` tinyint(2) NOT NULL COMMENT '在线状态 (0.离线，1.在线)',
`status` tinyint(2) NOT NULL COMMENT '启用状态 (0.停止，1.启用)', `status` tinyint(2) NOT NULL COMMENT '启用状态 (0.停止，1.启用)',
`active` tinyint(2) NOT NULL COMMENT '激活状态 (0.未激活，1.已激活)',
`deviceRemark` varchar(256) COMMENT '备注', `deviceRemark` varchar(256) COMMENT '备注',
`onlineTime` datetime COMMENT '最近上线时间', `onlineTime` datetime COMMENT '最近上线时间',
`offlineTime` datetime COMMENT '最近离线时间', `offlineTime` datetime COMMENT '最近离线时间',
...@@ -25,11 +26,12 @@ CREATE TABLE mortals_stp_device( ...@@ -25,11 +26,12 @@ CREATE TABLE mortals_stp_device(
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备';
-- ---------------------------- -- ----------------------------
-- 设备生产厂商表 -- 设备生产厂商表
-- ---------------------------- -- ----------------------------
DROP TABLE IF EXISTS `mortals_stp_firm`; DROP TABLE IF EXISTS `mortals_xhx_firm`;
CREATE TABLE mortals_stp_firm( CREATE TABLE mortals_xhx_firm(
`id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长', `id` bigint(20) AUTO_INCREMENT COMMENT '主键ID，主键，自增长',
`firmName` varchar(128) NOT NULL COMMENT '设备生产厂商名称', `firmName` varchar(128) NOT NULL COMMENT '设备生产厂商名称',
`firmCode` varchar(128) COMMENT '设备生产商编码', `firmCode` varchar(128) COMMENT '设备生产商编码',
...@@ -40,6 +42,8 @@ CREATE TABLE mortals_stp_firm( ...@@ -40,6 +42,8 @@ CREATE TABLE mortals_stp_firm(
`updateTime` datetime COMMENT '更新时间', `updateTime` datetime COMMENT '更新时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备生产厂商'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备生产厂商';
-- ---------------------------- -- ----------------------------
-- 设备日志表 -- 设备日志表
-- ---------------------------- -- ----------------------------
...@@ -56,6 +60,7 @@ PRIMARY KEY (`id`) ...@@ -56,6 +60,7 @@ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备日志'; ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='设备日志';
-- ---------------------------- -- ----------------------------
-- 设备菜单 SQL -- 设备菜单 SQL
-- ---------------------------- -- ----------------------------
...@@ -66,27 +71,6 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '设备', '/device/list', 0, 1, 1, ...@@ -66,27 +71,6 @@ INSERT INTO `mortals_xhx_menu` VALUES (null, '设备', '/device/list', 0, 1, 1,
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '设备-菜单管理-查看', '/device/list,/device/view,/device/info,/device/export,/device/exportExcel,/device/downloadTemplate,/device/download', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '设备-菜单管理-查看', '/device/list,/device/view,/device/info,/device/export,/device/exportExcel,/device/downloadTemplate,/device/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '设备-菜单管理-维护', '/device/add,/device/edit,/device/delete,/device/logicDelete,/device/save,/device/importData', 3, 0, NULL, NULL, NULL, 0); INSERT INTO `mortals_xhx_resource` VALUES (null, '设备-菜单管理-维护', '/device/add,/device/edit,/device/delete,/device/logicDelete,/device/save,/device/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 设备生产厂商菜单 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_menu` VALUES (null, '设备生产厂商', '/firm/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
-- ----------------------------
-- 设备生产厂商资源路径 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '设备生产厂商-菜单管理-查看', '/firm/list,/firm/view,/firm/info,/firm/export,/firm/exportExcel,/firm/downloadTemplate,/firm/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '设备生产厂商-菜单管理-维护', '/firm/add,/firm/edit,/firm/delete,/firm/logicDelete,/firm/save,/firm/importData', 3, 0, NULL, NULL, NULL, 0);
-- ----------------------------
-- 设备日志菜单 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_menu` VALUES (null, '设备日志', '/device/log/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
-- ----------------------------
-- 设备日志资源路径 SQL
-- ----------------------------
INSERT INTO `mortals_xhx_resource` VALUES (null, '设备日志-菜单管理-查看', '/device/log/list,/device/log/view,/device/log/info,/device/log/export,/device/log/exportExcel,/device/log/downloadTemplate,/device/log/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_resource` VALUES (null, '设备日志-菜单管理-维护', '/device/log/add,/device/log/edit,/device/log/delete,/device/log/logicDelete,/device/log/save,/device/log/importData', 3, 0, NULL, NULL, NULL, 0);
-- ---------------------------- -- ----------------------------
-- 设备参数 SQL -- 设备参数 SQL
...@@ -107,16 +91,23 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '在线状态 ', 'Device', 'device ...@@ -107,16 +91,23 @@ INSERT INTO `mortals_xhx_param` VALUES (null, '在线状态 ', 'Device', 'device
INSERT INTO `mortals_xhx_param` VALUES (null, '在线状态 ', 'Device', 'deviceOnlineStatus', '1', '在线', 1, 4, 0, 'deviceOnlineStatus', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '在线状态 ', 'Device', 'deviceOnlineStatus', '1', '在线', 1, 4, 0, 'deviceOnlineStatus', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '启用状态 ', 'Device', 'status', '0', '停止', 1, 4, 0, 'status', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '启用状态 ', 'Device', 'status', '0', '停止', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '启用状态 ', 'Device', 'status', '1', '启用', 1, 4, 0, 'status', NULL, NULL, NULL); INSERT INTO `mortals_xhx_param` VALUES (null, '启用状态 ', 'Device', 'status', '1', '启用', 1, 4, 0, 'status', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '激活状态 ', 'Device', 'active', '0', '未激活', 1, 4, 0, 'active', NULL, NULL, NULL);
INSERT INTO `mortals_xhx_param` VALUES (null, '激活状态 ', 'Device', 'active', '1', '已激活', 1, 4, 0, 'active', NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 设备生产厂商参数 SQL -- 设备生产厂商菜单 SQL
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_menu` VALUES (null, '设备生产厂商', '/firm/list', 0, 1, 1, 0, 0,'',NULL, NULL, NULL, 0, 0, 1, NULL, NULL, NULL);
-- ---------------------------- -- ----------------------------
-- 设备日志参数 SQL -- 设备生产厂商资源路径 SQL
-- ---------------------------- -- ----------------------------
INSERT INTO `mortals_xhx_param` VALUES (null, '日志类型，', 'DeviceLog', 'logType', '0', '上报事件', 1, 4, 0, 'logType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_resource` VALUES (null, '设备生产厂商-菜单管理-查看', '/firm/list,/firm/view,/firm/info,/firm/export,/firm/exportExcel,/firm/downloadTemplate,/firm/download', 3, 0, NULL, NULL, NULL, 0);
INSERT INTO `mortals_xhx_param` VALUES (null, '日志类型，', 'DeviceLog', 'logType', '1', '下发服务', 1, 4, 0, 'logType', NULL, NULL, NULL); INSERT INTO `mortals_xhx_resource` VALUES (null, '设备生产厂商-菜单管理-维护', '/firm/add,/firm/edit,/firm/delete,/firm/logicDelete,/firm/save,/firm/importData', 3, 0, NULL, NULL, NULL, 0);
device-manager/pom.xml
View file @ 53a350d8
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<parent> <parent>
<groupId>com.mortals.xhx</groupId> <groupId>com.mortals.xhx</groupId>
<artifactId>device-platform</artifactId> <artifactId>device-new-platform</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
</parent> </parent>
...@@ -55,6 +55,14 @@ ...@@ -55,6 +55,14 @@
<artifactId>spring-data-redis</artifactId> <artifactId>spring-data-redis</artifactId>
</dependency> </dependency>
<!--Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>0.9.1</version>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>
......
device-manager/src/main/java/com/mortals/xhx/base/DeviceAuth.java 0 → 100644
View file @ 53a350d8
package com.mortals.xhx.base;
import java.lang.annotation.*;
/**
* 设备验证
*
* @author zxfei
*
*/
@Inherited
@Target(ElementType.METHOD)
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface DeviceAuth {
}
device-manager/src/main/java/com/mortals/xhx/busiz/req/DeviceReq.java
View file @ 53a350d8
...@@ -10,10 +10,14 @@ import java.io.Serializable; ...@@ -10,10 +10,14 @@ import java.io.Serializable;
@Data @Data
public class DeviceReq implements Serializable { public class DeviceReq implements Serializable {
/**
* 行为
*/
private String action; private String action;
/**
private String devicenum; * 设备编码(暂定mac地址)
*/
private String deviceNum;
private String ip; private String ip;
......
device-manager/src/main/java/com/mortals/xhx/busiz/rsp/DeviceResp.java 0 → 100644
View file @ 53a350d8
package com.mortals.xhx.busiz.rsp;
import lombok.Data;
import java.io.Serializable;
@Data
public class DeviceResp implements Serializable {
/**
* token
*/
private String token;
}
device-manager/src/main/java/com/mortals/xhx/busiz/security/DeviceTokenService.java 0 → 100644
View file @ 53a350d8
package com.mortals.xhx.busiz.security;
import cn.hutool.core.util.IdUtil;
import com.mortals.framework.service.ICacheService;
import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.module.device.model.DeviceEntity;
import io.jsonwebtoken.Claims;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
import io.jsonwebtoken.Jwts;
import io.jsonwebtoken.SignatureAlgorithm;
/**
* token验证处理
*
* @author zxfei
*/
@Component
public class DeviceTokenService {
// 令牌自定义标识
@Value("${token.header}")
private String header;
// 令牌秘钥
@Value("${token.secret}")
private String secret;
// 令牌有效期（默认30分钟）
@Value("${token.expireTime}")
private int expireTime;
protected static final long MILLIS_SECOND = 1000;
protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L;
@Autowired
private ICacheService cacheService;
/**
* 获取设备信息
*
* @return 设备信息
*/
public DeviceEntity getLoginDevice(HttpServletRequest request) {
// 获取请求携带的令牌
String token = getToken(request);
if (StringUtils.isNotEmpty(token)) {
Claims claims = parseToken(token);
String uuid = (String) claims.get(Constant.LOGIN_DEVICE_KEY);
String deviceKey = getTokenKey(uuid);
DeviceEntity device = cacheService.get(deviceKey, DeviceEntity.class);
return device;
}
return null;
}
/**
* 设置设备信息
*/
public void setDevice(DeviceEntity device) {
if (StringUtils.isNotNull(device) && StringUtils.isNotEmpty(device.getToken())) {
refreshToken(device);
}
}
/**
* 删除用户身份信息
*/
public void delDevice(String token) {
if (StringUtils.isNotEmpty(token)) {
String deviceKey = getTokenKey(token);
cacheService.del(deviceKey);
}
}
/**
* 创建令牌
*
* @param device 设备信息
* @return 令牌
*/
public String createToken(DeviceEntity device) {
String token = IdUtil.fastUUID();
device.setToken(token);
refreshToken(device);
Map<String, Object> claims = new HashMap<>();
claims.put(Constant.LOGIN_DEVICE_KEY, token);
return createToken(claims);
}
/**
* 验证令牌有效期，相差不足20分钟，自动刷新缓存
*
* @param device
* @return 令牌
*/
public void verifyToken(DeviceEntity device) {
long expireTime = device.getExpireTime();
long currentTime = System.currentTimeMillis();
if (expireTime - currentTime <= MILLIS_MINUTE_TEN) {
refreshToken(device);
}
}
/**
* 刷新令牌有效期
*
* @param device 信息
*/
public void refreshToken(DeviceEntity device) {
device.setLoginTime(System.currentTimeMillis());
device.setExpireTime(device.getLoginTime() + expireTime * MILLIS_MINUTE);
// 根据uuid将device缓存
String deviceKey = getTokenKey(device.getToken());
//设置有效时间 单位秒
cacheService.setnx(deviceKey, device, expireTime * MILLIS_MINUTE * MILLIS_SECOND);
}
/**
* 从数据声明生成令牌
*
* @param claims 数据声明
* @return 令牌
*/
private String createToken(Map<String, Object> claims) {
String token = Jwts.builder()
.setClaims(claims)
.signWith(SignatureAlgorithm.HS512, secret).compact();
return token;
}
/**
* 从令牌中获取数据声明
*
* @param token 令牌
* @return 数据声明
*/
private Claims parseToken(String token) {
return Jwts.parser()
.setSigningKey(secret)
.parseClaimsJws(token)
.getBody();
}
/**
* 从令牌中获取设备编号
*
* @param token 令牌
* @return 用户名
*/
public String getDeviceNumFromToken(String token) {
Claims claims = parseToken(token);
return claims.getSubject();
}
/**
* 获取请求token
*
* @param request
* @return token
*/
private String getToken(HttpServletRequest request) {
String token = request.getHeader(header);
if (StringUtils.isNotEmpty(token) && token.startsWith(Constant.TOKEN_PREFIX)) {
token = token.replace(Constant.TOKEN_PREFIX, "");
}
return token;
}
private String getTokenKey(String uuid) {
return Constant.LOGIN_TOKEN_KEY + uuid;
}
}
device-manager/src/main/java/com/mortals/xhx/busiz/security/SecurityUtils.java 0 → 100644
View file @ 53a350d8
package com.mortals.xhx.busiz.security;
import com.mortals.framework.common.HttpStatus;
import com.mortals.framework.exception.AppException;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
/**
* 安全服务工具类
*
* @author zxfei
*/
public class SecurityUtils {
/**
* 获取Authentication
*/
public static Authentication getAuthentication() {
return SecurityContextHolder.getContext().getAuthentication();
}
/**
* 生成BCryptPasswordEncoder密码
*
* @param password 密码
* @return 加密字符串
*/
public static String encryptPassword(String password) {
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
return passwordEncoder.encode(password);
}
/**
* 判断密码是否相同
*
* @param rawPassword 真实密码
* @param encodedPassword 加密后字符
* @return 结果
*/
public static boolean matchesPassword(String rawPassword, String encodedPassword) {
BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
return passwordEncoder.matches(rawPassword, encodedPassword);
}
/**
* 是否为管理员
*
* @param userId 用户ID
* @return 结果
*/
public static boolean isAdmin(Long userId) {
return userId != null && 1L == userId;
}
}
device-manager/src/main/java/com/mortals/xhx/busiz/security/filter/DeviceSubmitInterceptor.java 0 → 100644
View file @ 53a350d8
package com.mortals.xhx.busiz.security.filter;
import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.util.StringUtils;
import com.mortals.framework.web.interceptor.BaseInterceptor;
import com.mortals.xhx.base.DeviceAuth;
import com.mortals.xhx.busiz.security.SecurityUtils;
import com.mortals.xhx.busiz.security.DeviceTokenService;
import com.mortals.xhx.common.code.ApiRespCodeEnum;
import com.mortals.xhx.module.device.model.DeviceEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.lang.reflect.Method;
/**
* 设备上报验证
*
* @author: zxfei
* @date: 2022/4/11 15:50
*/
@Component
public class DeviceSubmitInterceptor extends BaseInterceptor {
@Autowired
private DeviceTokenService deviceTokenService;
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
if (handler instanceof HandlerMethod) {
HandlerMethod handlerMethod = (HandlerMethod) handler;
Method method = handlerMethod.getMethod();
DeviceAuth annotation = method.getAnnotation(DeviceAuth.class);
if (annotation != null) {
//校验
if (this.verifyDevice(request)) {
JSONObject ret = new JSONObject();
ret.put("code", ApiRespCodeEnum.TOKEN_FAILED.getValue());
ret.put("msg", ApiRespCodeEnum.TOKEN_FAILED.getLabel());
super.writeJsonResponse(response, 200, JSONObject.toJSONString(ret));
return false;
}
}
return true;
} else {
return super.preHandle(request, response, handler);
}
}
public boolean verifyDevice(HttpServletRequest request) {
DeviceEntity device = deviceTokenService.getLoginDevice(request);
if (StringUtils.isNotNull(device) && StringUtils.isNull(SecurityUtils.getAuthentication())) {
deviceTokenService.verifyToken(device);
return true;
}
return false;
}
}
device-manager/src/main/java/com/mortals/xhx/busiz/security/filter/JwtAuthenticationTokenFilter.java 0 → 100644
View file @ 53a350d8
package com.mortals.xhx.busiz.security.filter;
import com.mortals.framework.util.StringUtils;
import com.mortals.xhx.busiz.security.SecurityUtils;
import com.mortals.xhx.busiz.security.DeviceTokenService;
import com.mortals.xhx.module.device.model.DeviceEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.filter.OncePerRequestFilter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
* token过滤器 验证token有效性
*
* @author ruoyi
*/
//@Component
public class JwtAuthenticationTokenFilter extends OncePerRequestFilter {
@Autowired
private DeviceTokenService deviceTokenService;
@Override
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain)
throws ServletException, IOException {
DeviceEntity device = deviceTokenService.getLoginDevice(request);
if (StringUtils.isNotNull(device) && StringUtils.isNull(SecurityUtils.getAuthentication())) {
deviceTokenService.verifyToken(device);
// UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginUser, null, loginUser.getAuthorities());
// authenticationToken.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
// SecurityContextHolder.getContext().setAuthentication(authenticationToken);
}
chain.doFilter(request, response);
}
}
device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceApiController.java
View file @ 53a350d8
...@@ -2,21 +2,22 @@ package com.mortals.xhx.busiz.web; ...@@ -2,21 +2,22 @@ package com.mortals.xhx.busiz.web;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.mortals.framework.exception.AppException; import com.mortals.xhx.base.DeviceAuth;
import com.mortals.xhx.base.framework.ws.message.SendToAllRequest; import com.mortals.xhx.base.framework.ws.message.SendToAllRequest;
import com.mortals.xhx.base.framework.ws.util.WebSocketUtil; import com.mortals.xhx.base.framework.ws.util.WebSocketUtil;
import com.mortals.xhx.busiz.req.DeviceReq; import com.mortals.xhx.busiz.req.DeviceReq;
import com.mortals.xhx.busiz.rsp.ApiResp; import com.mortals.xhx.busiz.rsp.ApiResp;
import com.mortals.xhx.common.code.ApiRespCodeEnum; import com.mortals.xhx.busiz.rsp.DeviceResp;
import com.mortals.xhx.common.code.DeviceOnlineStatusEnum; import com.mortals.xhx.busiz.security.DeviceTokenService;
import com.mortals.xhx.common.code.*;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.model.DeviceLogEntity;
import com.mortals.xhx.module.device.service.DeviceLogService; import com.mortals.xhx.module.device.service.DeviceLogService;
import com.mortals.xhx.module.device.service.DeviceService; import com.mortals.xhx.module.device.service.DeviceService;
import lombok.extern.apachecommons.CommonsLog; import lombok.extern.apachecommons.CommonsLog;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -38,26 +39,31 @@ public class DeviceApiController { ...@@ -38,26 +39,31 @@ public class DeviceApiController {
@Autowired @Autowired
private DeviceService deviceService; private DeviceService deviceService;
@Autowired
private DeviceTokenService deviceTokenService;
/** /**
* 设备数据上报 * 设备激活
* *
* @param req * @param req
* @return * @return
*/ */
@PostMapping("upload") @PostMapping("active")
public String upload(DeviceReq req) { public String active(@RequestBody DeviceReq req) {
log.info("【设备数据上报】【请求体】--> " + JSONObject.toJSONString(req)); log.info("【设备激活】【请求体】--> " + JSONObject.toJSONString(req));
ApiResp rsp = new ApiResp<>(); ApiResp<DeviceResp> rsp = new ApiResp<>();
rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue()); rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
DeviceResp deviceResp = new DeviceResp();
try { try {
//根据设备编码查询设备 //根据设备编码查询设备是否存在，如果存在判断是否已经激活
DeviceEntity deviceEntity = deviceService.getExtCache(req.getDevicenum()); DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceNum());
boolean bool = false;
if (!ObjectUtils.isEmpty(deviceEntity)) { if (!ObjectUtils.isEmpty(deviceEntity)) {
if (deviceEntity.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.离线.getValue()) { //判断设备是否已经激活，如果已激活返回token信息
bool = true; if (deviceEntity.getActive() == ActiveEnum.已激活.getValue() && deviceEntity.getStatus() == StatusEnum.启用.getValue()) {
String token = deviceTokenService.createToken(deviceEntity);
deviceResp.setToken(token);
} }
deviceEntity.setOnlineTime(new Date()); deviceEntity.setOnlineTime(new Date());
deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue()); deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue());
...@@ -66,25 +72,11 @@ public class DeviceApiController { ...@@ -66,25 +72,11 @@ public class DeviceApiController {
deviceEntity.setSiteNum(req.getSitenum()); deviceEntity.setSiteNum(req.getSitenum());
deviceEntity.setCenternum(req.getCenternum()); deviceEntity.setCenternum(req.getCenternum());
deviceService.update(deviceEntity); deviceService.update(deviceEntity);
DeviceLogEntity deviceLogEntity = new DeviceLogEntity();
deviceLogEntity.initAttrValue();
deviceLogEntity.setDeviceId(deviceEntity.getId());
deviceLogEntity.setDeviceName(deviceEntity.getDeviceName());
deviceLogEntity.setDeviceNum(deviceEntity.getDeviceCode());
deviceLogEntity.setContent(JSONObject.toJSONString(req));
deviceLogEntity.setCreateTime(new Date());
deviceLogService.save(deviceLogEntity);
if (bool) {
WebSocketUtil.broadcast(SendToAllRequest.TYPE, new SendToAllRequest().setContent(JSON.toJSONString(deviceEntity)));
}
} else { } else {
//新增设备 //新增设备
deviceEntity = new DeviceEntity(); deviceEntity = new DeviceEntity();
deviceEntity.initAttrValue(); deviceEntity.initAttrValue();
deviceEntity.setDeviceCode(req.getDevicenum()); deviceEntity.setDeviceCode(req.getDeviceNum());
deviceEntity.setOnlineTime(new Date()); deviceEntity.setOnlineTime(new Date());
deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue()); deviceEntity.setDeviceOnlineStatus(DeviceOnlineStatusEnum.在线.getValue());
deviceEntity.setIp(req.getIp()); deviceEntity.setIp(req.getIp());
...@@ -95,17 +87,41 @@ public class DeviceApiController { ...@@ -95,17 +87,41 @@ public class DeviceApiController {
deviceEntity.setCreateTime(new Date()); deviceEntity.setCreateTime(new Date());
deviceService.save(deviceEntity); deviceService.save(deviceEntity);
DeviceLogEntity deviceLogEntity = new DeviceLogEntity(); rsp.setMsg("当前设备未激活，激活后再上线。");
deviceLogEntity.initAttrValue();
deviceLogEntity.setDeviceId(deviceEntity.getId());
deviceLogEntity.setDeviceName(deviceEntity.getDeviceName());
deviceLogEntity.setDeviceNum(deviceEntity.getDeviceCode());
deviceLogEntity.setContent(JSONObject.toJSONString(req));
deviceLogEntity.setCreateTime(new Date());
deviceLogService.save(deviceLogEntity);
WebSocketUtil.broadcast(SendToAllRequest.TYPE, new SendToAllRequest().setContent(JSON.toJSONString(deviceEntity))); WebSocketUtil.broadcast(SendToAllRequest.TYPE, new SendToAllRequest().setContent(JSON.toJSONString(deviceEntity)));
} }
rsp.setData(deviceResp);
} catch (Exception e) {
log.error("接收数据失败", e);
rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
rsp.setMsg(e.getMessage());
return JSON.toJSONString(rsp);
}
log.info("响应【设备激活】【响应体】--> " + JSONObject.toJSONString(rsp));
return JSON.toJSONString(rsp);
}
/**
* 设备数据上报
*
* @param req
* @return
*/
@PostMapping("upload")
@DeviceAuth
public String upload(@RequestBody DeviceReq req) {
log.debug("【设备数据上报】【请求体】--> " + JSONObject.toJSONString(req));
ApiResp<String> rsp = new ApiResp<>();
rsp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
rsp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
try {
//根据设备编码查询设备
DeviceEntity deviceEntity = deviceService.getExtCache(req.getDeviceNum());
if (!ObjectUtils.isEmpty(deviceEntity)) {
//将上报信息转发到mq中
deviceService.sendDeviceMessage(deviceEntity.getId(), JSON.toJSONString(req), null);
}
} catch (Exception e) { } catch (Exception e) {
log.error("接收数据失败", e); log.error("接收数据失败", e);
rsp.setCode(ApiRespCodeEnum.FAILED.getValue()); rsp.setCode(ApiRespCodeEnum.FAILED.getValue());
...@@ -113,7 +129,7 @@ public class DeviceApiController { ...@@ -113,7 +129,7 @@ public class DeviceApiController {
return JSON.toJSONString(rsp); return JSON.toJSONString(rsp);
} }
log.info("响应【设备数据上报】【响应体】--> " + JSONObject.toJSONString(rsp)); log.debug("响应【设备数据上报】【响应体】--> " + JSONObject.toJSONString(rsp));
return JSON.toJSONString(rsp); return JSON.toJSONString(rsp);
} }
......
device-manager/src/main/java/com/mortals/xhx/common/code/ActiveEnum.java 0 → 100644
View file @ 53a350d8
package com.mortals.xhx.common.code;
import java.util.LinkedHashMap;
import java.util.Map;
/**
* 激活状态 (0.未激活，1.已激活)枚举类
*
* @author zxfei
*/
public enum ActiveEnum {
未激活(0, "未激活"),
已激活(1, "已激活");
private Integer value;
private String desc;
ActiveEnum(Integer value, String desc) {
this.value = value;
this.desc = desc;
}
public Integer getValue() {
return this.value;
}
public String getDesc() {
return this.desc;
}
public static ActiveEnum getByValue(Integer value) {
for (ActiveEnum activeEnum : ActiveEnum.values()) {
if (activeEnum.getValue() == value) {
return activeEnum;
}
}
return null;
}
/**
* 获取Map集合
*
* @param eItem 不包含项
* @return
*/
public static Map<String, String> getEnumMap(Integer... eItem) {
Map<String, String> resultMap = new LinkedHashMap<>();
for (ActiveEnum item : ActiveEnum.values()) {
try {
boolean hasE = false;
for (Integer e : eItem) {
if (item.getValue() == e) {
hasE = true;
break;
}
}
if (!hasE) {
resultMap.put(item.getValue() + "", item.getDesc());
}
} catch (Exception ex) {
}
}
return resultMap;
}
}
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/common/code/ApiRespCodeEnum.java
View file @ 53a350d8
...@@ -9,6 +9,9 @@ public enum ApiRespCodeEnum { ...@@ -9,6 +9,9 @@ public enum ApiRespCodeEnum {
SUCCESS(1, "接收成功"), SUCCESS(1, "接收成功"),
/** 执行失败 */ /** 执行失败 */
FAILED(2,"执行失败"), FAILED(2,"执行失败"),
/** token认证失败 */
TOKEN_FAILED(3,"token认证失败"),
; ;
private final Integer value; private final Integer value;
......
device-manager/src/main/java/com/mortals/xhx/common/key/Constant.java
View file @ 53a350d8
...@@ -17,9 +17,46 @@ public final class Constant { ...@@ -17,9 +17,46 @@ public final class Constant {
*/ */
public static final String HTTP = "http://"; public static final String HTTP = "http://";
/**
* 上行消息topic
*/
public static final String UPLOAD_TOPIC = "upload:";
/**
* 下行消息topic
*/
public static final String DOWN_TOPIC = "down:";
/**
* 验证码有效期（分钟）
*/
public static final Integer CAPTCHA_EXPIRATION = 2;
/**
* 登录设备 redis key
*/
public static final String LOGIN_TOKEN_KEY = "login_tokens:";
/**
* 令牌
*/
public static final String TOKEN = "token";
/**
* 令牌前缀
*/
public static final String TOKEN_PREFIX = "Bearer ";
/**
* 令牌前缀
*/
public static final String LOGIN_DEVICE_KEY = "login_device_key";
/** 基础代码版本 Z-BASE.MANAGER-S1.0.0 */ /** 基础代码版本 Z-BASE.MANAGER-S1.0.0 */
public final static String BASEMANAGER_VERSION = "Z-BASE.MANAGER-S1.0.0"; public final static String BASEMANAGER_VERSION = "Z-BASE.MANAGER-S1.0.0";
public final static String PARAM_SERVER_HTTP_URL = "server_http_url"; public final static String PARAM_SERVER_HTTP_URL = "server_http_url";
} }
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceEntity.java
View file @ 53a350d8
...@@ -8,288 +8,306 @@ import com.mortals.framework.annotation.Excel; ...@@ -8,288 +8,306 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.vo.DeviceVo; import com.mortals.xhx.module.device.model.vo.DeviceVo;
/** /**
* 设备实体对象 * 设备实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-03-09 * @date 2022-04-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;
/** /**
* 设备编码 * 设备编码
*/ */
private String deviceCode; private String deviceCode;
/** /**
* 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
*/ */
private Integer deviceType; private Integer deviceType;
/** /**
* 设备的MAC地址 * 设备的MAC地址
*/ */
private String deviceMac; private String deviceMac;
/** /**
* 设备访问ip * 设备访问ip
*/ */
private String ip; private String ip;
/** /**
* 中心设备编码 * 中心设备编码
*/ */
private String centernum; private String centernum;
/** /**
* 端口 * 端口
*/ */
private String port; private String port;
/** /**
* 站点编号 * 站点编号
*/ */
private String siteNum; private String siteNum;
/** /**
* 设备生产厂商ID * 设备生产厂商ID
*/ */
private Long deviceFirmId; private Long deviceFirmId;
/** /**
* 设备生产厂商名称 * 设备生产厂商名称
*/ */
@Excel(name = "设备生产厂商名称") @Excel(name = "设备生产厂商名称")
private String deviceFirmname; private String deviceFirmname;
/** /**
* 在线状态 (0.离线，1.在线) * 在线状态 (0.离线，1.在线)
*/ */
private Integer deviceOnlineStatus; private Integer deviceOnlineStatus;
/** /**
* 启用状态 (0.停止，1.启用) * 启用状态 (0.停止，1.启用)
*/ */
private Integer status; private Integer status;
/** /**
* 备注 * 激活状态 (0.未激活，1.已激活)
*/ */
private Integer active;
/**
* 备注
*/
private String deviceRemark; private String deviceRemark;
/** /**
* 最近上线时间 * 最近上线时间
*/ */
private Date onlineTime; private Date onlineTime;
/** /**
* 最近离线时间 * 最近离线时间
*/ */
private Date offlineTime; private Date offlineTime;
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;
} }
/** /**
* 获取 设备编码 * 获取 设备编码
* @return String * @return String
*/ */
public String getDeviceCode(){ public String getDeviceCode(){
return deviceCode; return deviceCode;
} }
/** /**
* 设置 设备编码 * 设置 设备编码
* @param deviceCode * @param deviceCode
*/ */
public void setDeviceCode(String deviceCode){ public void setDeviceCode(String deviceCode){
this.deviceCode = deviceCode; this.deviceCode = deviceCode;
} }
/** /**
* 获取 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 获取 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @return Integer * @return Integer
*/ */
public Integer getDeviceType(){ public Integer getDeviceType(){
return deviceType; return deviceType;
} }
/** /**
* 设置 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 设置 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @param deviceType * @param deviceType
*/ */
public void setDeviceType(Integer deviceType){ public void setDeviceType(Integer deviceType){
this.deviceType = deviceType; this.deviceType = deviceType;
} }
/** /**
* 获取 设备的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;
} }
/** /**
* 获取 设备访问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;
} }
/** /**
* 获取 站点编号 * 获取 站点编号
* @return String * @return String
*/ */
public String getSiteNum(){ public String getSiteNum(){
return siteNum; return siteNum;
} }
/** /**
* 设置 站点编号 * 设置 站点编号
* @param siteNum * @param siteNum
*/ */
public void setSiteNum(String siteNum){ public void setSiteNum(String siteNum){
this.siteNum = siteNum; this.siteNum = siteNum;
} }
/** /**
* 获取 设备生产厂商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.在线) * 获取 在线状态 (0.离线，1.在线)
* @return Integer * @return Integer
*/ */
public Integer getDeviceOnlineStatus(){ public Integer getDeviceOnlineStatus(){
return deviceOnlineStatus; return deviceOnlineStatus;
} }
/** /**
* 设置 在线状态 (0.离线，1.在线) * 设置 在线状态 (0.离线，1.在线)
* @param deviceOnlineStatus * @param deviceOnlineStatus
*/ */
public void setDeviceOnlineStatus(Integer deviceOnlineStatus){ public void setDeviceOnlineStatus(Integer deviceOnlineStatus){
this.deviceOnlineStatus = deviceOnlineStatus; this.deviceOnlineStatus = deviceOnlineStatus;
} }
/** /**
* 获取 启用状态 (0.停止，1.启用) * 获取 启用状态 (0.停止，1.启用)
* @return Integer * @return Integer
*/ */
public Integer getStatus(){ public Integer getStatus(){
return status; return status;
} }
/** /**
* 设置 启用状态 (0.停止，1.启用) * 设置 启用状态 (0.停止，1.启用)
* @param status * @param status
*/ */
public void setStatus(Integer status){ public void setStatus(Integer status){
this.status = status; this.status = status;
} }
/** /**
* 获取 备注 * 获取 激活状态 (0.未激活，1.已激活)
* @return String * @return Integer
*/ */
public Integer getActive(){
return active;
}
/**
* 设置 激活状态 (0.未激活，1.已激活)
* @param active
*/
public void setActive(Integer active){
this.active = active;
}
/**
* 获取 备注
* @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;
} }
...@@ -299,7 +317,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -299,7 +317,7 @@ public class DeviceEntity extends DeviceVo {
@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) {
...@@ -307,7 +325,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -307,7 +325,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;
...@@ -327,6 +345,7 @@ public class DeviceEntity extends DeviceVo { ...@@ -327,6 +345,7 @@ public class DeviceEntity extends DeviceVo {
sb.append(",deviceFirmname:").append(getDeviceFirmname()); sb.append(",deviceFirmname:").append(getDeviceFirmname());
sb.append(",deviceOnlineStatus:").append(getDeviceOnlineStatus()); sb.append(",deviceOnlineStatus:").append(getDeviceOnlineStatus());
sb.append(",status:").append(getStatus()); sb.append(",status:").append(getStatus());
sb.append(",active:").append(getActive());
sb.append(",deviceRemark:").append(getDeviceRemark()); sb.append(",deviceRemark:").append(getDeviceRemark());
sb.append(",onlineTime:").append(getOnlineTime()); sb.append(",onlineTime:").append(getOnlineTime());
sb.append(",offlineTime:").append(getOfflineTime()); sb.append(",offlineTime:").append(getOfflineTime());
...@@ -335,34 +354,36 @@ public class DeviceEntity extends DeviceVo { ...@@ -335,34 +354,36 @@ public class DeviceEntity extends DeviceVo {
public void initAttrValue(){ public void initAttrValue(){
this.deviceName = ""; this.deviceName = "";
this.deviceCode = "";
this.deviceCode = ""; this.deviceType = 1;
this.deviceType = 1; this.deviceMac = "";
this.deviceMac = ""; this.ip = "";
this.ip = ""; this.centernum = "";
this.centernum = ""; this.port = "";
this.port = ""; this.siteNum = "";
this.siteNum = ""; this.deviceFirmId = null;
this.deviceFirmId = null; this.deviceFirmname = "";
this.deviceFirmname = ""; this.deviceOnlineStatus = 0;
this.deviceOnlineStatus = 0; this.status = 0;
this.status = 0; this.active = 0;
this.deviceRemark = ""; this.deviceRemark = "";
this.onlineTime = null; this.onlineTime = null;
this.offlineTime = null; this.offlineTime = null;
} }
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceQuery.java
View file @ 53a350d8
...@@ -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-03-09 * @date 2022-04-11
*/ */
public class DeviceQuery extends DeviceEntity { public class DeviceQuery extends DeviceEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -94,6 +94,18 @@ public class DeviceQuery extends DeviceEntity { ...@@ -94,6 +94,18 @@ public class DeviceQuery extends DeviceEntity {
/** 启用状态 (0.停止，1.启用)列表 */ /** 启用状态 (0.停止，1.启用)列表 */
private List <Integer> statusList; private List <Integer> statusList;
/** 开始 激活状态 (0.未激活，1.已激活) */
private Integer activeStart;
/** 结束 激活状态 (0.未激活，1.已激活) */
private Integer activeEnd;
/** 增加 激活状态 (0.未激活，1.已激活) */
private Integer activeIncrement;
/** 激活状态 (0.未激活，1.已激活)列表 */
private List <Integer> activeList;
/** 备注 */ /** 备注 */
private List<String> deviceRemarkList; private List<String> deviceRemarkList;
...@@ -154,1234 +166,1343 @@ public class DeviceQuery extends DeviceEntity { ...@@ -154,1234 +166,1343 @@ 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;
} }
/** /**
* 获取 设备编码 * 获取 设备编码
* @return deviceCodeList * @return deviceCodeList
*/ */
public List<String> getDeviceCodeList(){ public List<String> getDeviceCodeList(){
return this.deviceCodeList; return this.deviceCodeList;
} }
/** /**
* 设置 设备编码 * 设置 设备编码
* @param deviceCodeList * @param deviceCodeList
*/ */
public void setDeviceCodeList(List<String> deviceCodeList){ public void setDeviceCodeList(List<String> deviceCodeList){
this.deviceCodeList = deviceCodeList; this.deviceCodeList = deviceCodeList;
} }
/** /**
* 获取 开始 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 获取 开始 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @return deviceTypeStart * @return deviceTypeStart
*/ */
public Integer getDeviceTypeStart(){ public Integer getDeviceTypeStart(){
return this.deviceTypeStart; return this.deviceTypeStart;
} }
/** /**
* 设置 开始 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 设置 开始 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @param deviceTypeStart * @param deviceTypeStart
*/ */
public void setDeviceTypeStart(Integer deviceTypeStart){ public void setDeviceTypeStart(Integer deviceTypeStart){
this.deviceTypeStart = deviceTypeStart; this.deviceTypeStart = deviceTypeStart;
} }
/** /**
* 获取 结束 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 获取 结束 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @return $deviceTypeEnd * @return $deviceTypeEnd
*/ */
public Integer getDeviceTypeEnd(){ public Integer getDeviceTypeEnd(){
return this.deviceTypeEnd; return this.deviceTypeEnd;
} }
/** /**
* 设置 结束 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 设置 结束 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @param deviceTypeEnd * @param deviceTypeEnd
*/ */
public void setDeviceTypeEnd(Integer deviceTypeEnd){ public void setDeviceTypeEnd(Integer deviceTypeEnd){
this.deviceTypeEnd = deviceTypeEnd; this.deviceTypeEnd = deviceTypeEnd;
} }
/** /**
* 获取 增加 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 获取 增加 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @return deviceTypeIncrement * @return deviceTypeIncrement
*/ */
public Integer getDeviceTypeIncrement(){ public Integer getDeviceTypeIncrement(){
return this.deviceTypeIncrement; return this.deviceTypeIncrement;
} }
/** /**
* 设置 增加 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 设置 增加 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @param deviceTypeIncrement * @param deviceTypeIncrement
*/ */
public void setDeviceTypeIncrement(Integer deviceTypeIncrement){ public void setDeviceTypeIncrement(Integer deviceTypeIncrement){
this.deviceTypeIncrement = deviceTypeIncrement; this.deviceTypeIncrement = deviceTypeIncrement;
} }
/** /**
* 获取 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 获取 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @return deviceTypeList * @return deviceTypeList
*/ */
public List<Integer> getDeviceTypeList(){ public List<Integer> getDeviceTypeList(){
return this.deviceTypeList; return this.deviceTypeList;
} }
/** /**
* 设置 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 设置 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @param deviceTypeList * @param deviceTypeList
*/ */
public void setDeviceTypeList(List<Integer> deviceTypeList){ public void setDeviceTypeList(List<Integer> deviceTypeList){
this.deviceTypeList = deviceTypeList; this.deviceTypeList = deviceTypeList;
} }
/** /**
* 获取 设备的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;
} }
/** /**
* 获取 设备访问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;
} }
/** /**
* 获取 站点编号 * 获取 站点编号
* @return siteNumList * @return siteNumList
*/ */
public List<String> getSiteNumList(){ public List<String> getSiteNumList(){
return this.siteNumList; return this.siteNumList;
} }
/** /**
* 设置 站点编号 * 设置 站点编号
* @param siteNumList * @param siteNumList
*/ */
public void setSiteNumList(List<String> siteNumList){ public void setSiteNumList(List<String> siteNumList){
this.siteNumList = siteNumList; this.siteNumList = siteNumList;
} }
/** /**
* 获取 开始 设备生产厂商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.在线) * 获取 开始 在线状态 (0.离线，1.在线)
* @return deviceOnlineStatusStart * @return deviceOnlineStatusStart
*/ */
public Integer getDeviceOnlineStatusStart(){ public Integer getDeviceOnlineStatusStart(){
return this.deviceOnlineStatusStart; return this.deviceOnlineStatusStart;
} }
/** /**
* 设置 开始 在线状态 (0.离线，1.在线) * 设置 开始 在线状态 (0.离线，1.在线)
* @param deviceOnlineStatusStart * @param deviceOnlineStatusStart
*/ */
public void setDeviceOnlineStatusStart(Integer deviceOnlineStatusStart){ public void setDeviceOnlineStatusStart(Integer deviceOnlineStatusStart){
this.deviceOnlineStatusStart = deviceOnlineStatusStart; this.deviceOnlineStatusStart = deviceOnlineStatusStart;
} }
/** /**
* 获取 结束 在线状态 (0.离线，1.在线) * 获取 结束 在线状态 (0.离线，1.在线)
* @return $deviceOnlineStatusEnd * @return $deviceOnlineStatusEnd
*/ */
public Integer getDeviceOnlineStatusEnd(){ public Integer getDeviceOnlineStatusEnd(){
return this.deviceOnlineStatusEnd; return this.deviceOnlineStatusEnd;
} }
/** /**
* 设置 结束 在线状态 (0.离线，1.在线) * 设置 结束 在线状态 (0.离线，1.在线)
* @param deviceOnlineStatusEnd * @param deviceOnlineStatusEnd
*/ */
public void setDeviceOnlineStatusEnd(Integer deviceOnlineStatusEnd){ public void setDeviceOnlineStatusEnd(Integer deviceOnlineStatusEnd){
this.deviceOnlineStatusEnd = deviceOnlineStatusEnd; this.deviceOnlineStatusEnd = deviceOnlineStatusEnd;
} }
/** /**
* 获取 增加 在线状态 (0.离线，1.在线) * 获取 增加 在线状态 (0.离线，1.在线)
* @return deviceOnlineStatusIncrement * @return deviceOnlineStatusIncrement
*/ */
public Integer getDeviceOnlineStatusIncrement(){ public Integer getDeviceOnlineStatusIncrement(){
return this.deviceOnlineStatusIncrement; return this.deviceOnlineStatusIncrement;
} }
/** /**
* 设置 增加 在线状态 (0.离线，1.在线) * 设置 增加 在线状态 (0.离线，1.在线)
* @param deviceOnlineStatusIncrement * @param deviceOnlineStatusIncrement
*/ */
public void setDeviceOnlineStatusIncrement(Integer deviceOnlineStatusIncrement){ public void setDeviceOnlineStatusIncrement(Integer deviceOnlineStatusIncrement){
this.deviceOnlineStatusIncrement = deviceOnlineStatusIncrement; this.deviceOnlineStatusIncrement = deviceOnlineStatusIncrement;
} }
/** /**
* 获取 在线状态 (0.离线，1.在线) * 获取 在线状态 (0.离线，1.在线)
* @return deviceOnlineStatusList * @return deviceOnlineStatusList
*/ */
public List<Integer> getDeviceOnlineStatusList(){ public List<Integer> getDeviceOnlineStatusList(){
return this.deviceOnlineStatusList; return this.deviceOnlineStatusList;
} }
/** /**
* 设置 在线状态 (0.离线，1.在线) * 设置 在线状态 (0.离线，1.在线)
* @param deviceOnlineStatusList * @param deviceOnlineStatusList
*/ */
public void setDeviceOnlineStatusList(List<Integer> deviceOnlineStatusList){ public void setDeviceOnlineStatusList(List<Integer> deviceOnlineStatusList){
this.deviceOnlineStatusList = deviceOnlineStatusList; this.deviceOnlineStatusList = deviceOnlineStatusList;
} }
/** /**
* 获取 开始 启用状态 (0.停止，1.启用) * 获取 开始 启用状态 (0.停止，1.启用)
* @return statusStart * @return statusStart
*/ */
public Integer getStatusStart(){ public Integer getStatusStart(){
return this.statusStart; return this.statusStart;
} }
/** /**
* 设置 开始 启用状态 (0.停止，1.启用) * 设置 开始 启用状态 (0.停止，1.启用)
* @param statusStart * @param statusStart
*/ */
public void setStatusStart(Integer statusStart){ public void setStatusStart(Integer statusStart){
this.statusStart = statusStart; this.statusStart = statusStart;
} }
/** /**
* 获取 结束 启用状态 (0.停止，1.启用) * 获取 结束 启用状态 (0.停止，1.启用)
* @return $statusEnd * @return $statusEnd
*/ */
public Integer getStatusEnd(){ public Integer getStatusEnd(){
return this.statusEnd; return this.statusEnd;
} }
/** /**
* 设置 结束 启用状态 (0.停止，1.启用) * 设置 结束 启用状态 (0.停止，1.启用)
* @param statusEnd * @param statusEnd
*/ */
public void setStatusEnd(Integer statusEnd){ public void setStatusEnd(Integer statusEnd){
this.statusEnd = statusEnd; this.statusEnd = statusEnd;
} }
/** /**
* 获取 增加 启用状态 (0.停止，1.启用) * 获取 增加 启用状态 (0.停止，1.启用)
* @return statusIncrement * @return statusIncrement
*/ */
public Integer getStatusIncrement(){ public Integer getStatusIncrement(){
return this.statusIncrement; return this.statusIncrement;
} }
/** /**
* 设置 增加 启用状态 (0.停止，1.启用) * 设置 增加 启用状态 (0.停止，1.启用)
* @param statusIncrement * @param statusIncrement
*/ */
public void setStatusIncrement(Integer statusIncrement){ public void setStatusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement; this.statusIncrement = statusIncrement;
} }
/** /**
* 获取 启用状态 (0.停止，1.启用) * 获取 启用状态 (0.停止，1.启用)
* @return statusList * @return statusList
*/ */
public List<Integer> getStatusList(){ public List<Integer> getStatusList(){
return this.statusList; return this.statusList;
} }
/** /**
* 设置 启用状态 (0.停止，1.启用) * 设置 启用状态 (0.停止，1.启用)
* @param statusList * @param statusList
*/ */
public void setStatusList(List<Integer> statusList){ public void setStatusList(List<Integer> statusList){
this.statusList = statusList; this.statusList = statusList;
} }
/** /**
* 获取 备注 * 获取 开始 激活状态 (0.未激活，1.已激活)
* @return deviceRemarkList * @return activeStart
*/ */
public Integer getActiveStart(){
return this.activeStart;
}
/**
* 设置 开始 激活状态 (0.未激活，1.已激活)
* @param activeStart
*/
public void setActiveStart(Integer activeStart){
this.activeStart = activeStart;
}
/**
* 获取 结束 激活状态 (0.未激活，1.已激活)
* @return $activeEnd
*/
public Integer getActiveEnd(){
return this.activeEnd;
}
/**
* 设置 结束 激活状态 (0.未激活，1.已激活)
* @param activeEnd
*/
public void setActiveEnd(Integer activeEnd){
this.activeEnd = activeEnd;
}
/**
* 获取 增加 激活状态 (0.未激活，1.已激活)
* @return activeIncrement
*/
public Integer getActiveIncrement(){
return this.activeIncrement;
}
/**
* 设置 增加 激活状态 (0.未激活，1.已激活)
* @param activeIncrement
*/
public void setActiveIncrement(Integer activeIncrement){
this.activeIncrement = activeIncrement;
}
/**
* 获取 激活状态 (0.未激活，1.已激活)
* @return activeList
*/
public List<Integer> getActiveList(){
return this.activeList;
}
/**
* 设置 激活状态 (0.未激活，1.已激活)
* @param activeList
*/
public void setActiveList(List<Integer> activeList){
this.activeList = activeList;
}
/**
* 获取 备注
* @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;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @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 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;
} }
/** /**
* 设置 设备编码 * 设置 设备编码
* @param deviceCode * @param deviceCode
*/ */
public DeviceQuery deviceCode(String deviceCode){ public DeviceQuery deviceCode(String deviceCode){
setDeviceCode(deviceCode); setDeviceCode(deviceCode);
return this; return this;
} }
/** /**
* 设置 设备编码 * 设置 设备编码
* @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;
} }
/** /**
* 设置 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 设置 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @param deviceType * @param deviceType
*/ */
public DeviceQuery deviceType(Integer deviceType){ public DeviceQuery deviceType(Integer deviceType){
setDeviceType(deviceType); setDeviceType(deviceType);
return this; return this;
} }
/** /**
* 设置 开始 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 设置 开始 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @param deviceTypeStart * @param deviceTypeStart
*/ */
public DeviceQuery deviceTypeStart(Integer deviceTypeStart){ public DeviceQuery deviceTypeStart(Integer deviceTypeStart){
this.deviceTypeStart = deviceTypeStart; this.deviceTypeStart = deviceTypeStart;
return this; return this;
} }
/** /**
* 设置 结束 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 设置 结束 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @param deviceTypeEnd * @param deviceTypeEnd
*/ */
public DeviceQuery deviceTypeEnd(Integer deviceTypeEnd){ public DeviceQuery deviceTypeEnd(Integer deviceTypeEnd){
this.deviceTypeEnd = deviceTypeEnd; this.deviceTypeEnd = deviceTypeEnd;
return this; return this;
} }
/** /**
* 设置 增加 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 设置 增加 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @param deviceTypeIncrement * @param deviceTypeIncrement
*/ */
public DeviceQuery deviceTypeIncrement(Integer deviceTypeIncrement){ public DeviceQuery deviceTypeIncrement(Integer deviceTypeIncrement){
this.deviceTypeIncrement = deviceTypeIncrement; this.deviceTypeIncrement = deviceTypeIncrement;
return this; return this;
} }
/** /**
* 设置 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背） * 设置 设备类型（1.呼叫器，2.窗口屏, 3.评价器，4.集中屏, 5.排号机，6.im设备, 7.样表设备，8.取件柜, 9.信息发布,10.导视机,11.开标室设备,12.背靠背）
* @param deviceTypeList * @param deviceTypeList
*/ */
public DeviceQuery deviceTypeList(List<Integer> deviceTypeList){ public DeviceQuery deviceTypeList(List<Integer> deviceTypeList){
this.deviceTypeList = deviceTypeList; this.deviceTypeList = deviceTypeList;
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;
} }
/** /**
* 设置 设备访问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;
} }
/** /**
* 设置 站点编号 * 设置 站点编号
* @param siteNum * @param siteNum
*/ */
public DeviceQuery siteNum(String siteNum){ public DeviceQuery siteNum(String siteNum){
setSiteNum(siteNum); setSiteNum(siteNum);
return this; return this;
} }
/** /**
* 设置 站点编号 * 设置 站点编号
* @param siteNumList * @param siteNumList
*/ */
public DeviceQuery siteNumList(List<String> siteNumList){ public DeviceQuery siteNumList(List<String> siteNumList){
this.siteNumList = siteNumList; this.siteNumList = siteNumList;
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.在线) * 设置 在线状态 (0.离线，1.在线)
* @param deviceOnlineStatus * @param deviceOnlineStatus
*/ */
public DeviceQuery deviceOnlineStatus(Integer deviceOnlineStatus){ public DeviceQuery deviceOnlineStatus(Integer deviceOnlineStatus){
setDeviceOnlineStatus(deviceOnlineStatus); setDeviceOnlineStatus(deviceOnlineStatus);
return this; return this;
} }
/** /**
* 设置 开始 在线状态 (0.离线，1.在线) * 设置 开始 在线状态 (0.离线，1.在线)
* @param deviceOnlineStatusStart * @param deviceOnlineStatusStart
*/ */
public DeviceQuery deviceOnlineStatusStart(Integer deviceOnlineStatusStart){ public DeviceQuery deviceOnlineStatusStart(Integer deviceOnlineStatusStart){
this.deviceOnlineStatusStart = deviceOnlineStatusStart; this.deviceOnlineStatusStart = deviceOnlineStatusStart;
return this; return this;
} }
/** /**
* 设置 结束 在线状态 (0.离线，1.在线) * 设置 结束 在线状态 (0.离线，1.在线)
* @param deviceOnlineStatusEnd * @param deviceOnlineStatusEnd
*/ */
public DeviceQuery deviceOnlineStatusEnd(Integer deviceOnlineStatusEnd){ public DeviceQuery deviceOnlineStatusEnd(Integer deviceOnlineStatusEnd){
this.deviceOnlineStatusEnd = deviceOnlineStatusEnd; this.deviceOnlineStatusEnd = deviceOnlineStatusEnd;
return this; return this;
} }
/** /**
* 设置 增加 在线状态 (0.离线，1.在线) * 设置 增加 在线状态 (0.离线，1.在线)
* @param deviceOnlineStatusIncrement * @param deviceOnlineStatusIncrement
*/ */
public DeviceQuery deviceOnlineStatusIncrement(Integer deviceOnlineStatusIncrement){ public DeviceQuery deviceOnlineStatusIncrement(Integer deviceOnlineStatusIncrement){
this.deviceOnlineStatusIncrement = deviceOnlineStatusIncrement; this.deviceOnlineStatusIncrement = deviceOnlineStatusIncrement;
return this; return this;
} }
/** /**
* 设置 在线状态 (0.离线，1.在线) * 设置 在线状态 (0.离线，1.在线)
* @param deviceOnlineStatusList * @param deviceOnlineStatusList
*/ */
public DeviceQuery deviceOnlineStatusList(List<Integer> deviceOnlineStatusList){ public DeviceQuery deviceOnlineStatusList(List<Integer> deviceOnlineStatusList){
this.deviceOnlineStatusList = deviceOnlineStatusList; this.deviceOnlineStatusList = deviceOnlineStatusList;
return this; return this;
} }
/** /**
* 设置 启用状态 (0.停止，1.启用) * 设置 启用状态 (0.停止，1.启用)
* @param status * @param status
*/ */
public DeviceQuery status(Integer status){ public DeviceQuery status(Integer status){
setStatus(status); setStatus(status);
return this; return this;
} }
/** /**
* 设置 开始 启用状态 (0.停止，1.启用) * 设置 开始 启用状态 (0.停止，1.启用)
* @param statusStart * @param statusStart
*/ */
public DeviceQuery statusStart(Integer statusStart){ public DeviceQuery statusStart(Integer statusStart){
this.statusStart = statusStart; this.statusStart = statusStart;
return this; return this;
} }
/** /**
* 设置 结束 启用状态 (0.停止，1.启用) * 设置 结束 启用状态 (0.停止，1.启用)
* @param statusEnd * @param statusEnd
*/ */
public DeviceQuery statusEnd(Integer statusEnd){ public DeviceQuery statusEnd(Integer statusEnd){
this.statusEnd = statusEnd; this.statusEnd = statusEnd;
return this; return this;
} }
/** /**
* 设置 增加 启用状态 (0.停止，1.启用) * 设置 增加 启用状态 (0.停止，1.启用)
* @param statusIncrement * @param statusIncrement
*/ */
public DeviceQuery statusIncrement(Integer statusIncrement){ public DeviceQuery statusIncrement(Integer statusIncrement){
this.statusIncrement = statusIncrement; this.statusIncrement = statusIncrement;
return this; return this;
} }
/** /**
* 设置 启用状态 (0.停止，1.启用) * 设置 启用状态 (0.停止，1.启用)
* @param statusList * @param statusList
*/ */
public DeviceQuery statusList(List<Integer> statusList){ public DeviceQuery statusList(List<Integer> statusList){
this.statusList = statusList; this.statusList = statusList;
return this; return this;
} }
/**
* 设置 激活状态 (0.未激活，1.已激活)
* @param active
*/
public DeviceQuery active(Integer active){
setActive(active);
return this;
}
/**
* 设置 开始 激活状态 (0.未激活，1.已激活)
* @param activeStart
*/
public DeviceQuery activeStart(Integer activeStart){
this.activeStart = activeStart;
return this;
}
/**
* 设置 结束 激活状态 (0.未激活，1.已激活)
* @param activeEnd
*/
public DeviceQuery activeEnd(Integer activeEnd){
this.activeEnd = activeEnd;
return this;
}
/** /**
* 设置 备注 * 设置 增加 激活状态 (0.未激活，1.已激活)
* @param deviceRemark * @param activeIncrement
*/ */
public DeviceQuery activeIncrement(Integer activeIncrement){
this.activeIncrement = activeIncrement;
return this;
}
/**
* 设置 激活状态 (0.未激活，1.已激活)
* @param activeList
*/
public DeviceQuery activeList(List<Integer> activeList){
this.activeList = activeList;
return this;
}
/**
* 设置 备注
* @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;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @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/model/vo/DeviceVo.java
View file @ 53a350d8
package com.mortals.xhx.module.device.model.vo; package com.mortals.xhx.module.device.model.vo;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
import lombok.Data; import lombok.Data;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
/** /**
* 设备视图对象 * 设备视图对象
* *
* @author zxfei * @author zxfei
* @date 2022-03-09 * @date 2022-03-09
*/ */
@Data @Data
public class DeviceVo extends BaseEntityLong { public class DeviceVo extends BaseEntityLong {
/**
* 设备唯一标识
*/
private String token;
/**
* 登录时间
*/
private Long loginTime;
/**
* 过期时间
*/
private Long expireTime;
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/service/DeviceService.java
View file @ 53a350d8
package com.mortals.xhx.module.device.service; package com.mortals.xhx.module.device.service;
import com.mortals.framework.model.Context;
import com.mortals.framework.service.ICRUDCacheService; import com.mortals.framework.service.ICRUDCacheService;
import com.mortals.xhx.busiz.rsp.ApiResp;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
import java.util.List;
/** /**
* DeviceService * DeviceService
* *
...@@ -11,4 +16,11 @@ import com.mortals.xhx.module.device.model.DeviceEntity; ...@@ -11,4 +16,11 @@ import com.mortals.xhx.module.device.model.DeviceEntity;
*/ */
public interface DeviceService extends ICRUDCacheService<DeviceEntity,Long>{ public interface DeviceService extends ICRUDCacheService<DeviceEntity,Long>{
ApiResp<String> sendDeviceMessage(Long deviceId, String message , Context context);
ApiResp<String> sendDeviceMessage(List<Long> deviceIds, String message , Context context);
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/service/impl/DeviceServiceImpl.java
View file @ 53a350d8
package com.mortals.xhx.module.device.service.impl; package com.mortals.xhx.module.device.service.impl;
import com.mortals.framework.model.Context;
import com.mortals.framework.util.DateUtils;
import com.mortals.xhx.busiz.rsp.ApiResp;
import com.mortals.xhx.common.code.ApiRespCodeEnum;
import com.mortals.xhx.common.key.Constant;
import com.mortals.xhx.common.model.DefaultTbQueueMsgHeaders;
import com.mortals.xhx.common.model.MessageHeader;
import com.mortals.xhx.queue.*;
import com.mortals.xhx.queue.provider.TbCoreQueueProducerProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl; import com.mortals.framework.service.impl.AbstractCRUDCacheServiceImpl;
import com.mortals.xhx.module.device.dao.DeviceDao; import com.mortals.xhx.module.device.dao.DeviceDao;
import com.mortals.xhx.module.device.model.DeviceEntity; import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.service.DeviceService; import com.mortals.xhx.module.device.service.DeviceService;
import org.springframework.util.ObjectUtils;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/** /**
* DeviceService * DeviceService
* 设备 service实现 * 设备 service实现
* *
* @author zxfei * @author zxfei
* @date 2022-03-09 * @date 2022-03-09
*/ */
@Service("deviceService") @Service("deviceService")
public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, DeviceEntity, Long> implements DeviceService { public class DeviceServiceImpl extends AbstractCRUDCacheServiceImpl<DeviceDao, DeviceEntity, Long> implements DeviceService {
@Autowired
private TbCoreQueueProducerProvider producerProvider;
@Override @Override
protected String getExtKey(DeviceEntity data) { protected String getExtKey(DeviceEntity data) {
return data.getDeviceCode(); return data.getDeviceCode();
} }
@Override
public ApiResp<String> sendDeviceMessage(Long deviceId, String message, Context context) {
ApiResp<String> resp = new ApiResp<>();
resp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
resp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
//发送消息
send(message, context, resp, deviceId);
return resp;
}
@Override
public ApiResp<String> sendDeviceMessage(List<Long> deviceIds, String message, Context context) {
ApiResp<String> resp = new ApiResp<>();
resp.setCode(ApiRespCodeEnum.SUCCESS.getValue());
resp.setMsg(ApiRespCodeEnum.SUCCESS.getLabel());
for (Long deviceId : deviceIds) {
send(message, context, resp, deviceId);
}
return resp;
}
private void send(String message, Context context, ApiResp<String> resp, Long deviceId) {
DeviceEntity deviceEntity = this.get(deviceId, context);
if (!ObjectUtils.isEmpty(deviceEntity)) {
TbQueueProducer<TbQueueMsg> producer = producerProvider.getTbCoreMsgProducer();
TopicPartitionInfo info = TopicPartitionInfo.builder().topic(Constant.UPLOAD_TOPIC+deviceEntity.getDeviceMac()).build();
TbQueueMsgHeaders header = new DefaultTbQueueMsgHeaders();
header.put(MessageHeader.CLIENTID, "device".getBytes());
Map<String, Object> headers = new HashMap<>();
headers.put(MessageHeader.TIMESTAMP, DateUtils.getCurrStrDateTime().getBytes());
TbQueueMsg queueMsg = new DefaultTbQueueMsg(UUID.randomUUID(), message == null ? "".getBytes() : message.getBytes(), header);
producer.send(info, queueMsg, new TbQueueCallback() {
@Override
public void onSuccess(TbQueueMsgMetadata metadata) {
log.debug("消息投递成功,设备通道编码:" + deviceEntity.getDeviceMac());
}
@Override
public void onFailure(Throwable t) {
}
});
} else {
log.error(String.format("设备Id查询不到设备，deviceId:%s", deviceId));
resp.setCode(ApiRespCodeEnum.FAILED.getValue());
resp.setMsg(String.format("设备Id查询不到设备，deviceId:%s", deviceId));
}
}
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceController.java
View file @ 53a350d8
...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.device.web; ...@@ -3,6 +3,7 @@ package com.mortals.xhx.module.device.web;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.OrderCol; import com.mortals.framework.model.OrderCol;
import com.mortals.xhx.base.system.param.service.ParamService; import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.ActiveEnum;
import com.mortals.xhx.common.code.DeviceOnlineStatusEnum; import com.mortals.xhx.common.code.DeviceOnlineStatusEnum;
import com.mortals.xhx.common.code.DeviceTypeEnum; import com.mortals.xhx.common.code.DeviceTypeEnum;
import com.mortals.xhx.module.firm.model.FirmQuery; import com.mortals.xhx.module.firm.model.FirmQuery;
...@@ -70,14 +71,15 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic ...@@ -70,14 +71,15 @@ public class DeviceController extends BaseCRUDJsonMappingController<DeviceServic
this.addDict(model, "deviceType", deviceTypeMap); this.addDict(model, "deviceType", deviceTypeMap);
this.addDict(model, "deviceOnlineStatus", paramService.getParamBySecondOrganize("Device", "deviceOnlineStatus")); this.addDict(model, "deviceOnlineStatus", paramService.getParamBySecondOrganize("Device", "deviceOnlineStatus"));
this.addDict(model, "status", paramService.getParamBySecondOrganize("Device", "status")); this.addDict(model, "status", paramService.getParamBySecondOrganize("Device", "status"));
this.addDict(model, "active", paramService.getParamBySecondOrganize("Device", "active"));
this.addDict(model, "deviceFirmId", firmService.find(new FirmQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getFirmName()))); this.addDict(model, "deviceFirmId", firmService.find(new FirmQuery()).stream().collect(Collectors.toMap(x -> x.getId().toString(), y -> y.getFirmName())));
Map<Boolean, Long> collect = this.service.find(new DeviceQuery()).stream().collect(Collectors.partitioningBy(item -> (item.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.在线.getValue()), Collectors.counting())); Map<Boolean, Long> collect = this.service.find(new DeviceQuery().active(ActiveEnum.已激活.getValue())).stream().collect(Collectors.partitioningBy(item -> (item.getDeviceOnlineStatus() == DeviceOnlineStatusEnum.在线.getValue()), Collectors.counting()));
model.put("onlineCount", collect.get(true)); model.put("onlineCount", collect.get(true));
model.put("offlineCount", collect.get(false)); model.put("offlineCount", collect.get(false));
//离线设备 按类型分组 //离线设备 按类型分组
if (collect.get(false) > 0) { if (collect.get(false) > 0) {
Map<String, Long> collectTwo = this.service.find(new DeviceQuery().deviceOnlineStatus(DeviceOnlineStatusEnum.离线.getValue())).stream().collect(Collectors.groupingBy(x -> deviceTypeMap.get(x.getDeviceType().toString()), Collectors.counting())); Map<String, Long> collectTwo = this.service.find(new DeviceQuery().deviceOnlineStatus(DeviceOnlineStatusEnum.离线.getValue()).active(ActiveEnum.已激活.getValue())).stream().collect(Collectors.groupingBy(x -> deviceTypeMap.get(x.getDeviceType().toString()), Collectors.counting()));
model.put("offlineDeviceType", collectTwo); model.put("offlineDeviceType", collectTwo);
} }
super.init(request, response, form, model, context); super.init(request, response, form, model, context);
......
device-manager/src/main/java/com/mortals/xhx/module/firm/model/FirmEntity.java
View file @ 53a350d8
...@@ -7,71 +7,71 @@ import com.mortals.framework.annotation.Excel; ...@@ -7,71 +7,71 @@ import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong; import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.firm.model.vo.FirmVo; import com.mortals.xhx.module.firm.model.vo.FirmVo;
/** /**
* 设备生产厂商实体对象 * 设备生产厂商实体对象
* *
* @author zxfei * @author zxfei
* @date 2022-03-09 * @date 2022-04-11
*/ */
public class FirmEntity extends FirmVo { public class FirmEntity extends FirmVo {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** /**
* 设备生产厂商名称 * 设备生产厂商名称
*/ */
@Excel(name = "设备生产厂商名称") @Excel(name = "设备生产厂商名称")
private String firmName; private String firmName;
/** /**
* 设备生产商编码 * 设备生产商编码
*/ */
private String firmCode; private String firmCode;
/** /**
* 备注 * 备注
*/ */
private String firmRemark; private String firmRemark;
public FirmEntity(){} public FirmEntity(){}
/** /**
* 获取 设备生产厂商名称 * 获取 设备生产厂商名称
* @return String * @return String
*/ */
public String getFirmName(){ public String getFirmName(){
return firmName; return firmName;
} }
/** /**
* 设置 设备生产厂商名称 * 设置 设备生产厂商名称
* @param firmName * @param firmName
*/ */
public void setFirmName(String firmName){ public void setFirmName(String firmName){
this.firmName = firmName; this.firmName = firmName;
} }
/** /**
* 获取 设备生产商编码 * 获取 设备生产商编码
* @return String * @return String
*/ */
public String getFirmCode(){ public String getFirmCode(){
return firmCode; return firmCode;
} }
/** /**
* 设置 设备生产商编码 * 设置 设备生产商编码
* @param firmCode * @param firmCode
*/ */
public void setFirmCode(String firmCode){ public void setFirmCode(String firmCode){
this.firmCode = firmCode; this.firmCode = firmCode;
} }
/** /**
* 获取 备注 * 获取 备注
* @return String * @return String
*/ */
public String getFirmRemark(){ public String getFirmRemark(){
return firmRemark; return firmRemark;
} }
/** /**
* 设置 备注 * 设置 备注
* @param firmRemark * @param firmRemark
*/ */
public void setFirmRemark(String firmRemark){ public void setFirmRemark(String firmRemark){
this.firmRemark = firmRemark; this.firmRemark = firmRemark;
} }
...@@ -81,7 +81,7 @@ public class FirmEntity extends FirmVo { ...@@ -81,7 +81,7 @@ public class FirmEntity extends FirmVo {
@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) {
...@@ -89,7 +89,7 @@ public class FirmEntity extends FirmVo { ...@@ -89,7 +89,7 @@ public class FirmEntity extends FirmVo {
if (obj instanceof FirmEntity) { if (obj instanceof FirmEntity) {
FirmEntity tmp = (FirmEntity) obj; FirmEntity tmp = (FirmEntity) obj;
if (this.getId() == tmp.getId()) { if (this.getId() == tmp.getId()) {
return true; return true;
} }
} }
return false; return false;
...@@ -105,10 +105,10 @@ public class FirmEntity extends FirmVo { ...@@ -105,10 +105,10 @@ public class FirmEntity extends FirmVo {
public void initAttrValue(){ public void initAttrValue(){
this.firmName = ""; this.firmName = "";
this.firmCode = ""; this.firmCode = "";
this.firmRemark = ""; this.firmRemark = "";
} }
} }
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/firm/model/FirmQuery.java
View file @ 53a350d8
...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.firm.model; ...@@ -3,11 +3,11 @@ package com.mortals.xhx.module.firm.model;
import java.util.List; import java.util.List;
import com.mortals.xhx.module.firm.model.FirmEntity; import com.mortals.xhx.module.firm.model.FirmEntity;
/** /**
* 设备生产厂商查询对象 * 设备生产厂商查询对象
* *
* @author zxfei * @author zxfei
* @date 2022-03-09 * @date 2022-04-11
*/ */
public class FirmQuery extends FirmEntity { public class FirmQuery extends FirmEntity {
/** 开始 主键ID，主键，自增长 */ /** 开始 主键ID，主键，自增长 */
private Long idStart; private Long idStart;
...@@ -75,528 +75,528 @@ public class FirmQuery extends FirmEntity { ...@@ -75,528 +75,528 @@ public class FirmQuery extends FirmEntity {
public FirmQuery(){} public FirmQuery(){}
/** /**
* 获取 开始 主键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 firmNameList * @return firmNameList
*/ */
public List<String> getFirmNameList(){ public List<String> getFirmNameList(){
return this.firmNameList; return this.firmNameList;
} }
/** /**
* 设置 设备生产厂商名称 * 设置 设备生产厂商名称
* @param firmNameList * @param firmNameList
*/ */
public void setFirmNameList(List<String> firmNameList){ public void setFirmNameList(List<String> firmNameList){
this.firmNameList = firmNameList; this.firmNameList = firmNameList;
} }
/** /**
* 获取 设备生产商编码 * 获取 设备生产商编码
* @return firmCodeList * @return firmCodeList
*/ */
public List<String> getFirmCodeList(){ public List<String> getFirmCodeList(){
return this.firmCodeList; return this.firmCodeList;
} }
/** /**
* 设置 设备生产商编码 * 设置 设备生产商编码
* @param firmCodeList * @param firmCodeList
*/ */
public void setFirmCodeList(List<String> firmCodeList){ public void setFirmCodeList(List<String> firmCodeList){
this.firmCodeList = firmCodeList; this.firmCodeList = firmCodeList;
} }
/** /**
* 获取 备注 * 获取 备注
* @return firmRemarkList * @return firmRemarkList
*/ */
public List<String> getFirmRemarkList(){ public List<String> getFirmRemarkList(){
return this.firmRemarkList; return this.firmRemarkList;
} }
/** /**
* 设置 备注 * 设置 备注
* @param firmRemarkList * @param firmRemarkList
*/ */
public void setFirmRemarkList(List<String> firmRemarkList){ public void setFirmRemarkList(List<String> firmRemarkList){
this.firmRemarkList = firmRemarkList; this.firmRemarkList = firmRemarkList;
} }
/** /**
* 获取 开始 创建用户 * 获取 开始 创建用户
* @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 FirmQuery id(Long id){ public FirmQuery id(Long id){
setId(id); setId(id);
return this; return this;
} }
/** /**
* 设置 开始 主键ID，主键，自增长 * 设置 开始 主键ID，主键，自增长
* @param idStart * @param idStart
*/ */
public FirmQuery idStart(Long idStart){ public FirmQuery idStart(Long idStart){
this.idStart = idStart; this.idStart = idStart;
return this; return this;
} }
/** /**
* 设置 结束 主键ID，主键，自增长 * 设置 结束 主键ID，主键，自增长
* @param idEnd * @param idEnd
*/ */
public FirmQuery idEnd(Long idEnd){ public FirmQuery idEnd(Long idEnd){
this.idEnd = idEnd; this.idEnd = idEnd;
return this; return this;
} }
/** /**
* 设置 增加 主键ID，主键，自增长 * 设置 增加 主键ID，主键，自增长
* @param idIncrement * @param idIncrement
*/ */
public FirmQuery idIncrement(Long idIncrement){ public FirmQuery idIncrement(Long idIncrement){
this.idIncrement = idIncrement; this.idIncrement = idIncrement;
return this; return this;
} }
/** /**
* 设置 主键ID，主键，自增长 * 设置 主键ID，主键，自增长
* @param idList * @param idList
*/ */
public FirmQuery idList(List<Long> idList){ public FirmQuery idList(List<Long> idList){
this.idList = idList; this.idList = idList;
return this; return this;
} }
/** /**
* 设置 设备生产厂商名称 * 设置 设备生产厂商名称
* @param firmName * @param firmName
*/ */
public FirmQuery firmName(String firmName){ public FirmQuery firmName(String firmName){
setFirmName(firmName); setFirmName(firmName);
return this; return this;
} }
/** /**
* 设置 设备生产厂商名称 * 设置 设备生产厂商名称
* @param firmNameList * @param firmNameList
*/ */
public FirmQuery firmNameList(List<String> firmNameList){ public FirmQuery firmNameList(List<String> firmNameList){
this.firmNameList = firmNameList; this.firmNameList = firmNameList;
return this; return this;
} }
/** /**
* 设置 设备生产商编码 * 设置 设备生产商编码
* @param firmCode * @param firmCode
*/ */
public FirmQuery firmCode(String firmCode){ public FirmQuery firmCode(String firmCode){
setFirmCode(firmCode); setFirmCode(firmCode);
return this; return this;
} }
/** /**
* 设置 设备生产商编码 * 设置 设备生产商编码
* @param firmCodeList * @param firmCodeList
*/ */
public FirmQuery firmCodeList(List<String> firmCodeList){ public FirmQuery firmCodeList(List<String> firmCodeList){
this.firmCodeList = firmCodeList; this.firmCodeList = firmCodeList;
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param firmRemark * @param firmRemark
*/ */
public FirmQuery firmRemark(String firmRemark){ public FirmQuery firmRemark(String firmRemark){
setFirmRemark(firmRemark); setFirmRemark(firmRemark);
return this; return this;
} }
/** /**
* 设置 备注 * 设置 备注
* @param firmRemarkList * @param firmRemarkList
*/ */
public FirmQuery firmRemarkList(List<String> firmRemarkList){ public FirmQuery firmRemarkList(List<String> firmRemarkList){
this.firmRemarkList = firmRemarkList; this.firmRemarkList = firmRemarkList;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserId * @param createUserId
*/ */
public FirmQuery createUserId(Long createUserId){ public FirmQuery createUserId(Long createUserId){
setCreateUserId(createUserId); setCreateUserId(createUserId);
return this; return this;
} }
/** /**
* 设置 开始 创建用户 * 设置 开始 创建用户
* @param createUserIdStart * @param createUserIdStart
*/ */
public FirmQuery createUserIdStart(Long createUserIdStart){ public FirmQuery createUserIdStart(Long createUserIdStart){
this.createUserIdStart = createUserIdStart; this.createUserIdStart = createUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 创建用户 * 设置 结束 创建用户
* @param createUserIdEnd * @param createUserIdEnd
*/ */
public FirmQuery createUserIdEnd(Long createUserIdEnd){ public FirmQuery createUserIdEnd(Long createUserIdEnd){
this.createUserIdEnd = createUserIdEnd; this.createUserIdEnd = createUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 创建用户 * 设置 增加 创建用户
* @param createUserIdIncrement * @param createUserIdIncrement
*/ */
public FirmQuery createUserIdIncrement(Long createUserIdIncrement){ public FirmQuery createUserIdIncrement(Long createUserIdIncrement){
this.createUserIdIncrement = createUserIdIncrement; this.createUserIdIncrement = createUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 创建用户 * 设置 创建用户
* @param createUserIdList * @param createUserIdList
*/ */
public FirmQuery createUserIdList(List<Long> createUserIdList){ public FirmQuery createUserIdList(List<Long> createUserIdList){
this.createUserIdList = createUserIdList; this.createUserIdList = createUserIdList;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserId * @param updateUserId
*/ */
public FirmQuery updateUserId(Long updateUserId){ public FirmQuery updateUserId(Long updateUserId){
setUpdateUserId(updateUserId); setUpdateUserId(updateUserId);
return this; return this;
} }
/** /**
* 设置 开始 更新用户 * 设置 开始 更新用户
* @param updateUserIdStart * @param updateUserIdStart
*/ */
public FirmQuery updateUserIdStart(Long updateUserIdStart){ public FirmQuery updateUserIdStart(Long updateUserIdStart){
this.updateUserIdStart = updateUserIdStart; this.updateUserIdStart = updateUserIdStart;
return this; return this;
} }
/** /**
* 设置 结束 更新用户 * 设置 结束 更新用户
* @param updateUserIdEnd * @param updateUserIdEnd
*/ */
public FirmQuery updateUserIdEnd(Long updateUserIdEnd){ public FirmQuery updateUserIdEnd(Long updateUserIdEnd){
this.updateUserIdEnd = updateUserIdEnd; this.updateUserIdEnd = updateUserIdEnd;
return this; return this;
} }
/** /**
* 设置 增加 更新用户 * 设置 增加 更新用户
* @param updateUserIdIncrement * @param updateUserIdIncrement
*/ */
public FirmQuery updateUserIdIncrement(Long updateUserIdIncrement){ public FirmQuery updateUserIdIncrement(Long updateUserIdIncrement){
this.updateUserIdIncrement = updateUserIdIncrement; this.updateUserIdIncrement = updateUserIdIncrement;
return this; return this;
} }
/** /**
* 设置 更新用户 * 设置 更新用户
* @param updateUserIdList * @param updateUserIdList
*/ */
public FirmQuery updateUserIdList(List<Long> updateUserIdList){ public FirmQuery 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<FirmQuery> getOrConditionList(){ public List<FirmQuery> 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<FirmQuery> orConditionList){ public void setOrConditionList(List<FirmQuery> 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<FirmQuery> getAndConditionList(){ public List<FirmQuery> 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<FirmQuery> andConditionList){ public void setAndConditionList(List<FirmQuery> andConditionList){
this.andConditionList = andConditionList; this.andConditionList = andConditionList;
} }
......
device-manager/src/main/resources/bootstrap.yml
View file @ 53a350d8
...@@ -95,3 +95,12 @@ queue: ...@@ -95,3 +95,12 @@ queue:
handshake_timeout: 10000 handshake_timeout: 10000
queue-properties: queue-properties:
core: x-max-length-bytes:1048576000;x-message-ttl:604800000 core: x-max-length-bytes:1048576000;x-message-ttl:604800000
# token配置
token:
# 令牌自定义标识
header: Authorization
# 令牌密钥
secret: abcd1234
# 令牌有效期（默认60分钟）
expireTime: 60
device-manager/src/main/resources/sqlmap/module/device/DeviceLogMapper.xml
View file @ 53a350d8
<?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.device.dao.ibatis.DeviceLogDaoImpl"> <mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceLogDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="DeviceLogEntity" id="DeviceLogEntity-Map"> <resultMap type="DeviceLogEntity" id="DeviceLogEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<id property="deviceId" column="deviceId" /> <result property="deviceId" column="deviceId" />
<result property="deviceNum" column="deviceNum" /> <result property="deviceNum" column="deviceNum" />
<result property="deviceName" column="deviceName" /> <result property="deviceName" column="deviceName" />
<result property="logType" column="logType" /> <result property="logType" column="logType" />
<result property="content" column="content" /> <result property="content" column="content" />
<result property="createTime" column="createTime" /> <result property="createTime" column="createTime" />
</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 as id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceId') or colPickMode == 1 and data.containsKey('deviceId')))">
a.deviceId as deviceId, a.deviceId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceNum') or colPickMode == 1 and data.containsKey('deviceNum')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceNum') or colPickMode == 1 and data.containsKey('deviceNum')))">
a.deviceNum as deviceNum, a.deviceNum,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
a.deviceName as deviceName, a.deviceName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logType') or colPickMode == 1 and data.containsKey('logType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('logType') or colPickMode == 1 and data.containsKey('logType')))">
a.logType as logType, a.logType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('content') or colPickMode == 1 and data.containsKey('content')))">
a.content as content, a.content,
</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 as createTime, a.createTime,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
...@@ -102,58 +102,58 @@ ...@@ -102,58 +102,58 @@
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_xhx_device_log as a update mortals_xhx_device_log as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="deviceId=(case" suffix="ELSE deviceId end),"> <trim prefix="deviceId=(case" suffix="ELSE deviceId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('deviceId')) or (colPickMode==1 and !item.containsKey('deviceId'))"> <when test="(colPickMode==0 and item.containsKey('deviceId')) or (colPickMode==1 and !item.containsKey('deviceId'))">
when a.id=#{item.id} then #{item.deviceId} when a.id=#{item.id} then #{item.deviceId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('deviceIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('deviceIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceIdIncrement'))">
when a.id=#{item.id} then ifnull(a.deviceId,0) + #{item.deviceIdIncrement} when a.id=#{item.id} then ifnull(a.deviceId,0) + #{item.deviceIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceNum=(case" suffix="ELSE deviceNum end),"> <trim prefix="deviceNum=(case" suffix="ELSE deviceNum 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('deviceNum')) or (colPickMode==1 and !item.containsKey('deviceNum'))"> <if test="(colPickMode==0 and item.containsKey('deviceNum')) or (colPickMode==1 and !item.containsKey('deviceNum'))">
when a.id=#{item.id} then #{item.deviceNum} when a.id=#{item.id} then #{item.deviceNum}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceName=(case" suffix="ELSE deviceName end),"> <trim prefix="deviceName=(case" suffix="ELSE deviceName 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('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))"> <if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))">
when a.id=#{item.id} then #{item.deviceName} when a.id=#{item.id} then #{item.deviceName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="logType=(case" suffix="ELSE logType end),"> <trim prefix="logType=(case" suffix="ELSE logType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('logType')) or (colPickMode==1 and !item.containsKey('logType'))"> <when test="(colPickMode==0 and item.containsKey('logType')) or (colPickMode==1 and !item.containsKey('logType'))">
when a.id=#{item.id} then #{item.logType} when a.id=#{item.id} then #{item.logType}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('logTypeIncrement')) or (colPickMode==1 and !item.containsKey('logTypeIncrement'))"> <when test="(colPickMode==0 and item.containsKey('logTypeIncrement')) or (colPickMode==1 and !item.containsKey('logTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.logType,0) + #{item.logTypeIncrement} when a.id=#{item.id} then ifnull(a.logType,0) + #{item.logTypeIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="content=(case" suffix="ELSE content end),"> <trim prefix="content=(case" suffix="ELSE content 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('content')) or (colPickMode==1 and !item.containsKey('content'))"> <if test="(colPickMode==0 and item.containsKey('content')) or (colPickMode==1 and !item.containsKey('content'))">
when a.id=#{item.id} then #{item.content} when a.id=#{item.id} then #{item.content}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime 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('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime} when a.id=#{item.id} then #{item.createTime}
</if> </if>
</foreach> </foreach>
</trim> </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=")">
...@@ -255,177 +255,177 @@ ...@@ -255,177 +255,177 @@
${_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('deviceId')"> <if test="conditionParamRef.containsKey('deviceId')">
<if test="conditionParamRef.deviceId != null "> <if test="conditionParamRef.deviceId != null ">
${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId} ${_conditionType_} a.deviceId = #{${_conditionParam_}.deviceId}
</if>
<if test="conditionParamRef.deviceId == null">
${_conditionType_} a.deviceId is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceIdList')">
${_conditionType_} a.deviceId in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null"> <if test="conditionParamRef.deviceId == null">
${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart} ${_conditionType_} a.deviceId is null
</if>
<if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null">
${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd}
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceIdList')">
${_conditionType_} a.deviceId in
<foreach collection="conditionParamRef.deviceIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceIdStart') and conditionParamRef.deviceIdStart != null">
${_conditionType_} a.deviceId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceIdStart}
</if>
<if test="conditionParamRef.containsKey('deviceIdEnd') and conditionParamRef.deviceIdEnd != null">
${_conditionType_} a.deviceId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceIdEnd}
</if>
<if test="conditionParamRef.containsKey('deviceNum')"> <if test="conditionParamRef.containsKey('deviceNum')">
<if test="conditionParamRef.deviceNum != null and conditionParamRef.deviceNum != ''"> <if test="conditionParamRef.deviceNum != null and conditionParamRef.deviceNum != ''">
${_conditionType_} a.deviceNum like #{${_conditionParam_}.deviceNum} ${_conditionType_} a.deviceNum like #{${_conditionParam_}.deviceNum}
</if>
<if test="conditionParamRef.deviceNum == null">
${_conditionType_} a.deviceNum is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceNumList')"> <if test="conditionParamRef.deviceNum == null">
${_conditionType_} a.deviceNum in ${_conditionType_} a.deviceNum is null
<foreach collection="conditionParamRef.deviceNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceNumList')">
${_conditionType_} a.deviceNum in
<foreach collection="conditionParamRef.deviceNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceName')"> <if test="conditionParamRef.containsKey('deviceName')">
<if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''"> <if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''">
${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName} ${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName}
</if>
<if test="conditionParamRef.deviceName == null">
${_conditionType_} a.deviceName is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceNameList')">
${_conditionType_} a.deviceName in
<foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('logType')"> <if test="conditionParamRef.deviceName == null">
<if test="conditionParamRef.logType != null "> ${_conditionType_} a.deviceName is null
${_conditionType_} a.logType = #{${_conditionParam_}.logType}
</if>
<if test="conditionParamRef.logType == null">
${_conditionType_} a.logType is null
</if>
</if>
<if test="conditionParamRef.containsKey('logTypeList')">
${_conditionType_} a.logType in
<foreach collection="conditionParamRef.logTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('logTypeStart') and conditionParamRef.logTypeStart != null"> </if>
${_conditionType_} a.logType <![CDATA[ >= ]]> #{${_conditionParam_}.logTypeStart} <if test="conditionParamRef.containsKey('deviceNameList')">
${_conditionType_} a.deviceName in
<foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('logType')">
<if test="conditionParamRef.logType != null ">
${_conditionType_} a.logType = #{${_conditionParam_}.logType}
</if> </if>
<if test="conditionParamRef.containsKey('logTypeEnd') and conditionParamRef.logTypeEnd != null"> <if test="conditionParamRef.logType == null">
${_conditionType_} a.logType <![CDATA[ <= ]]> #{${_conditionParam_}.logTypeEnd} ${_conditionType_} a.logType is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('logTypeList')">
${_conditionType_} a.logType in
<foreach collection="conditionParamRef.logTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('logTypeStart') and conditionParamRef.logTypeStart != null">
${_conditionType_} a.logType <![CDATA[ >= ]]> #{${_conditionParam_}.logTypeStart}
</if>
<if test="conditionParamRef.containsKey('logTypeEnd') and conditionParamRef.logTypeEnd != null">
${_conditionType_} a.logType <![CDATA[ <= ]]> #{${_conditionParam_}.logTypeEnd}
</if>
<if test="conditionParamRef.containsKey('content')"> <if test="conditionParamRef.containsKey('content')">
<if test="conditionParamRef.content != null and conditionParamRef.content != ''"> <if test="conditionParamRef.content != null and conditionParamRef.content != ''">
${_conditionType_} a.content like #{${_conditionParam_}.content} ${_conditionType_} a.content like #{${_conditionParam_}.content}
</if>
<if test="conditionParamRef.content == null">
${_conditionType_} a.content is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('contentList')"> <if test="conditionParamRef.content == null">
${_conditionType_} a.content in ${_conditionType_} a.content is null
<foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('contentList')">
${_conditionType_} a.content in
<foreach collection="conditionParamRef.contentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</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>
</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 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>
</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('deviceId')"> <if test="orderCol.containsKey('deviceId')">
a.deviceId a.deviceId
<if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if> <if test='orderCol.deviceId != null and "DESC".equalsIgnoreCase(orderCol.deviceId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceNum')"> <if test="orderCol.containsKey('deviceNum')">
a.deviceNum a.deviceNum
<if test='orderCol.deviceNum != null and "DESC".equalsIgnoreCase(orderCol.deviceNum)'>DESC</if> <if test='orderCol.deviceNum != null and "DESC".equalsIgnoreCase(orderCol.deviceNum)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceName')"> <if test="orderCol.containsKey('deviceName')">
a.deviceName a.deviceName
<if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if> <if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('logType')"> <if test="orderCol.containsKey('logType')">
a.logType a.logType
<if test='orderCol.logType != null and "DESC".equalsIgnoreCase(orderCol.logType)'>DESC</if> <if test='orderCol.logType != null and "DESC".equalsIgnoreCase(orderCol.logType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('content')"> <if test="orderCol.containsKey('content')">
a.content a.content
<if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>DESC</if> <if test='orderCol.content != null and "DESC".equalsIgnoreCase(orderCol.content)'>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>
</trim> </trim>
</if> </if>
</sql> </sql>
......
device-manager/src/main/resources/sqlmap/module/device/DeviceMapper.xml
View file @ 53a350d8
<?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.device.dao.ibatis.DeviceDaoImpl"> <mapper namespace="com.mortals.xhx.module.device.dao.ibatis.DeviceDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="DeviceEntity" id="DeviceEntity-Map"> <resultMap type="DeviceEntity" id="DeviceEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="deviceName" column="deviceName" /> <result property="deviceName" column="deviceName" />
<result property="deviceCode" column="deviceCode" /> <result property="deviceCode" column="deviceCode" />
<result property="deviceType" column="deviceType" /> <result property="deviceType" column="deviceType" />
<result property="deviceMac" column="deviceMac" /> <result property="deviceMac" column="deviceMac" />
<result property="ip" column="ip" /> <result property="ip" column="ip" />
<result property="centernum" column="centernum" /> <result property="centernum" column="centernum" />
<result property="port" column="port" /> <result property="port" column="port" />
<result property="siteNum" column="siteNum" /> <result property="siteNum" column="siteNum" />
<result property="deviceFirmId" column="deviceFirmId" /> <result property="deviceFirmId" column="deviceFirmId" />
<result property="deviceFirmname" column="deviceFirmname" /> <result property="deviceFirmname" column="deviceFirmname" />
<result property="deviceOnlineStatus" column="deviceOnlineStatus" /> <result property="deviceOnlineStatus" column="deviceOnlineStatus" />
<result property="status" column="status" /> <result property="status" column="status" />
<result property="deviceRemark" column="deviceRemark" /> <result property="active" column="active" />
<result property="onlineTime" column="onlineTime" /> <result property="deviceRemark" column="deviceRemark" />
<result property="offlineTime" column="offlineTime" /> <result property="onlineTime" column="onlineTime" />
<result property="createUserId" column="createUserId" /> <result property="offlineTime" column="offlineTime" />
<result property="createTime" column="createTime" /> <result property="createUserId" column="createUserId" />
<result property="updateUserId" column="updateUserId" /> <result property="createTime" column="createTime" />
<result property="updateTime" column="updateTime" /> <result property="updateUserId" column="updateUserId" />
<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 as id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
a.deviceName as deviceName, a.deviceName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))">
a.deviceCode as deviceCode, a.deviceCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceType') or colPickMode == 1 and data.containsKey('deviceType')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceType') or colPickMode == 1 and data.containsKey('deviceType')))">
a.deviceType as deviceType, a.deviceType,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceMac') or colPickMode == 1 and data.containsKey('deviceMac')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceMac') or colPickMode == 1 and data.containsKey('deviceMac')))">
a.deviceMac as deviceMac, a.deviceMac,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ip') or colPickMode == 1 and data.containsKey('ip')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('ip') or colPickMode == 1 and data.containsKey('ip')))">
a.ip as ip, a.ip,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('centernum') or colPickMode == 1 and data.containsKey('centernum')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('centernum') or colPickMode == 1 and data.containsKey('centernum')))">
a.centernum as centernum, a.centernum,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('port') or colPickMode == 1 and data.containsKey('port')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('port') or colPickMode == 1 and data.containsKey('port')))">
a.port as port, a.port,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteNum') or colPickMode == 1 and data.containsKey('siteNum')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteNum') or colPickMode == 1 and data.containsKey('siteNum')))">
a.siteNum as siteNum, a.siteNum,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmId') or colPickMode == 1 and data.containsKey('deviceFirmId')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmId') or colPickMode == 1 and data.containsKey('deviceFirmId')))">
a.deviceFirmId as deviceFirmId, a.deviceFirmId,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmname') or colPickMode == 1 and data.containsKey('deviceFirmname')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceFirmname') or colPickMode == 1 and data.containsKey('deviceFirmname')))">
a.deviceFirmname as deviceFirmname, a.deviceFirmname,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceOnlineStatus') or colPickMode == 1 and data.containsKey('deviceOnlineStatus')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceOnlineStatus') or colPickMode == 1 and data.containsKey('deviceOnlineStatus')))">
a.deviceOnlineStatus as deviceOnlineStatus, a.deviceOnlineStatus,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('status') or colPickMode == 1 and data.containsKey('status')))">
a.status as status, a.status,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceRemark') or colPickMode == 1 and data.containsKey('deviceRemark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('active') or colPickMode == 1 and data.containsKey('active')))">
a.deviceRemark as deviceRemark, a.active,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onlineTime') or colPickMode == 1 and data.containsKey('onlineTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceRemark') or colPickMode == 1 and data.containsKey('deviceRemark')))">
a.onlineTime as onlineTime, a.deviceRemark,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('offlineTime') or colPickMode == 1 and data.containsKey('offlineTime')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('onlineTime') or colPickMode == 1 and data.containsKey('onlineTime')))">
a.offlineTime as offlineTime, a.onlineTime,
</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('offlineTime') or colPickMode == 1 and data.containsKey('offlineTime')))">
a.createUserId as createUserId, a.offlineTime,
</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('createUserId') or colPickMode == 1 and data.containsKey('createUserId')))">
a.createTime as createTime, a.createUserId,
</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('createTime') or colPickMode == 1 and data.containsKey('createTime')))">
a.updateUserId as updateUserId, a.createTime,
</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('updateUserId') or colPickMode == 1 and data.containsKey('updateUserId')))">
a.updateTime as updateTime, 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')))">
a.updateTime,
</if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="DeviceEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_stp_device insert into mortals_xhx_device
(deviceName,deviceCode,deviceType,deviceMac,ip,centernum,port,siteNum,deviceFirmId,deviceFirmname,deviceOnlineStatus,status,deviceRemark,onlineTime,offlineTime,createUserId,createTime,updateUserId,updateTime) (deviceName,deviceCode,deviceType,deviceMac,ip,centernum,port,siteNum,deviceFirmId,deviceFirmname,deviceOnlineStatus,status,active,deviceRemark,onlineTime,offlineTime,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{deviceName},#{deviceCode},#{deviceType},#{deviceMac},#{ip},#{centernum},#{port},#{siteNum},#{deviceFirmId},#{deviceFirmname},#{deviceOnlineStatus},#{status},#{deviceRemark},#{onlineTime},#{offlineTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{deviceName},#{deviceCode},#{deviceType},#{deviceMac},#{ip},#{centernum},#{port},#{siteNum},#{deviceFirmId},#{deviceFirmname},#{deviceOnlineStatus},#{status},#{active},#{deviceRemark},#{onlineTime},#{offlineTime},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
</insert> </insert>
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_stp_device insert into mortals_xhx_device
(deviceName,deviceCode,deviceType,deviceMac,ip,centernum,port,siteNum,deviceFirmId,deviceFirmname,deviceOnlineStatus,status,deviceRemark,onlineTime,offlineTime,createUserId,createTime,updateUserId,updateTime) (deviceName,deviceCode,deviceType,deviceMac,ip,centernum,port,siteNum,deviceFirmId,deviceFirmname,deviceOnlineStatus,status,active,deviceRemark,onlineTime,offlineTime,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.deviceType},#{item.deviceMac},#{item.ip},#{item.centernum},#{item.port},#{item.siteNum},#{item.deviceFirmId},#{item.deviceFirmname},#{item.deviceOnlineStatus},#{item.status},#{item.deviceRemark},#{item.onlineTime},#{item.offlineTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime}) (#{item.deviceName},#{item.deviceCode},#{item.deviceType},#{item.deviceMac},#{item.ip},#{item.centernum},#{item.port},#{item.siteNum},#{item.deviceFirmId},#{item.deviceFirmname},#{item.deviceOnlineStatus},#{item.status},#{item.active},#{item.deviceRemark},#{item.onlineTime},#{item.offlineTime},#{item.createUserId},#{item.createTime},#{item.updateUserId},#{item.updateTime})
</foreach> </foreach>
</insert> </insert>
<!-- 根据ParamDto更新 --> <!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto"> <update id="update" parameterType="paramDto">
update mortals_stp_device as a update mortals_xhx_device as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('deviceName')) or (colPickMode==1 and !data.containsKey('deviceName'))"> <if test="(colPickMode==0 and data.containsKey('deviceName')) or (colPickMode==1 and !data.containsKey('deviceName'))">
...@@ -166,6 +170,12 @@ ...@@ -166,6 +170,12 @@
<if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))"> <if test="(colPickMode==0 and data.containsKey('statusIncrement')) or (colPickMode==1 and !data.containsKey('statusIncrement'))">
a.status=ifnull(a.status,0) + #{data.statusIncrement}, a.status=ifnull(a.status,0) + #{data.statusIncrement},
</if> </if>
<if test="(colPickMode==0 and data.containsKey('active')) or (colPickMode==1 and !data.containsKey('active'))">
a.active=#{data.active},
</if>
<if test="(colPickMode==0 and data.containsKey('activeIncrement')) or (colPickMode==1 and !data.containsKey('activeIncrement'))">
a.active=ifnull(a.active,0) + #{data.activeIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceRemark')) or (colPickMode==1 and !data.containsKey('deviceRemark'))"> <if test="(colPickMode==0 and data.containsKey('deviceRemark')) or (colPickMode==1 and !data.containsKey('deviceRemark'))">
a.deviceRemark=#{data.deviceRemark}, a.deviceRemark=#{data.deviceRemark},
</if> </if>
...@@ -203,171 +213,183 @@ ...@@ -203,171 +213,183 @@
</update> </update>
<!-- 批量更新 --> <!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_stp_device as a update mortals_xhx_device as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="deviceName=(case" suffix="ELSE deviceName end),"> <trim prefix="deviceName=(case" suffix="ELSE deviceName 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('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))"> <if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))">
when a.id=#{item.id} then #{item.deviceName} when a.id=#{item.id} then #{item.deviceName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceCode=(case" suffix="ELSE deviceCode end),"> <trim prefix="deviceCode=(case" suffix="ELSE deviceCode 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('deviceCode')) or (colPickMode==1 and !item.containsKey('deviceCode'))"> <if test="(colPickMode==0 and item.containsKey('deviceCode')) or (colPickMode==1 and !item.containsKey('deviceCode'))">
when a.id=#{item.id} then #{item.deviceCode} when a.id=#{item.id} then #{item.deviceCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceType=(case" suffix="ELSE deviceType end),"> <trim prefix="deviceType=(case" suffix="ELSE deviceType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('deviceType')) or (colPickMode==1 and !item.containsKey('deviceType'))"> <when test="(colPickMode==0 and item.containsKey('deviceType')) or (colPickMode==1 and !item.containsKey('deviceType'))">
when a.id=#{item.id} then #{item.deviceType} when a.id=#{item.id} then #{item.deviceType}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('deviceTypeIncrement')) or (colPickMode==1 and !item.containsKey('deviceTypeIncrement'))"> <when test="(colPickMode==0 and item.containsKey('deviceTypeIncrement')) or (colPickMode==1 and !item.containsKey('deviceTypeIncrement'))">
when a.id=#{item.id} then ifnull(a.deviceType,0) + #{item.deviceTypeIncrement} when a.id=#{item.id} then ifnull(a.deviceType,0) + #{item.deviceTypeIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceMac=(case" suffix="ELSE deviceMac end),"> <trim prefix="deviceMac=(case" suffix="ELSE deviceMac end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceMac')) or (colPickMode==1 and !item.containsKey('deviceMac'))"> <if test="(colPickMode==0 and item.containsKey('deviceMac')) or (colPickMode==1 and !item.containsKey('deviceMac'))">
when a.id=#{item.id} then #{item.deviceMac} when a.id=#{item.id} then #{item.deviceMac}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="ip=(case" suffix="ELSE ip end),"> <trim prefix="ip=(case" suffix="ELSE ip 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('ip')) or (colPickMode==1 and !item.containsKey('ip'))"> <if test="(colPickMode==0 and item.containsKey('ip')) or (colPickMode==1 and !item.containsKey('ip'))">
when a.id=#{item.id} then #{item.ip} when a.id=#{item.id} then #{item.ip}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="centernum=(case" suffix="ELSE centernum end),"> <trim prefix="centernum=(case" suffix="ELSE centernum 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('centernum')) or (colPickMode==1 and !item.containsKey('centernum'))"> <if test="(colPickMode==0 and item.containsKey('centernum')) or (colPickMode==1 and !item.containsKey('centernum'))">
when a.id=#{item.id} then #{item.centernum} when a.id=#{item.id} then #{item.centernum}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="port=(case" suffix="ELSE port end),"> <trim prefix="port=(case" suffix="ELSE port 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('port')) or (colPickMode==1 and !item.containsKey('port'))"> <if test="(colPickMode==0 and item.containsKey('port')) or (colPickMode==1 and !item.containsKey('port'))">
when a.id=#{item.id} then #{item.port} when a.id=#{item.id} then #{item.port}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="siteNum=(case" suffix="ELSE siteNum end),"> <trim prefix="siteNum=(case" suffix="ELSE siteNum 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('siteNum')) or (colPickMode==1 and !item.containsKey('siteNum'))"> <if test="(colPickMode==0 and item.containsKey('siteNum')) or (colPickMode==1 and !item.containsKey('siteNum'))">
when a.id=#{item.id} then #{item.siteNum} when a.id=#{item.id} then #{item.siteNum}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceFirmId=(case" suffix="ELSE deviceFirmId end),"> <trim prefix="deviceFirmId=(case" suffix="ELSE deviceFirmId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('deviceFirmId')) or (colPickMode==1 and !item.containsKey('deviceFirmId'))"> <when test="(colPickMode==0 and item.containsKey('deviceFirmId')) or (colPickMode==1 and !item.containsKey('deviceFirmId'))">
when a.id=#{item.id} then #{item.deviceFirmId} when a.id=#{item.id} then #{item.deviceFirmId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('deviceFirmIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceFirmIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('deviceFirmIdIncrement')) or (colPickMode==1 and !item.containsKey('deviceFirmIdIncrement'))">
when a.id=#{item.id} then ifnull(a.deviceFirmId,0) + #{item.deviceFirmIdIncrement} when a.id=#{item.id} then ifnull(a.deviceFirmId,0) + #{item.deviceFirmIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceFirmname=(case" suffix="ELSE deviceFirmname end),"> <trim prefix="deviceFirmname=(case" suffix="ELSE deviceFirmname 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('deviceFirmname')) or (colPickMode==1 and !item.containsKey('deviceFirmname'))"> <if test="(colPickMode==0 and item.containsKey('deviceFirmname')) or (colPickMode==1 and !item.containsKey('deviceFirmname'))">
when a.id=#{item.id} then #{item.deviceFirmname} when a.id=#{item.id} then #{item.deviceFirmname}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceOnlineStatus=(case" suffix="ELSE deviceOnlineStatus end),"> <trim prefix="deviceOnlineStatus=(case" suffix="ELSE deviceOnlineStatus end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('deviceOnlineStatus')) or (colPickMode==1 and !item.containsKey('deviceOnlineStatus'))"> <when test="(colPickMode==0 and item.containsKey('deviceOnlineStatus')) or (colPickMode==1 and !item.containsKey('deviceOnlineStatus'))">
when a.id=#{item.id} then #{item.deviceOnlineStatus} when a.id=#{item.id} then #{item.deviceOnlineStatus}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('deviceOnlineStatusIncrement')) or (colPickMode==1 and !item.containsKey('deviceOnlineStatusIncrement'))"> <when test="(colPickMode==0 and item.containsKey('deviceOnlineStatusIncrement')) or (colPickMode==1 and !item.containsKey('deviceOnlineStatusIncrement'))">
when a.id=#{item.id} then ifnull(a.deviceOnlineStatus,0) + #{item.deviceOnlineStatusIncrement} when a.id=#{item.id} then ifnull(a.deviceOnlineStatus,0) + #{item.deviceOnlineStatusIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="status=(case" suffix="ELSE status end),"> <trim prefix="status=(case" suffix="ELSE status end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))"> <when test="(colPickMode==0 and item.containsKey('status')) or (colPickMode==1 and !item.containsKey('status'))">
when a.id=#{item.id} then #{item.status} when a.id=#{item.id} then #{item.status}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))"> <when test="(colPickMode==0 and item.containsKey('statusIncrement')) or (colPickMode==1 and !item.containsKey('statusIncrement'))">
when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement} when a.id=#{item.id} then ifnull(a.status,0) + #{item.statusIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="deviceRemark=(case" suffix="ELSE deviceRemark end),"> <trim prefix="active=(case" suffix="ELSE active 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('deviceRemark')) or (colPickMode==1 and !item.containsKey('deviceRemark'))"> <choose>
when a.id=#{item.id} then #{item.deviceRemark} <when test="(colPickMode==0 and item.containsKey('active')) or (colPickMode==1 and !item.containsKey('active'))">
</if> when a.id=#{item.id} then #{item.active}
</foreach> </when>
</trim> <when test="(colPickMode==0 and item.containsKey('activeIncrement')) or (colPickMode==1 and !item.containsKey('activeIncrement'))">
<trim prefix="onlineTime=(case" suffix="ELSE onlineTime end),"> when a.id=#{item.id} then ifnull(a.active,0) + #{item.activeIncrement}
<foreach collection="data.dataList" item="item" index="index" separator="" > </when>
<if test="(colPickMode==0 and item.containsKey('onlineTime')) or (colPickMode==1 and !item.containsKey('onlineTime'))"> </choose>
when a.id=#{item.id} then #{item.onlineTime} </foreach>
</if> </trim>
</foreach> <trim prefix="deviceRemark=(case" suffix="ELSE deviceRemark end),">
</trim> <foreach collection="data.dataList" item="item" index="index" separator="" >
<trim prefix="offlineTime=(case" suffix="ELSE offlineTime end),"> <if test="(colPickMode==0 and item.containsKey('deviceRemark')) or (colPickMode==1 and !item.containsKey('deviceRemark'))">
<foreach collection="data.dataList" item="item" index="index" separator="" > when a.id=#{item.id} then #{item.deviceRemark}
<if test="(colPickMode==0 and item.containsKey('offlineTime')) or (colPickMode==1 and !item.containsKey('offlineTime'))"> </if>
when a.id=#{item.id} then #{item.offlineTime} </foreach>
</if> </trim>
</foreach> <trim prefix="onlineTime=(case" suffix="ELSE onlineTime 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('onlineTime')) or (colPickMode==1 and !item.containsKey('onlineTime'))">
<foreach collection="data.dataList" item="item" index="index" separator="" > when a.id=#{item.id} then #{item.onlineTime}
<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="offlineTime=(case" suffix="ELSE offlineTime 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} <if test="(colPickMode==0 and item.containsKey('offlineTime')) or (colPickMode==1 and !item.containsKey('offlineTime'))">
</when> when a.id=#{item.id} then #{item.offlineTime}
</choose> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime 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="" >
<if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <choose>
when a.id=#{item.id} then #{item.createTime} <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
</if> 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="updateUserId=(case" suffix="ELSE updateUserId end),"> when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
<foreach collection="data.dataList" item="item" index="index" separator="" > </when>
<choose> </choose>
<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="createTime=(case" suffix="ELSE createTime 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} <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
</when> when a.id=#{item.id} then #{item.createTime}
</choose> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="updateUserId=(case" suffix="ELSE updateUserId 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('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <choose>
when a.id=#{item.id} then #{item.updateTime} <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
</if> 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'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),">
<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=")">
...@@ -377,23 +399,23 @@ ...@@ -377,23 +399,23 @@
<!-- 根据主健查询 --> <!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="DeviceEntity-Map"> <select id="getByKey" parameterType="paramDto" resultMap="DeviceEntity-Map">
select <include refid="_columns"/> select <include refid="_columns"/>
from mortals_stp_device as a from mortals_xhx_device as a
where a.id=#{condition.id} where a.id=#{condition.id}
</select> </select>
<!-- 根据主健删除 --> <!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto"> <delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_stp_device as a where a.id=#{condition.id} delete a.* from mortals_xhx_device as a where a.id=#{condition.id}
</delete> </delete>
<!-- 根据主健删除一批，针对单一主健有效 --> <!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys"> <delete id="deleteByKeys">
delete from mortals_stp_device where id in delete from mortals_xhx_device where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")"> <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_stp_device as a delete a.* from mortals_xhx_device as a
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
...@@ -404,7 +426,7 @@ ...@@ -404,7 +426,7 @@
<!-- 获取列表 --> <!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="DeviceEntity-Map"> <select id="getList" parameterType="paramDto" resultMap="DeviceEntity-Map">
select <include refid="_columns"/> select <include refid="_columns"/>
from mortals_stp_device as a from mortals_xhx_device as a
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
...@@ -419,7 +441,7 @@ ...@@ -419,7 +441,7 @@
<!-- 获取 --> <!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int"> <select id="getListCount" parameterType="paramDto" resultType="int">
select count(1) select count(1)
from mortals_stp_device as a from mortals_xhx_device as a
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
...@@ -469,461 +491,487 @@ ...@@ -469,461 +491,487 @@
${_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('deviceName')"> <if test="conditionParamRef.containsKey('deviceName')">
<if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''"> <if test="conditionParamRef.deviceName != null and conditionParamRef.deviceName != ''">
${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName} ${_conditionType_} a.deviceName like #{${_conditionParam_}.deviceName}
</if>
<if test="conditionParamRef.deviceName == null">
${_conditionType_} a.deviceName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceNameList')"> <if test="conditionParamRef.deviceName == null">
${_conditionType_} a.deviceName in ${_conditionType_} a.deviceName is null
<foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceNameList')">
${_conditionType_} a.deviceName in
<foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceCode')"> <if test="conditionParamRef.containsKey('deviceCode')">
<if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''"> <if test="conditionParamRef.deviceCode != null and conditionParamRef.deviceCode != ''">
${_conditionType_} a.deviceCode like #{${_conditionParam_}.deviceCode} ${_conditionType_} a.deviceCode like #{${_conditionParam_}.deviceCode}
</if>
<if test="conditionParamRef.deviceCode == null">
${_conditionType_} a.deviceCode is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceCodeList')">
${_conditionType_} a.deviceCode in
<foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceType')"> <if test="conditionParamRef.deviceCode == null">
<if test="conditionParamRef.deviceType != null "> ${_conditionType_} a.deviceCode is null
${_conditionType_} a.deviceType = #{${_conditionParam_}.deviceType}
</if>
<if test="conditionParamRef.deviceType == null">
${_conditionType_} a.deviceType is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceTypeList')">
${_conditionType_} a.deviceType in
<foreach collection="conditionParamRef.deviceTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceTypeStart') and conditionParamRef.deviceTypeStart != null"> </if>
${_conditionType_} a.deviceType <![CDATA[ >= ]]> #{${_conditionParam_}.deviceTypeStart} <if test="conditionParamRef.containsKey('deviceCodeList')">
${_conditionType_} a.deviceCode in
<foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceType')">
<if test="conditionParamRef.deviceType != null ">
${_conditionType_} a.deviceType = #{${_conditionParam_}.deviceType}
</if> </if>
<if test="conditionParamRef.containsKey('deviceTypeEnd') and conditionParamRef.deviceTypeEnd != null"> <if test="conditionParamRef.deviceType == null">
${_conditionType_} a.deviceType <![CDATA[ <= ]]> #{${_conditionParam_}.deviceTypeEnd} ${_conditionType_} a.deviceType is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceTypeList')">
${_conditionType_} a.deviceType in
<foreach collection="conditionParamRef.deviceTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceTypeStart') and conditionParamRef.deviceTypeStart != null">
${_conditionType_} a.deviceType <![CDATA[ >= ]]> #{${_conditionParam_}.deviceTypeStart}
</if>
<if test="conditionParamRef.containsKey('deviceTypeEnd') and conditionParamRef.deviceTypeEnd != null">
${_conditionType_} a.deviceType <![CDATA[ <= ]]> #{${_conditionParam_}.deviceTypeEnd}
</if>
<if test="conditionParamRef.containsKey('deviceMac')"> <if test="conditionParamRef.containsKey('deviceMac')">
<if test="conditionParamRef.deviceMac != null and conditionParamRef.deviceMac != ''"> <if test="conditionParamRef.deviceMac != null and conditionParamRef.deviceMac != ''">
${_conditionType_} a.deviceMac like #{${_conditionParam_}.deviceMac} ${_conditionType_} a.deviceMac like #{${_conditionParam_}.deviceMac}
</if>
<if test="conditionParamRef.deviceMac == null">
${_conditionType_} a.deviceMac is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceMacList')"> <if test="conditionParamRef.deviceMac == null">
${_conditionType_} a.deviceMac in ${_conditionType_} a.deviceMac is null
<foreach collection="conditionParamRef.deviceMacList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceMacList')">
${_conditionType_} a.deviceMac in
<foreach collection="conditionParamRef.deviceMacList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('ip')"> <if test="conditionParamRef.containsKey('ip')">
<if test="conditionParamRef.ip != null and conditionParamRef.ip != ''"> <if test="conditionParamRef.ip != null and conditionParamRef.ip != ''">
${_conditionType_} a.ip like #{${_conditionParam_}.ip} ${_conditionType_} a.ip like #{${_conditionParam_}.ip}
</if>
<if test="conditionParamRef.ip == null">
${_conditionType_} a.ip is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('ipList')"> <if test="conditionParamRef.ip == null">
${_conditionType_} a.ip in ${_conditionType_} a.ip is null
<foreach collection="conditionParamRef.ipList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('ipList')">
${_conditionType_} a.ip in
<foreach collection="conditionParamRef.ipList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('centernum')"> <if test="conditionParamRef.containsKey('centernum')">
<if test="conditionParamRef.centernum != null and conditionParamRef.centernum != ''"> <if test="conditionParamRef.centernum != null and conditionParamRef.centernum != ''">
${_conditionType_} a.centernum like #{${_conditionParam_}.centernum} ${_conditionType_} a.centernum like #{${_conditionParam_}.centernum}
</if>
<if test="conditionParamRef.centernum == null">
${_conditionType_} a.centernum is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('centernumList')"> <if test="conditionParamRef.centernum == null">
${_conditionType_} a.centernum in ${_conditionType_} a.centernum is null
<foreach collection="conditionParamRef.centernumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('centernumList')">
${_conditionType_} a.centernum in
<foreach collection="conditionParamRef.centernumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('port')"> <if test="conditionParamRef.containsKey('port')">
<if test="conditionParamRef.port != null and conditionParamRef.port != ''"> <if test="conditionParamRef.port != null and conditionParamRef.port != ''">
${_conditionType_} a.port like #{${_conditionParam_}.port} ${_conditionType_} a.port like #{${_conditionParam_}.port}
</if>
<if test="conditionParamRef.port == null">
${_conditionType_} a.port is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('portList')"> <if test="conditionParamRef.port == null">
${_conditionType_} a.port in ${_conditionType_} a.port is null
<foreach collection="conditionParamRef.portList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('portList')">
${_conditionType_} a.port in
<foreach collection="conditionParamRef.portList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteNum')"> <if test="conditionParamRef.containsKey('siteNum')">
<if test="conditionParamRef.siteNum != null and conditionParamRef.siteNum != ''"> <if test="conditionParamRef.siteNum != null and conditionParamRef.siteNum != ''">
${_conditionType_} a.siteNum like #{${_conditionParam_}.siteNum} ${_conditionType_} a.siteNum like #{${_conditionParam_}.siteNum}
</if>
<if test="conditionParamRef.siteNum == null">
${_conditionType_} a.siteNum is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteNumList')">
${_conditionType_} a.siteNum in
<foreach collection="conditionParamRef.siteNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceFirmId')">
<if test="conditionParamRef.deviceFirmId != null ">
${_conditionType_} a.deviceFirmId = #{${_conditionParam_}.deviceFirmId}
</if>
<if test="conditionParamRef.deviceFirmId == null">
${_conditionType_} a.deviceFirmId is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceFirmIdList')"> <if test="conditionParamRef.siteNum == null">
${_conditionType_} a.deviceFirmId in ${_conditionType_} a.siteNum is null
<foreach collection="conditionParamRef.deviceFirmIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceFirmIdStart') and conditionParamRef.deviceFirmIdStart != null"> </if>
${_conditionType_} a.deviceFirmId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceFirmIdStart} <if test="conditionParamRef.containsKey('siteNumList')">
${_conditionType_} a.siteNum in
<foreach collection="conditionParamRef.siteNumList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceFirmId')">
<if test="conditionParamRef.deviceFirmId != null ">
${_conditionType_} a.deviceFirmId = #{${_conditionParam_}.deviceFirmId}
</if> </if>
<if test="conditionParamRef.containsKey('deviceFirmIdEnd') and conditionParamRef.deviceFirmIdEnd != null"> <if test="conditionParamRef.deviceFirmId == null">
${_conditionType_} a.deviceFirmId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceFirmIdEnd} ${_conditionType_} a.deviceFirmId is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceFirmIdList')">
${_conditionType_} a.deviceFirmId in
<foreach collection="conditionParamRef.deviceFirmIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceFirmIdStart') and conditionParamRef.deviceFirmIdStart != null">
${_conditionType_} a.deviceFirmId <![CDATA[ >= ]]> #{${_conditionParam_}.deviceFirmIdStart}
</if>
<if test="conditionParamRef.containsKey('deviceFirmIdEnd') and conditionParamRef.deviceFirmIdEnd != null">
${_conditionType_} a.deviceFirmId <![CDATA[ <= ]]> #{${_conditionParam_}.deviceFirmIdEnd}
</if>
<if test="conditionParamRef.containsKey('deviceFirmname')"> <if test="conditionParamRef.containsKey('deviceFirmname')">
<if test="conditionParamRef.deviceFirmname != null and conditionParamRef.deviceFirmname != ''"> <if test="conditionParamRef.deviceFirmname != null and conditionParamRef.deviceFirmname != ''">
${_conditionType_} a.deviceFirmname like #{${_conditionParam_}.deviceFirmname} ${_conditionType_} a.deviceFirmname like #{${_conditionParam_}.deviceFirmname}
</if>
<if test="conditionParamRef.deviceFirmname == null">
${_conditionType_} a.deviceFirmname is null
</if>
</if>
<if test="conditionParamRef.containsKey('deviceFirmnameList')">
${_conditionType_} a.deviceFirmname in
<foreach collection="conditionParamRef.deviceFirmnameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceOnlineStatus')">
<if test="conditionParamRef.deviceOnlineStatus != null ">
${_conditionType_} a.deviceOnlineStatus = #{${_conditionParam_}.deviceOnlineStatus}
</if>
<if test="conditionParamRef.deviceOnlineStatus == null">
${_conditionType_} a.deviceOnlineStatus is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceOnlineStatusList')"> <if test="conditionParamRef.deviceFirmname == null">
${_conditionType_} a.deviceOnlineStatus in ${_conditionType_} a.deviceFirmname is null
<foreach collection="conditionParamRef.deviceOnlineStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('deviceOnlineStatusStart') and conditionParamRef.deviceOnlineStatusStart != null"> </if>
${_conditionType_} a.deviceOnlineStatus <![CDATA[ >= ]]> #{${_conditionParam_}.deviceOnlineStatusStart} <if test="conditionParamRef.containsKey('deviceFirmnameList')">
${_conditionType_} a.deviceFirmname in
<foreach collection="conditionParamRef.deviceFirmnameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceOnlineStatus')">
<if test="conditionParamRef.deviceOnlineStatus != null ">
${_conditionType_} a.deviceOnlineStatus = #{${_conditionParam_}.deviceOnlineStatus}
</if> </if>
<if test="conditionParamRef.containsKey('deviceOnlineStatusEnd') and conditionParamRef.deviceOnlineStatusEnd != null"> <if test="conditionParamRef.deviceOnlineStatus == null">
${_conditionType_} a.deviceOnlineStatus <![CDATA[ <= ]]> #{${_conditionParam_}.deviceOnlineStatusEnd} ${_conditionType_} a.deviceOnlineStatus is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceOnlineStatusList')">
${_conditionType_} a.deviceOnlineStatus in
<foreach collection="conditionParamRef.deviceOnlineStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceOnlineStatusStart') and conditionParamRef.deviceOnlineStatusStart != null">
${_conditionType_} a.deviceOnlineStatus <![CDATA[ >= ]]> #{${_conditionParam_}.deviceOnlineStatusStart}
</if>
<if test="conditionParamRef.containsKey('deviceOnlineStatusEnd') and conditionParamRef.deviceOnlineStatusEnd != null">
${_conditionType_} a.deviceOnlineStatus <![CDATA[ <= ]]> #{${_conditionParam_}.deviceOnlineStatusEnd}
</if>
<if test="conditionParamRef.containsKey('status')"> <if test="conditionParamRef.containsKey('status')">
<if test="conditionParamRef.status != null "> <if test="conditionParamRef.status != null ">
${_conditionType_} a.status = #{${_conditionParam_}.status} ${_conditionType_} a.status = #{${_conditionParam_}.status}
</if>
<if test="conditionParamRef.status == null">
${_conditionType_} a.status is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('statusList')"> <if test="conditionParamRef.status == null">
${_conditionType_} a.status in ${_conditionType_} a.status is null
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null"> </if>
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart} <if test="conditionParamRef.containsKey('statusList')">
${_conditionType_} a.status in
<foreach collection="conditionParamRef.statusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('statusStart') and conditionParamRef.statusStart != null">
${_conditionType_} a.status <![CDATA[ >= ]]> #{${_conditionParam_}.statusStart}
</if>
<if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null">
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd}
</if>
<if test="conditionParamRef.containsKey('active')">
<if test="conditionParamRef.active != null ">
${_conditionType_} a.active = #{${_conditionParam_}.active}
</if> </if>
<if test="conditionParamRef.containsKey('statusEnd') and conditionParamRef.statusEnd != null"> <if test="conditionParamRef.active == null">
${_conditionType_} a.status <![CDATA[ <= ]]> #{${_conditionParam_}.statusEnd} ${_conditionType_} a.active is null
</if> </if>
</if>
<if test="conditionParamRef.containsKey('activeList')">
${_conditionType_} a.active in
<foreach collection="conditionParamRef.activeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('activeStart') and conditionParamRef.activeStart != null">
${_conditionType_} a.active <![CDATA[ >= ]]> #{${_conditionParam_}.activeStart}
</if>
<if test="conditionParamRef.containsKey('activeEnd') and conditionParamRef.activeEnd != null">
${_conditionType_} a.active <![CDATA[ <= ]]> #{${_conditionParam_}.activeEnd}
</if>
<if test="conditionParamRef.containsKey('deviceRemark')"> <if test="conditionParamRef.containsKey('deviceRemark')">
<if test="conditionParamRef.deviceRemark != null and conditionParamRef.deviceRemark != ''"> <if test="conditionParamRef.deviceRemark != null and conditionParamRef.deviceRemark != ''">
${_conditionType_} a.deviceRemark like #{${_conditionParam_}.deviceRemark} ${_conditionType_} a.deviceRemark like #{${_conditionParam_}.deviceRemark}
</if>
<if test="conditionParamRef.deviceRemark == null">
${_conditionType_} a.deviceRemark is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('deviceRemarkList')"> <if test="conditionParamRef.deviceRemark == null">
${_conditionType_} a.deviceRemark in ${_conditionType_} a.deviceRemark is null
<foreach collection="conditionParamRef.deviceRemarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('deviceRemarkList')">
${_conditionType_} a.deviceRemark in
<foreach collection="conditionParamRef.deviceRemarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('onlineTime')"> <if test="conditionParamRef.containsKey('onlineTime')">
<if test="conditionParamRef.onlineTime != null "> <if test="conditionParamRef.onlineTime != null ">
${_conditionType_} a.onlineTime = #{${_conditionParam_}.onlineTime} ${_conditionType_} a.onlineTime = #{${_conditionParam_}.onlineTime}
</if>
<if test="conditionParamRef.onlineTime == null">
${_conditionType_} a.onlineTime is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('onlineTimeStart') and conditionParamRef.onlineTimeStart != null and conditionParamRef.onlineTimeStart!=''"> <if test="conditionParamRef.onlineTime == null">
${_conditionType_} a.onlineTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.onlineTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.onlineTime is null
</if>
<if test="conditionParamRef.containsKey('onlineTimeEnd') and conditionParamRef.onlineTimeEnd != null and conditionParamRef.onlineTimeEnd!=''">
${_conditionType_} a.onlineTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.onlineTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
</if>
<if test="conditionParamRef.containsKey('onlineTimeStart') and conditionParamRef.onlineTimeStart != null and conditionParamRef.onlineTimeStart!=''">
${_conditionType_} a.onlineTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.onlineTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('onlineTimeEnd') and conditionParamRef.onlineTimeEnd != null and conditionParamRef.onlineTimeEnd!=''">
${_conditionType_} a.onlineTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.onlineTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if>
<if test="conditionParamRef.containsKey('offlineTime')"> <if test="conditionParamRef.containsKey('offlineTime')">
<if test="conditionParamRef.offlineTime != null "> <if test="conditionParamRef.offlineTime != null ">
${_conditionType_} a.offlineTime = #{${_conditionParam_}.offlineTime} ${_conditionType_} a.offlineTime = #{${_conditionParam_}.offlineTime}
</if>
<if test="conditionParamRef.offlineTime == null">
${_conditionType_} a.offlineTime is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('offlineTimeStart') and conditionParamRef.offlineTimeStart != null and conditionParamRef.offlineTimeStart!=''"> <if test="conditionParamRef.offlineTime == null">
${_conditionType_} a.offlineTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.offlineTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.offlineTime is null
</if> </if>
<if test="conditionParamRef.containsKey('offlineTimeEnd') and conditionParamRef.offlineTimeEnd != null and conditionParamRef.offlineTimeEnd!=''"> </if>
${_conditionType_} a.offlineTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.offlineTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') <if test="conditionParamRef.containsKey('offlineTimeStart') and conditionParamRef.offlineTimeStart != null and conditionParamRef.offlineTimeStart!=''">
</if> ${_conditionType_} a.offlineTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.offlineTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
<if test="conditionParamRef.containsKey('createUserId')"> </if>
<if test="conditionParamRef.createUserId != null "> <if test="conditionParamRef.containsKey('offlineTimeEnd') and conditionParamRef.offlineTimeEnd != null and conditionParamRef.offlineTimeEnd!=''">
${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId} ${_conditionType_} a.offlineTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.offlineTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.createUserId == null"> <if test="conditionParamRef.containsKey('createUserId')">
${_conditionType_} a.createUserId is null <if test="conditionParamRef.createUserId != null ">
</if> ${_conditionType_} a.createUserId = #{${_conditionParam_}.createUserId}
</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>
<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>
<if test="conditionParamRef.containsKey('updateUserId')"> </if>
<if test="conditionParamRef.updateUserId != null "> <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId} ${_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.updateUserId == null"> <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.updateUserId is null ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
</if> <if test="conditionParamRef.containsKey('updateUserId')">
<if test="conditionParamRef.containsKey('updateUserIdList')"> <if test="conditionParamRef.updateUserId != null ">
${_conditionType_} a.updateUserId in ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
<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>
<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>
<if test="conditionParamRef.containsKey('updateTimeStart') and conditionParamRef.updateTimeStart != null and conditionParamRef.updateTimeStart!=''"> <if test="conditionParamRef.updateTime == null">
${_conditionType_} a.updateTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.updateTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.updateTime is null
</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> </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('deviceName')"> <if test="orderCol.containsKey('deviceName')">
a.deviceName a.deviceName
<if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if> <if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceCode')"> <if test="orderCol.containsKey('deviceCode')">
a.deviceCode a.deviceCode
<if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if> <if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceType')"> <if test="orderCol.containsKey('deviceType')">
a.deviceType a.deviceType
<if test='orderCol.deviceType != null and "DESC".equalsIgnoreCase(orderCol.deviceType)'>DESC</if> <if test='orderCol.deviceType != null and "DESC".equalsIgnoreCase(orderCol.deviceType)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceMac')"> <if test="orderCol.containsKey('deviceMac')">
a.deviceMac a.deviceMac
<if test='orderCol.deviceMac != null and "DESC".equalsIgnoreCase(orderCol.deviceMac)'>DESC</if> <if test='orderCol.deviceMac != null and "DESC".equalsIgnoreCase(orderCol.deviceMac)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('ip')"> <if test="orderCol.containsKey('ip')">
a.ip a.ip
<if test='orderCol.ip != null and "DESC".equalsIgnoreCase(orderCol.ip)'>DESC</if> <if test='orderCol.ip != null and "DESC".equalsIgnoreCase(orderCol.ip)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('centernum')"> <if test="orderCol.containsKey('centernum')">
a.centernum a.centernum
<if test='orderCol.centernum != null and "DESC".equalsIgnoreCase(orderCol.centernum)'>DESC</if> <if test='orderCol.centernum != null and "DESC".equalsIgnoreCase(orderCol.centernum)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('port')"> <if test="orderCol.containsKey('port')">
a.port a.port
<if test='orderCol.port != null and "DESC".equalsIgnoreCase(orderCol.port)'>DESC</if> <if test='orderCol.port != null and "DESC".equalsIgnoreCase(orderCol.port)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('siteNum')"> <if test="orderCol.containsKey('siteNum')">
a.siteNum a.siteNum
<if test='orderCol.siteNum != null and "DESC".equalsIgnoreCase(orderCol.siteNum)'>DESC</if> <if test='orderCol.siteNum != null and "DESC".equalsIgnoreCase(orderCol.siteNum)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceFirmId')"> <if test="orderCol.containsKey('deviceFirmId')">
a.deviceFirmId a.deviceFirmId
<if test='orderCol.deviceFirmId != null and "DESC".equalsIgnoreCase(orderCol.deviceFirmId)'>DESC</if> <if test='orderCol.deviceFirmId != null and "DESC".equalsIgnoreCase(orderCol.deviceFirmId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceFirmname')"> <if test="orderCol.containsKey('deviceFirmname')">
a.deviceFirmname a.deviceFirmname
<if test='orderCol.deviceFirmname != null and "DESC".equalsIgnoreCase(orderCol.deviceFirmname)'>DESC</if> <if test='orderCol.deviceFirmname != null and "DESC".equalsIgnoreCase(orderCol.deviceFirmname)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceOnlineStatus')"> <if test="orderCol.containsKey('deviceOnlineStatus')">
a.deviceOnlineStatus a.deviceOnlineStatus
<if test='orderCol.deviceOnlineStatus != null and "DESC".equalsIgnoreCase(orderCol.deviceOnlineStatus)'>DESC</if> <if test='orderCol.deviceOnlineStatus != null and "DESC".equalsIgnoreCase(orderCol.deviceOnlineStatus)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('status')"> <if test="orderCol.containsKey('status')">
a.status a.status
<if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if> <if test='orderCol.status != null and "DESC".equalsIgnoreCase(orderCol.status)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('deviceRemark')"> <if test="orderCol.containsKey('active')">
a.deviceRemark a.active
<if test='orderCol.deviceRemark != null and "DESC".equalsIgnoreCase(orderCol.deviceRemark)'>DESC</if> <if test='orderCol.active != null and "DESC".equalsIgnoreCase(orderCol.active)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('onlineTime')"> <if test="orderCol.containsKey('deviceRemark')">
a.onlineTime a.deviceRemark
<if test='orderCol.onlineTime != null and "DESC".equalsIgnoreCase(orderCol.onlineTime)'>DESC</if> <if test='orderCol.deviceRemark != null and "DESC".equalsIgnoreCase(orderCol.deviceRemark)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('offlineTime')"> <if test="orderCol.containsKey('onlineTime')">
a.offlineTime a.onlineTime
<if test='orderCol.offlineTime != null and "DESC".equalsIgnoreCase(orderCol.offlineTime)'>DESC</if> <if test='orderCol.onlineTime != null and "DESC".equalsIgnoreCase(orderCol.onlineTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createUserId')"> <if test="orderCol.containsKey('offlineTime')">
a.createUserId a.offlineTime
<if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if> <if test='orderCol.offlineTime != null and "DESC".equalsIgnoreCase(orderCol.offlineTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('createTime')"> <if test="orderCol.containsKey('createUserId')">
a.createTime a.createUserId
<if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if> <if test='orderCol.createUserId != null and "DESC".equalsIgnoreCase(orderCol.createUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateUserId')"> <if test="orderCol.containsKey('createTime')">
a.updateUserId a.createTime
<if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if> <if test='orderCol.createTime != null and "DESC".equalsIgnoreCase(orderCol.createTime)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')"> <if test="orderCol.containsKey('updateUserId')">
a.updateTime a.updateUserId
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if> <if test='orderCol.updateUserId != null and "DESC".equalsIgnoreCase(orderCol.updateUserId)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('updateTime')">
a.updateTime
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
</trim> </trim>
</if> </if>
</sql> </sql>
......
device-manager/src/main/resources/sqlmap/module/firm/FirmMapper.xml
View file @ 53a350d8
<?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.firm.dao.ibatis.FirmDaoImpl"> <mapper namespace="com.mortals.xhx.module.firm.dao.ibatis.FirmDaoImpl">
<!-- 字段和属性映射 --> <!-- 字段和属性映射 -->
<resultMap type="FirmEntity" id="FirmEntity-Map"> <resultMap type="FirmEntity" id="FirmEntity-Map">
<id property="id" column="id" /> <id property="id" column="id" />
<result property="firmName" column="firmName" /> <result property="firmName" column="firmName" />
<result property="firmCode" column="firmCode" /> <result property="firmCode" column="firmCode" />
<result property="firmRemark" column="firmRemark" /> <result property="firmRemark" column="firmRemark" />
<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 as id, a.id,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('firmName') or colPickMode == 1 and data.containsKey('firmName')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('firmName') or colPickMode == 1 and data.containsKey('firmName')))">
a.firmName as firmName, a.firmName,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('firmCode') or colPickMode == 1 and data.containsKey('firmCode')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('firmCode') or colPickMode == 1 and data.containsKey('firmCode')))">
a.firmCode as firmCode, a.firmCode,
</if> </if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('firmRemark') or colPickMode == 1 and data.containsKey('firmRemark')))"> <if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('firmRemark') or colPickMode == 1 and data.containsKey('firmRemark')))">
a.firmRemark as firmRemark, a.firmRemark,
</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 as 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 as 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 as 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 as updateTime, a.updateTime,
</if> </if>
</trim> </trim>
</sql> </sql>
<!-- 新增 区分主键自增加还是业务插入 --> <!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="FirmEntity" useGeneratedKeys="true" keyProperty="id"> <insert id="insert" parameterType="FirmEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_stp_firm insert into mortals_xhx_firm
(firmName,firmCode,firmRemark,createUserId,createTime,updateUserId,updateTime) (firmName,firmCode,firmRemark,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
(#{firmName},#{firmCode},#{firmRemark},#{createUserId},#{createTime},#{updateUserId},#{updateTime}) (#{firmName},#{firmCode},#{firmRemark},#{createUserId},#{createTime},#{updateUserId},#{updateTime})
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
<!-- 批量新增 --> <!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto"> <insert id="insertBatch" parameterType="paramDto">
insert into mortals_stp_firm insert into mortals_xhx_firm
(firmName,firmCode,firmRemark,createUserId,createTime,updateUserId,updateTime) (firmName,firmCode,firmRemark,createUserId,createTime,updateUserId,updateTime)
VALUES VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," > <foreach collection="data.dataList" item="item" index="index" separator="," >
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<!-- 根据ParamDto更新 --> <!-- 根据ParamDto更新 -->
<update id="update" parameterType="paramDto"> <update id="update" parameterType="paramDto">
update mortals_stp_firm as a update mortals_xhx_firm as a
set set
<trim suffixOverrides="," suffix=""> <trim suffixOverrides="," suffix="">
<if test="(colPickMode==0 and data.containsKey('firmName')) or (colPickMode==1 and !data.containsKey('firmName'))"> <if test="(colPickMode==0 and data.containsKey('firmName')) or (colPickMode==1 and !data.containsKey('firmName'))">
...@@ -107,67 +107,67 @@ ...@@ -107,67 +107,67 @@
</update> </update>
<!-- 批量更新 --> <!-- 批量更新 -->
<update id="updateBatch" parameterType="paramDto"> <update id="updateBatch" parameterType="paramDto">
update mortals_stp_firm as a update mortals_xhx_firm as a
<trim prefix="set" suffixOverrides=","> <trim prefix="set" suffixOverrides=",">
<trim prefix="firmName=(case" suffix="ELSE firmName end),"> <trim prefix="firmName=(case" suffix="ELSE firmName 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('firmName')) or (colPickMode==1 and !item.containsKey('firmName'))"> <if test="(colPickMode==0 and item.containsKey('firmName')) or (colPickMode==1 and !item.containsKey('firmName'))">
when a.id=#{item.id} then #{item.firmName} when a.id=#{item.id} then #{item.firmName}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="firmCode=(case" suffix="ELSE firmCode end),"> <trim prefix="firmCode=(case" suffix="ELSE firmCode 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('firmCode')) or (colPickMode==1 and !item.containsKey('firmCode'))"> <if test="(colPickMode==0 and item.containsKey('firmCode')) or (colPickMode==1 and !item.containsKey('firmCode'))">
when a.id=#{item.id} then #{item.firmCode} when a.id=#{item.id} then #{item.firmCode}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="firmRemark=(case" suffix="ELSE firmRemark end),"> <trim prefix="firmRemark=(case" suffix="ELSE firmRemark 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('firmRemark')) or (colPickMode==1 and !item.containsKey('firmRemark'))"> <if test="(colPickMode==0 and item.containsKey('firmRemark')) or (colPickMode==1 and !item.containsKey('firmRemark'))">
when a.id=#{item.id} then #{item.firmRemark} when a.id=#{item.id} then #{item.firmRemark}
</if> </if>
</foreach> </foreach>
</trim> </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>
<when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))"> <when test="(colPickMode==0 and item.containsKey('createUserId')) or (colPickMode==1 and !item.containsKey('createUserId'))">
when a.id=#{item.id} then #{item.createUserId} when a.id=#{item.id} then #{item.createUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('createUserIdIncrement')) or (colPickMode==1 and !item.containsKey('createUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement} when a.id=#{item.id} then ifnull(a.createUserId,0) + #{item.createUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="createTime=(case" suffix="ELSE createTime end),"> <trim prefix="createTime=(case" suffix="ELSE createTime 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('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))"> <if test="(colPickMode==0 and item.containsKey('createTime')) or (colPickMode==1 and !item.containsKey('createTime'))">
when a.id=#{item.id} then #{item.createTime} when a.id=#{item.id} then #{item.createTime}
</if> </if>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),"> <trim prefix="updateUserId=(case" suffix="ELSE updateUserId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" > <foreach collection="data.dataList" item="item" index="index" separator="" >
<choose> <choose>
<when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))"> <when test="(colPickMode==0 and item.containsKey('updateUserId')) or (colPickMode==1 and !item.containsKey('updateUserId'))">
when a.id=#{item.id} then #{item.updateUserId} when a.id=#{item.id} then #{item.updateUserId}
</when> </when>
<when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))"> <when test="(colPickMode==0 and item.containsKey('updateUserIdIncrement')) or (colPickMode==1 and !item.containsKey('updateUserIdIncrement'))">
when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement} when a.id=#{item.id} then ifnull(a.updateUserId,0) + #{item.updateUserIdIncrement}
</when> </when>
</choose> </choose>
</foreach> </foreach>
</trim> </trim>
<trim prefix="updateTime=(case" suffix="ELSE updateTime end),"> <trim prefix="updateTime=(case" suffix="ELSE updateTime 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('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))"> <if test="(colPickMode==0 and item.containsKey('updateTime')) or (colPickMode==1 and !item.containsKey('updateTime'))">
when a.id=#{item.id} then #{item.updateTime} when a.id=#{item.id} then #{item.updateTime}
</if> </if>
</foreach> </foreach>
</trim> </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=")">
...@@ -177,23 +177,23 @@ ...@@ -177,23 +177,23 @@
<!-- 根据主健查询 --> <!-- 根据主健查询 -->
<select id="getByKey" parameterType="paramDto" resultMap="FirmEntity-Map"> <select id="getByKey" parameterType="paramDto" resultMap="FirmEntity-Map">
select <include refid="_columns"/> select <include refid="_columns"/>
from mortals_stp_firm as a from mortals_xhx_firm as a
where a.id=#{condition.id} where a.id=#{condition.id}
</select> </select>
<!-- 根据主健删除 --> <!-- 根据主健删除 -->
<delete id="deleteByKey" parameterType="paramDto"> <delete id="deleteByKey" parameterType="paramDto">
delete a.* from mortals_stp_firm as a where a.id=#{condition.id} delete a.* from mortals_xhx_firm as a where a.id=#{condition.id}
</delete> </delete>
<!-- 根据主健删除一批，针对单一主健有效 --> <!-- 根据主健删除一批，针对单一主健有效 -->
<delete id="deleteByKeys"> <delete id="deleteByKeys">
delete from mortals_stp_firm where id in delete from mortals_xhx_firm where id in
<foreach collection="array" item="item" index="index" open="(" separator="," close=")"> <foreach collection="array" item="item" index="index" open="(" separator="," close=")">
#{item} #{item}
</foreach> </foreach>
</delete> </delete>
<!-- 根据paramDto删除一批 --> <!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto"> <delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_stp_firm as a delete a.* from mortals_xhx_firm as a
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
...@@ -204,7 +204,7 @@ ...@@ -204,7 +204,7 @@
<!-- 获取列表 --> <!-- 获取列表 -->
<select id="getList" parameterType="paramDto" resultMap="FirmEntity-Map"> <select id="getList" parameterType="paramDto" resultMap="FirmEntity-Map">
select <include refid="_columns"/> select <include refid="_columns"/>
from mortals_stp_firm as a from mortals_xhx_firm as a
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
...@@ -219,7 +219,7 @@ ...@@ -219,7 +219,7 @@
<!-- 获取 --> <!-- 获取 -->
<select id="getListCount" parameterType="paramDto" resultType="int"> <select id="getListCount" parameterType="paramDto" resultType="int">
select count(1) select count(1)
from mortals_stp_firm as a from mortals_xhx_firm as a
<trim suffixOverrides="where" suffix=""> <trim suffixOverrides="where" suffix="">
where where
<trim prefixOverrides="and" prefix=""> <trim prefixOverrides="and" prefix="">
...@@ -269,197 +269,197 @@ ...@@ -269,197 +269,197 @@
${_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('firmName')"> <if test="conditionParamRef.containsKey('firmName')">
<if test="conditionParamRef.firmName != null and conditionParamRef.firmName != ''"> <if test="conditionParamRef.firmName != null and conditionParamRef.firmName != ''">
${_conditionType_} a.firmName like #{${_conditionParam_}.firmName} ${_conditionType_} a.firmName like #{${_conditionParam_}.firmName}
</if>
<if test="conditionParamRef.firmName == null">
${_conditionType_} a.firmName is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('firmNameList')"> <if test="conditionParamRef.firmName == null">
${_conditionType_} a.firmName in ${_conditionType_} a.firmName is null
<foreach collection="conditionParamRef.firmNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('firmNameList')">
${_conditionType_} a.firmName in
<foreach collection="conditionParamRef.firmNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('firmCode')"> <if test="conditionParamRef.containsKey('firmCode')">
<if test="conditionParamRef.firmCode != null and conditionParamRef.firmCode != ''"> <if test="conditionParamRef.firmCode != null and conditionParamRef.firmCode != ''">
${_conditionType_} a.firmCode like #{${_conditionParam_}.firmCode} ${_conditionType_} a.firmCode like #{${_conditionParam_}.firmCode}
</if>
<if test="conditionParamRef.firmCode == null">
${_conditionType_} a.firmCode is null
</if>
</if> </if>
<if test="conditionParamRef.containsKey('firmCodeList')"> <if test="conditionParamRef.firmCode == null">
${_conditionType_} a.firmCode in ${_conditionType_} a.firmCode is null
<foreach collection="conditionParamRef.firmCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
</if>
<if test="conditionParamRef.containsKey('firmCodeList')">
${_conditionType_} a.firmCode in
<foreach collection="conditionParamRef.firmCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('firmRemark')"> <if test="conditionParamRef.containsKey('firmRemark')">
<if test="conditionParamRef.firmRemark != null and conditionParamRef.firmRemark != ''"> <if test="conditionParamRef.firmRemark != null and conditionParamRef.firmRemark != ''">
${_conditionType_} a.firmRemark like #{${_conditionParam_}.firmRemark} ${_conditionType_} a.firmRemark like #{${_conditionParam_}.firmRemark}
</if>
<if test="conditionParamRef.firmRemark == null">
${_conditionType_} a.firmRemark is null
</if>
</if>
<if test="conditionParamRef.containsKey('firmRemarkList')">
${_conditionType_} a.firmRemark in
<foreach collection="conditionParamRef.firmRemarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createUserId')">
<if test="conditionParamRef.createUserId != 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 test="conditionParamRef.firmRemark == null">
${_conditionType_} a.createUserId in ${_conditionType_} a.firmRemark is null
<foreach collection="conditionParamRef.createUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if> </if>
<if test="conditionParamRef.containsKey('createUserIdStart') and conditionParamRef.createUserIdStart != null"> </if>
${_conditionType_} a.createUserId <![CDATA[ >= ]]> #{${_conditionParam_}.createUserIdStart} <if test="conditionParamRef.containsKey('firmRemarkList')">
${_conditionType_} a.firmRemark in
<foreach collection="conditionParamRef.firmRemarkList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<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>
<if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''"> <if test="conditionParamRef.createTime == null">
${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s') ${_conditionType_} a.createTime is null
</if> </if>
<if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''"> </if>
${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s') <if test="conditionParamRef.containsKey('createTimeStart') and conditionParamRef.createTimeStart != null and conditionParamRef.createTimeStart!=''">
</if> ${_conditionType_} a.createTime <![CDATA[ >= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeStart},' 00:00:00'),19),'%Y-%m-%d %k:%i:%s')
<if test="conditionParamRef.containsKey('updateUserId')"> </if>
<if test="conditionParamRef.updateUserId != null "> <if test="conditionParamRef.containsKey('createTimeEnd') and conditionParamRef.createTimeEnd != null and conditionParamRef.createTimeEnd!=''">
${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId} ${_conditionType_} a.createTime <![CDATA[ <= ]]> STR_TO_DATE(left(concat(#{${_conditionParam_}.createTimeEnd},' 23:59:59'),19),'%Y-%m-%d %k:%i:%s')
</if> </if>
<if test="conditionParamRef.updateUserId == null"> <if test="conditionParamRef.containsKey('updateUserId')">
${_conditionType_} a.updateUserId is null <if test="conditionParamRef.updateUserId != null ">
</if> ${_conditionType_} a.updateUserId = #{${_conditionParam_}.updateUserId}
</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>
<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('firmName')"> <if test="orderCol.containsKey('firmName')">
a.firmName a.firmName
<if test='orderCol.firmName != null and "DESC".equalsIgnoreCase(orderCol.firmName)'>DESC</if> <if test='orderCol.firmName != null and "DESC".equalsIgnoreCase(orderCol.firmName)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('firmCode')"> <if test="orderCol.containsKey('firmCode')">
a.firmCode a.firmCode
<if test='orderCol.firmCode != null and "DESC".equalsIgnoreCase(orderCol.firmCode)'>DESC</if> <if test='orderCol.firmCode != null and "DESC".equalsIgnoreCase(orderCol.firmCode)'>DESC</if>
, ,
</if> </if>
<if test="orderCol.containsKey('firmRemark')"> <if test="orderCol.containsKey('firmRemark')">
a.firmRemark a.firmRemark
<if test='orderCol.firmRemark != null and "DESC".equalsIgnoreCase(orderCol.firmRemark)'>DESC</if> <if test='orderCol.firmRemark != null and "DESC".equalsIgnoreCase(orderCol.firmRemark)'>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>
......
pom.xml
View file @ 53a350d8
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<version>1.1.5-SNAPSHOT</version> <version>1.1.5-SNAPSHOT</version>
</parent> </parent>
<groupId>com.mortals.xhx</groupId> <groupId>com.mortals.xhx</groupId>
<artifactId>device-platform</artifactId> <artifactId>device-new-platform</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging> <packaging>pom</packaging>
...@@ -30,17 +30,17 @@ ...@@ -30,17 +30,17 @@
</activation> </activation>
<properties> <properties>
<profiles.active>develop</profiles.active> <profiles.active>develop</profiles.active>
<profiles.server.port>18221</profiles.server.port> <profiles.server.port>18222</profiles.server.port>
<profiles.queue.type>rabbitmq</profiles.queue.type> <profiles.queue.type>rabbitmq</profiles.queue.type>
<profiles.datasource.uri> <profiles.datasource.uri>
<![CDATA[jdbc:mysql://localhost:3306/device-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri> <![CDATA[jdbc:mysql://localhost:3306/device-new-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username> <profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>12345678</profiles.datasource.password> <profiles.datasource.password>12345678</profiles.datasource.password>
<profiles.redis.uri>127.0.0.1</profiles.redis.uri> <profiles.redis.uri>127.0.0.1</profiles.redis.uri>
<profiles.redis.port>6379</profiles.redis.port> <profiles.redis.port>6379</profiles.redis.port>
<profiles.redis.username></profiles.redis.username> <profiles.redis.username></profiles.redis.username>
<profiles.redis.password></profiles.redis.password> <profiles.redis.password></profiles.redis.password>
<profiles.redis.database>6</profiles.redis.database> <profiles.redis.database>7</profiles.redis.database>
<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers> <profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
<profiles.queue.type>rabbitmq</profiles.queue.type> <profiles.queue.type>rabbitmq</profiles.queue.type>
<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host> <profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
...@@ -59,17 +59,17 @@ ...@@ -59,17 +59,17 @@
<id>test</id> <id>test</id>
<properties> <properties>
<profiles.active>test</profiles.active> <profiles.active>test</profiles.active>
<profiles.server.port>18221</profiles.server.port> <profiles.server.port>18222</profiles.server.port>
<profiles.queue.type>rabbitmq</profiles.queue.type> <profiles.queue.type>rabbitmq</profiles.queue.type>
<profiles.datasource.uri> <profiles.datasource.uri>
<![CDATA[jdbc:mysql://192.168.0.98:3306/device-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri> <![CDATA[jdbc:mysql://192.168.0.98:3306/device-new-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username> <profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>nacos@2020</profiles.datasource.password> <profiles.datasource.password>nacos@2020</profiles.datasource.password>
<profiles.redis.uri>192.168.0.252</profiles.redis.uri> <profiles.redis.uri>192.168.0.252</profiles.redis.uri>
<profiles.redis.port>6379</profiles.redis.port> <profiles.redis.port>6379</profiles.redis.port>
<profiles.redis.username></profiles.redis.username> <profiles.redis.username></profiles.redis.username>
<profiles.redis.password>hotel@2020</profiles.redis.password> <profiles.redis.password>hotel@2020</profiles.redis.password>
<profiles.redis.database>2</profiles.redis.database> <profiles.redis.database>7</profiles.redis.database>
<profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers> <profiles.kafka.brokers>192.168.0.251:9092</profiles.kafka.brokers>
<profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host> <profiles.rabbitmq.host>192.168.0.98</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port> <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
...@@ -87,17 +87,17 @@ ...@@ -87,17 +87,17 @@
<id>product</id> <id>product</id>
<properties> <properties>
<profiles.active>product</profiles.active> <profiles.active>product</profiles.active>
<profiles.server.port>18221</profiles.server.port> <profiles.server.port>18222</profiles.server.port>
<profiles.queue.type>rabbitmq</profiles.queue.type> <profiles.queue.type>rabbitmq</profiles.queue.type>
<profiles.datasource.uri> <profiles.datasource.uri>
<![CDATA[jdbc:mysql://192.168.0.26:8183/device-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri> <![CDATA[jdbc:mysql://192.168.0.26:8183/device-new-platform?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Hongkong]]></profiles.datasource.uri>
<profiles.datasource.username>root</profiles.datasource.username> <profiles.datasource.username>root</profiles.datasource.username>
<profiles.datasource.password>root123</profiles.datasource.password> <profiles.datasource.password>root123</profiles.datasource.password>
<profiles.redis.uri>192.168.0.26</profiles.redis.uri> <profiles.redis.uri>192.168.0.26</profiles.redis.uri>
<profiles.redis.port>6379</profiles.redis.port> <profiles.redis.port>6379</profiles.redis.port>
<profiles.redis.username></profiles.redis.username> <profiles.redis.username></profiles.redis.username>
<profiles.redis.password></profiles.redis.password> <profiles.redis.password></profiles.redis.password>
<profiles.redis.database>2</profiles.redis.database> <profiles.redis.database>7</profiles.redis.database>
<profiles.kafka.brokers>192.168.0.26:9092</profiles.kafka.brokers> <profiles.kafka.brokers>192.168.0.26:9092</profiles.kafka.brokers>
<profiles.rabbitmq.host>192.168.0.26</profiles.rabbitmq.host> <profiles.rabbitmq.host>192.168.0.26</profiles.rabbitmq.host>
<profiles.rabbitmq.port>5672</profiles.rabbitmq.port> <profiles.rabbitmq.port>5672</profiles.rabbitmq.port>
......
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