Skip to content

D
device-new-platform
Commit 70591c76 authored by “yiyousong”'s avatar “yiyousong”
Browse files
Options

Merge branch 'master' of http://gitlab.scsmile.cn/zxf/device-new-platform

parents bddd7701 64ea760a
Hide whitespace changes
Inline Side-by-side
Showing with 731 additions and 338 deletions
device-manager/db/add.sql
View file @ 70591c76
......@@ -28,3 +28,5 @@ ALTER TABLE mortals_xhx_device ADD COLUMN `productCode` varchar (64) default ''
ALTER TABLE mortals_xhx_device ADD COLUMN `hallId` bigint(20) COMMENT '大厅Id' AFTER skinName;
ALTER TABLE mortals_xhx_device ADD COLUMN `hallName` varchar(256) default '' COMMENT '大厅名称' AFTER hallId;
ALTER TABLE mortals_xhx_device_alarm_info ADD COLUMN `deviceCode` varchar(256) default '' COMMENT '设备编码' AFTER alarmDevice;
ALTER TABLE mortals_xhx_device_alarm_info ADD COLUMN `deviceName` varchar(256) default '' COMMENT '设备名称' AFTER deviceCode;
device-manager/src/main/java/com/mortals/xhx/base/framework/listener/CustomerKeyExpirationListener.java
View file @ 70591c76
package com.mortals.xhx.base.framework.listener;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.RandomUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.mortals.framework.common.Rest;
import com.mortals.framework.util.UuidUtil;
import com.mortals.xhx.common.code.*;
import com.mortals.xhx.common.key.RedisKey;
import com.mortals.xhx.common.pdu.RespData;
......@@ -87,7 +85,9 @@ public class CustomerKeyExpirationListener implements MessageListener {
alarmInfoEntity.initAttrValue();
alarmInfoEntity.setAlarmDevice(deviceEntity.getId());
alarmInfoEntity.setSiteId(deviceEntity.getSiteId());
alarmInfoEntity.setAlarmContent(String.format("设备告警：%s设备：%s已离线，请注意检查！",productEntity.getProductName(),deviceEntity.getDeviceName()+":"+deviceEntity.getDeviceName() ));
alarmInfoEntity.setDeviceName(deviceEntity.getDeviceName());
alarmInfoEntity.setDeviceCode(deviceEntity.getDeviceCode());
alarmInfoEntity.setAlarmContent(String.format("设备告警：%s设备：%s已离线，请注意检查！", productEntity.getProductName(), deviceEntity.getDeviceName() + ":" + deviceEntity.getDeviceName()));
alarmInfoEntity.setAlarmType(AlarmTypeEnum.离线.getValue());
alarmInfoEntity.setAlarmLevel(AlarmLevelEnum.一般.getValue());
alarmInfoEntity.setAlarmStatus(AlarmStatusEnum.未清除.getValue());
......@@ -118,8 +118,8 @@ public class CustomerKeyExpirationListener implements MessageListener {
alarmSmsSendEntity.setMobile(deviceAlarmInfoEntity.getReceivePersonnelTelephone());
alarmSmsSendEntity.setReceiver(deviceAlarmInfoEntity.getAlarmReceivePersonnel());
Map<String, String> map = new HashMap<>();
map.put("1",productEntity.getProductName());
map.put("2",deviceEntity.getDeviceName()+":"+deviceEntity.getDeviceName());
map.put("1", productEntity.getProductName());
map.put("2", deviceEntity.getDeviceName() + ":" + deviceEntity.getDeviceName());
alarmSmsSendEntity.setSendMess(JSON.toJSONString(map));
alarmSmsSendEntity.setSendStatus(SendStatusEnum.未发送.getValue());
alarmSmsSendService.save(alarmSmsSendEntity, null);
......
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceAlarmInfoEntity.java
View file @ 70591c76
package com.mortals.xhx.module.device.model;
import java.util.Date;
import java.util.List;
import java.util.ArrayList;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.mortals.framework.annotation.Excel;
import com.mortals.framework.model.BaseEntityLong;
import com.mortals.xhx.module.device.model.vo.DeviceAlarmInfoVo;
import lombok.Data;
import java.util.Date;
/**
* 设备告警日志实体对象
*
* @author zxfei
* @date 2022-08-22
* @date 2023-04-27
*/
@Data
public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
private static final long serialVersionUID = 1L;
......@@ -25,10 +22,6 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
* 告警设备Id
*/
private Long alarmDevice;
/**
* 站点Id，来源基础服务平台
*/
private Long siteId;
/**
* 告警类型,(0.离线)
*/
......@@ -53,140 +46,18 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
* 告警详细内容
*/
private String alarmContent;
public DeviceAlarmInfoEntity(){}
/**
* 获取 告警时间
* @return Date
*/
public Date getAlarmTime(){
return alarmTime;
}
/**
* 设置 告警时间
* @param alarmTime
*/
public void setAlarmTime(Date alarmTime){
this.alarmTime = alarmTime;
}
/**
* 获取 告警设备Id
* @return Long
*/
public Long getAlarmDevice(){
return alarmDevice;
}
/**
* 设置 告警设备Id
* @param alarmDevice
*/
public void setAlarmDevice(Long alarmDevice){
this.alarmDevice = alarmDevice;
}
/**
* 获取 站点Id，来源基础服务平台
* @return Long
*/
public Long getSiteId(){
return siteId;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteId
*/
public void setSiteId(Long siteId){
this.siteId = siteId;
}
/**
* 获取 告警类型,(0.离线)
* @return Integer
*/
public Integer getAlarmType(){
return alarmType;
}
/**
* 设置 告警类型,(0.离线)
* @param alarmType
*/
public void setAlarmType(Integer alarmType){
this.alarmType = alarmType;
}
/**
* 获取 告警级别(0.危险，1.次要，2.一般)
* @return Integer
*/
public Integer getAlarmLevel(){
return alarmLevel;
}
/**
* 设置 告警级别(0.危险，1.次要，2.一般)
* @param alarmLevel
*/
public void setAlarmLevel(Integer alarmLevel){
this.alarmLevel = alarmLevel;
}
/**
* 获取 接收人员[设备管理的责任人]
* @return String
*/
public String getAlarmReceivePersonnel(){
return alarmReceivePersonnel;
}
/**
* 设置 接收人员[设备管理的责任人]
* @param alarmReceivePersonnel
*/
public void setAlarmReceivePersonnel(String alarmReceivePersonnel){
this.alarmReceivePersonnel = alarmReceivePersonnel;
}
/**
* 获取 接收人员电话
* @return String
*/
public String getReceivePersonnelTelephone(){
return receivePersonnelTelephone;
}
/**
* 设置 接收人员电话
* @param receivePersonnelTelephone
*/
public void setReceivePersonnelTelephone(String receivePersonnelTelephone){
this.receivePersonnelTelephone = receivePersonnelTelephone;
}
/**
* 获取 告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)
* @return Integer
*/
public Integer getAlarmStatus(){
return alarmStatus;
}
/**
* 设置 告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)
* @param alarmStatus
* 站点Id，来源基础服务平台
*/
public void setAlarmStatus(Integer alarmStatus){
this.alarmStatus = alarmStatus;
}
private Long siteId;
/**
* 获取 告警详细内容
* @return String
* 设备编码
*/
public String getAlarmContent(){
return alarmContent;
}
private String deviceCode;
/**
* 设置 告警详细内容
* @param alarmContent
* 设备名称
*/
public void setAlarmContent(String alarmContent){
this.alarmContent = alarmContent;
}
private String deviceName;
@Override
public int hashCode() {
return this.getId().hashCode();
......@@ -203,28 +74,12 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
return false;
}
public String toString(){
StringBuilder sb = new StringBuilder("");
sb.append(",alarmTime:").append(getAlarmTime());
sb.append(",alarmDevice:").append(getAlarmDevice());
sb.append(",siteId:").append(getSiteId());
sb.append(",alarmType:").append(getAlarmType());
sb.append(",alarmLevel:").append(getAlarmLevel());
sb.append(",alarmReceivePersonnel:").append(getAlarmReceivePersonnel());
sb.append(",receivePersonnelTelephone:").append(getReceivePersonnelTelephone());
sb.append(",alarmStatus:").append(getAlarmStatus());
sb.append(",alarmContent:").append(getAlarmContent());
return sb.toString();
}
public void initAttrValue(){
this.alarmTime = null;
this.alarmDevice = null;
this.siteId = null;
this.alarmType = null;
this.alarmLevel = null;
......@@ -236,5 +91,11 @@ public class DeviceAlarmInfoEntity extends DeviceAlarmInfoVo {
this.alarmStatus = 0;
this.alarmContent = "";
this.siteId = null;
this.deviceCode = "";
this.deviceName = "";
}
}
\ No newline at end of file
device-manager/src/main/java/com/mortals/xhx/module/device/model/DeviceAlarmInfoQuery.java
View file @ 70591c76
package com.mortals.xhx.module.device.model;
import java.util.Date;
import java.util.List;
import com.mortals.xhx.module.device.model.DeviceAlarmInfoEntity;
/**
* 设备告警日志查询对象
*
* @author zxfei
* @date 2022-08-22
* @date 2023-04-27
*/
public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
/** 开始 主键ID，主键，自增长 */
......@@ -22,6 +20,9 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
/** 主键ID，主键，自增长列表 */
private List <Long> idList;
/** 主键ID，主键，自增长排除列表 */
private List <Long> idNotList;
/** 开始 告警时间 */
private String alarmTimeStart;
......@@ -40,17 +41,8 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
/** 告警设备Id列表 */
private List <Long> alarmDeviceList;
/** 开始 站点Id，来源基础服务平台 */
private Long siteIdStart;
/** 结束 站点Id，来源基础服务平台 */
private Long siteIdEnd;
/** 增加 站点Id，来源基础服务平台 */
private Long siteIdIncrement;
/** 站点Id，来源基础服务平台列表 */
private List <Long> siteIdList;
/** 告警设备Id排除列表 */
private List <Long> alarmDeviceNotList;
/** 开始 告警类型,(0.离线) */
private Integer alarmTypeStart;
......@@ -64,6 +56,9 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
/** 告警类型,(0.离线)列表 */
private List <Integer> alarmTypeList;
/** 告警类型,(0.离线)排除列表 */
private List <Integer> alarmTypeNotList;
/** 开始 告警级别(0.危险，1.次要，2.一般) */
private Integer alarmLevelStart;
......@@ -76,12 +71,19 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
/** 告警级别(0.危险，1.次要，2.一般)列表 */
private List <Integer> alarmLevelList;
/** 告警级别(0.危险，1.次要，2.一般)排除列表 */
private List <Integer> alarmLevelNotList;
/** 接收人员[设备管理的责任人] */
private List<String> alarmReceivePersonnelList;
/** 接收人员[设备管理的责任人]排除列表 */
private List <String> alarmReceivePersonnelNotList;
/** 接收人员电话 */
private List<String> receivePersonnelTelephoneList;
/** 接收人员电话排除列表 */
private List <String> receivePersonnelTelephoneNotList;
/** 开始 告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认) */
private Integer alarmStatusStart;
......@@ -94,9 +96,14 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
/** 告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)列表 */
private List <Integer> alarmStatusList;
/** 告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)排除列表 */
private List <Integer> alarmStatusNotList;
/** 告警详细内容 */
private List<String> alarmContentList;
/** 告警详细内容排除列表 */
private List <String> alarmContentNotList;
/** 开始 创建时间 */
private String createTimeStart;
......@@ -115,12 +122,40 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
/** 更新用户列表 */
private List <Long> updateUserIdList;
/** 更新用户排除列表 */
private List <Long> updateUserIdNotList;
/** 开始 更新时间 */
private String updateTimeStart;
/** 结束 更新时间 */
private String updateTimeEnd;
/** 开始 站点Id，来源基础服务平台 */
private Long siteIdStart;
/** 结束 站点Id，来源基础服务平台 */
private Long siteIdEnd;
/** 增加 站点Id，来源基础服务平台 */
private Long siteIdIncrement;
/** 站点Id，来源基础服务平台列表 */
private List <Long> siteIdList;
/** 站点Id，来源基础服务平台排除列表 */
private List <Long> siteIdNotList;
/** 设备编码 */
private List<String> deviceCodeList;
/** 设备编码排除列表 */
private List <String> deviceCodeNotList;
/** 设备名称 */
private List<String> deviceNameList;
/** 设备名称排除列表 */
private List <String> deviceNameNotList;
/** OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4) */
private List<DeviceAlarmInfoQuery> orConditionList;
......@@ -193,6 +228,23 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
this.idList = idList;
}
/**
* 获取 主键ID，主键，自增长
* @return idNotList
*/
public List<Long> getIdNotList(){
return this.idNotList;
}
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public void setIdNotList(List<Long> idNotList){
this.idNotList = idNotList;
}
/**
* 获取 开始 告警时间
* @return alarmTimeStart
......@@ -290,68 +342,21 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
}
/**
* 获取 开始 站点Id，来源基础服务平台
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点Id，来源基础服务平台
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点Id，来源基础服务平台
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点Id，来源基础服务平台
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点Id，来源基础服务平台
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点Id，来源基础服务平台
* @param siteIdIncrement
* 获取 告警设备Id
* @return alarmDeviceNotList
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
public List<Long> getAlarmDeviceNotList(){
return this.alarmDeviceNotList;
}
/**
* 获取 站点Id，来源基础服务平台
* @return siteIdList
* 设置 告警设备Id
* @param alarmDeviceNotList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
public void setAlarmDeviceNotList(List<Long> alarmDeviceNotList){
this.alarmDeviceNotList = alarmDeviceNotList;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 开始 告警类型,(0.离线)
......@@ -417,6 +422,23 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
this.alarmTypeList = alarmTypeList;
}
/**
* 获取 告警类型,(0.离线)
* @return alarmTypeNotList
*/
public List<Integer> getAlarmTypeNotList(){
return this.alarmTypeNotList;
}
/**
* 设置 告警类型,(0.离线)
* @param alarmTypeNotList
*/
public void setAlarmTypeNotList(List<Integer> alarmTypeNotList){
this.alarmTypeNotList = alarmTypeNotList;
}
/**
* 获取 开始 告警级别(0.危险，1.次要，2.一般)
* @return alarmLevelStart
......@@ -481,6 +503,23 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
this.alarmLevelList = alarmLevelList;
}
/**
* 获取 告警级别(0.危险，1.次要，2.一般)
* @return alarmLevelNotList
*/
public List<Integer> getAlarmLevelNotList(){
return this.alarmLevelNotList;
}
/**
* 设置 告警级别(0.危险，1.次要，2.一般)
* @param alarmLevelNotList
*/
public void setAlarmLevelNotList(List<Integer> alarmLevelNotList){
this.alarmLevelNotList = alarmLevelNotList;
}
/**
* 获取 接收人员[设备管理的责任人]
* @return alarmReceivePersonnelList
......@@ -496,6 +535,23 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
public void setAlarmReceivePersonnelList(List<String> alarmReceivePersonnelList){
this.alarmReceivePersonnelList = alarmReceivePersonnelList;
}
/**
* 获取 接收人员[设备管理的责任人]
* @return alarmReceivePersonnelNotList
*/
public List<String> getAlarmReceivePersonnelNotList(){
return this.alarmReceivePersonnelNotList;
}
/**
* 设置 接收人员[设备管理的责任人]
* @param alarmReceivePersonnelNotList
*/
public void setAlarmReceivePersonnelNotList(List<String> alarmReceivePersonnelNotList){
this.alarmReceivePersonnelNotList = alarmReceivePersonnelNotList;
}
/**
* 获取 接收人员电话
* @return receivePersonnelTelephoneList
......@@ -511,6 +567,23 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
public void setReceivePersonnelTelephoneList(List<String> receivePersonnelTelephoneList){
this.receivePersonnelTelephoneList = receivePersonnelTelephoneList;
}
/**
* 获取 接收人员电话
* @return receivePersonnelTelephoneNotList
*/
public List<String> getReceivePersonnelTelephoneNotList(){
return this.receivePersonnelTelephoneNotList;
}
/**
* 设置 接收人员电话
* @param receivePersonnelTelephoneNotList
*/
public void setReceivePersonnelTelephoneNotList(List<String> receivePersonnelTelephoneNotList){
this.receivePersonnelTelephoneNotList = receivePersonnelTelephoneNotList;
}
/**
* 获取 开始 告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)
* @return alarmStatusStart
......@@ -575,6 +648,23 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
this.alarmStatusList = alarmStatusList;
}
/**
* 获取 告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)
* @return alarmStatusNotList
*/
public List<Integer> getAlarmStatusNotList(){
return this.alarmStatusNotList;
}
/**
* 设置 告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)
* @param alarmStatusNotList
*/
public void setAlarmStatusNotList(List<Integer> alarmStatusNotList){
this.alarmStatusNotList = alarmStatusNotList;
}
/**
* 获取 告警详细内容
* @return alarmContentList
......@@ -590,6 +680,23 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
public void setAlarmContentList(List<String> alarmContentList){
this.alarmContentList = alarmContentList;
}
/**
* 获取 告警详细内容
* @return alarmContentNotList
*/
public List<String> getAlarmContentNotList(){
return this.alarmContentNotList;
}
/**
* 设置 告警详细内容
* @param alarmContentNotList
*/
public void setAlarmContentNotList(List<String> alarmContentNotList){
this.alarmContentNotList = alarmContentNotList;
}
/**
* 获取 开始 创建时间
* @return createTimeStart
......@@ -686,6 +793,23 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
this.updateUserIdList = updateUserIdList;
}
/**
* 获取 更新用户
* @return updateUserIdNotList
*/
public List<Long> getUpdateUserIdNotList(){
return this.updateUserIdNotList;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public void setUpdateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
}
/**
* 获取 开始 更新时间
* @return updateTimeStart
......@@ -718,6 +842,151 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
this.updateTimeEnd = updateTimeEnd;
}
/**
* 获取 开始 站点Id，来源基础服务平台
* @return siteIdStart
*/
public Long getSiteIdStart(){
return this.siteIdStart;
}
/**
* 设置 开始 站点Id，来源基础服务平台
* @param siteIdStart
*/
public void setSiteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
}
/**
* 获取 结束 站点Id，来源基础服务平台
* @return $siteIdEnd
*/
public Long getSiteIdEnd(){
return this.siteIdEnd;
}
/**
* 设置 结束 站点Id，来源基础服务平台
* @param siteIdEnd
*/
public void setSiteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
}
/**
* 获取 增加 站点Id，来源基础服务平台
* @return siteIdIncrement
*/
public Long getSiteIdIncrement(){
return this.siteIdIncrement;
}
/**
* 设置 增加 站点Id，来源基础服务平台
* @param siteIdIncrement
*/
public void setSiteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
}
/**
* 获取 站点Id，来源基础服务平台
* @return siteIdList
*/
public List<Long> getSiteIdList(){
return this.siteIdList;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdList
*/
public void setSiteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
}
/**
* 获取 站点Id，来源基础服务平台
* @return siteIdNotList
*/
public List<Long> getSiteIdNotList(){
return this.siteIdNotList;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdNotList
*/
public void setSiteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
}
/**
* 获取 设备编码
* @return deviceCodeList
*/
public List<String> getDeviceCodeList(){
return this.deviceCodeList;
}
/**
* 设置 设备编码
* @param deviceCodeList
*/
public void setDeviceCodeList(List<String> deviceCodeList){
this.deviceCodeList = deviceCodeList;
}
/**
* 获取 设备编码
* @return deviceCodeNotList
*/
public List<String> getDeviceCodeNotList(){
return this.deviceCodeNotList;
}
/**
* 设置 设备编码
* @param deviceCodeNotList
*/
public void setDeviceCodeNotList(List<String> deviceCodeNotList){
this.deviceCodeNotList = deviceCodeNotList;
}
/**
* 获取 设备名称
* @return deviceNameList
*/
public List<String> getDeviceNameList(){
return this.deviceNameList;
}
/**
* 设置 设备名称
* @param deviceNameList
*/
public void setDeviceNameList(List<String> deviceNameList){
this.deviceNameList = deviceNameList;
}
/**
* 获取 设备名称
* @return deviceNameNotList
*/
public List<String> getDeviceNameNotList(){
return this.deviceNameNotList;
}
/**
* 设置 设备名称
* @param deviceNameNotList
*/
public void setDeviceNameNotList(List<String> deviceNameNotList){
this.deviceNameNotList = deviceNameNotList;
}
/**
* 设置 主键ID，主键，自增长
* @param id
......@@ -763,6 +1032,15 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
return this;
}
/**
* 设置 主键ID，主键，自增长
* @param idNotList
*/
public DeviceAlarmInfoQuery idNotList(List<Long> idNotList){
this.idNotList = idNotList;
return this;
}
/**
* 设置 告警设备Id
......@@ -810,47 +1088,11 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteId
*/
public DeviceAlarmInfoQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点Id，来源基础服务平台
* @param siteIdStart
*/
public DeviceAlarmInfoQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点Id，来源基础服务平台
* @param siteIdEnd
*/
public DeviceAlarmInfoQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点Id，来源基础服务平台
* @param siteIdIncrement
*/
public DeviceAlarmInfoQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdList
* 设置 告警设备Id
* @param alarmDeviceNotList
*/
public DeviceAlarmInfoQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
public DeviceAlarmInfoQuery alarmDeviceNotList(List<Long> alarmDeviceNotList){
this.alarmDeviceNotList = alarmDeviceNotList;
return this;
}
......@@ -899,6 +1141,15 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
return this;
}
/**
* 设置 告警类型,(0.离线)
* @param alarmTypeNotList
*/
public DeviceAlarmInfoQuery alarmTypeNotList(List<Integer> alarmTypeNotList){
this.alarmTypeNotList = alarmTypeNotList;
return this;
}
/**
* 设置 告警级别(0.危险，1.次要，2.一般)
* @param alarmLevel
......@@ -944,6 +1195,15 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
return this;
}
/**
* 设置 告警级别(0.危险，1.次要，2.一般)
* @param alarmLevelNotList
*/
public DeviceAlarmInfoQuery alarmLevelNotList(List<Integer> alarmLevelNotList){
this.alarmLevelNotList = alarmLevelNotList;
return this;
}
/**
* 设置 接收人员[设备管理的责任人]
......@@ -1027,6 +1287,15 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
return this;
}
/**
* 设置 告警状态,来自工单系统(0.未清除，1.清除未确认，2.清除已确认)
* @param alarmStatusNotList
*/
public DeviceAlarmInfoQuery alarmStatusNotList(List<Integer> alarmStatusNotList){
this.alarmStatusNotList = alarmStatusNotList;
return this;
}
/**
* 设置 告警详细内容
......@@ -1092,6 +1361,107 @@ public class DeviceAlarmInfoQuery extends DeviceAlarmInfoEntity {
return this;
}
/**
* 设置 更新用户
* @param updateUserIdNotList
*/
public DeviceAlarmInfoQuery updateUserIdNotList(List<Long> updateUserIdNotList){
this.updateUserIdNotList = updateUserIdNotList;
return this;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteId
*/
public DeviceAlarmInfoQuery siteId(Long siteId){
setSiteId(siteId);
return this;
}
/**
* 设置 开始 站点Id，来源基础服务平台
* @param siteIdStart
*/
public DeviceAlarmInfoQuery siteIdStart(Long siteIdStart){
this.siteIdStart = siteIdStart;
return this;
}
/**
* 设置 结束 站点Id，来源基础服务平台
* @param siteIdEnd
*/
public DeviceAlarmInfoQuery siteIdEnd(Long siteIdEnd){
this.siteIdEnd = siteIdEnd;
return this;
}
/**
* 设置 增加 站点Id，来源基础服务平台
* @param siteIdIncrement
*/
public DeviceAlarmInfoQuery siteIdIncrement(Long siteIdIncrement){
this.siteIdIncrement = siteIdIncrement;
return this;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdList
*/
public DeviceAlarmInfoQuery siteIdList(List<Long> siteIdList){
this.siteIdList = siteIdList;
return this;
}
/**
* 设置 站点Id，来源基础服务平台
* @param siteIdNotList
*/
public DeviceAlarmInfoQuery siteIdNotList(List<Long> siteIdNotList){
this.siteIdNotList = siteIdNotList;
return this;
}
/**
* 设置 设备编码
* @param deviceCode
*/
public DeviceAlarmInfoQuery deviceCode(String deviceCode){
setDeviceCode(deviceCode);
return this;
}
/**
* 设置 设备编码
* @param deviceCodeList
*/
public DeviceAlarmInfoQuery deviceCodeList(List<String> deviceCodeList){
this.deviceCodeList = deviceCodeList;
return this;
}
/**
* 设置 设备名称
* @param deviceName
*/
public DeviceAlarmInfoQuery deviceName(String deviceName){
setDeviceName(deviceName);
return this;
}
/**
* 设置 设备名称
* @param deviceNameList
*/
public DeviceAlarmInfoQuery deviceNameList(List<String> deviceNameList){
this.deviceNameList = deviceNameList;
return this;
}
/**
* 获取 OR条件集合，列表项之间是OR，项内容之间是AND，如：(list[0].1 and list[0].2) or (list[1].3 and list[1].4)
......
device-manager/src/main/java/com/mortals/xhx/module/device/web/DeviceAlarmInfoController.java
View file @ 70591c76
......@@ -2,17 +2,14 @@ package com.mortals.xhx.module.device.web;
import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context;
import com.mortals.framework.model.OrderCol;
import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
import com.mortals.xhx.base.system.param.service.ParamService;
import com.mortals.xhx.common.code.DeviceStatusEnum;
import com.mortals.xhx.common.code.YesNoEnum;
import com.mortals.xhx.module.device.model.DeviceAlarmInfoEntity;
import com.mortals.xhx.module.device.model.DeviceEntity;
import com.mortals.xhx.module.device.model.DeviceQuery;
import com.mortals.xhx.module.device.service.DeviceAlarmInfoService;
import com.mortals.xhx.module.device.service.DeviceService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -48,14 +45,22 @@ public class DeviceAlarmInfoController extends BaseCRUDJsonBodyMappingController
super.init(model, context);
}
@Override
protected void doListBefore(DeviceAlarmInfoEntity query, Map<String, Object> model, Context context) throws AppException {
query.setOrderField("createTime");
query.setOrderKind(OrderCol.DESCENDING);
super.doListBefore(query, model, context);
}
@Override
protected int doListAfter(DeviceAlarmInfoEntity query, Map<String, Object> model, Context context) throws AppException {
List<DeviceAlarmInfoEntity> alarmInfoEntityList = this.service.find(query, context);
Map<Integer, Long> collect = alarmInfoEntityList.stream().collect(Collectors.groupingBy(DeviceAlarmInfoEntity::getAlarmLevel, Collectors.counting()));
model.put("totalCount", alarmInfoEntityList.size());
model.put("dangerCount", collect.getOrDefault(0,0L));
model.put("subCount", collect.getOrDefault(1,0L));
model.put("normalCount", collect.getOrDefault(2,0L));
model.put("dangerCount", collect.getOrDefault(0, 0L));
model.put("subCount", collect.getOrDefault(1, 0L));
model.put("normalCount", collect.getOrDefault(2, 0L));
return super.doListAfter(query, model, context);
}
......
device-manager/src/main/resources/sqlmap/module/device/DeviceAlarmInfoMapper.xml
View file @ 70591c76
......@@ -8,7 +8,6 @@
<id property="id" column="id" />
<result property="alarmTime" column="alarmTime" />
<result property="alarmDevice" column="alarmDevice" />
<result property="siteId" column="siteId" />
<result property="alarmType" column="alarmType" />
<result property="alarmLevel" column="alarmLevel" />
<result property="alarmReceivePersonnel" column="alarmReceivePersonnel" />
......@@ -18,6 +17,9 @@
<result property="createTime" column="createTime" />
<result property="updateUserId" column="updateUserId" />
<result property="updateTime" column="updateTime" />
<result property="siteId" column="siteId" />
<result property="deviceCode" column="deviceCode" />
<result property="deviceName" column="deviceName" />
</resultMap>
......@@ -34,9 +36,6 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('alarmDevice') or colPickMode == 1 and data.containsKey('alarmDevice')))">
a.alarmDevice,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('alarmType') or colPickMode == 1 and data.containsKey('alarmType')))">
a.alarmType,
</if>
......@@ -64,23 +63,32 @@
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('updateTime') or colPickMode == 1 and data.containsKey('updateTime')))">
a.updateTime,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('siteId') or colPickMode == 1 and data.containsKey('siteId')))">
a.siteId,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceCode') or colPickMode == 1 and data.containsKey('deviceCode')))">
a.deviceCode,
</if>
<if test="(data == null) or (data != null and ( colPickMode == 0 and !data.containsKey('deviceName') or colPickMode == 1 and data.containsKey('deviceName')))">
a.deviceName,
</if>
</trim>
</sql>
<!-- 新增 区分主键自增加还是业务插入 -->
<insert id="insert" parameterType="DeviceAlarmInfoEntity" useGeneratedKeys="true" keyProperty="id">
insert into mortals_xhx_device_alarm_info
(alarmTime,alarmDevice,siteId,alarmType,alarmLevel,alarmReceivePersonnel,receivePersonnelTelephone,alarmStatus,alarmContent,createTime,updateUserId,updateTime)
(alarmTime,alarmDevice,alarmType,alarmLevel,alarmReceivePersonnel,receivePersonnelTelephone,alarmStatus,alarmContent,createTime,updateUserId,updateTime,siteId,deviceCode,deviceName)
VALUES
(#{alarmTime},#{alarmDevice},#{siteId},#{alarmType},#{alarmLevel},#{alarmReceivePersonnel},#{receivePersonnelTelephone},#{alarmStatus},#{alarmContent},#{createTime},#{updateUserId},#{updateTime})
(#{alarmTime},#{alarmDevice},#{alarmType},#{alarmLevel},#{alarmReceivePersonnel},#{receivePersonnelTelephone},#{alarmStatus},#{alarmContent},#{createTime},#{updateUserId},#{updateTime},#{siteId},#{deviceCode},#{deviceName})
</insert>
<!-- 批量新增 -->
<insert id="insertBatch" parameterType="paramDto">
insert into mortals_xhx_device_alarm_info
(alarmTime,alarmDevice,siteId,alarmType,alarmLevel,alarmReceivePersonnel,receivePersonnelTelephone,alarmStatus,alarmContent,createTime,updateUserId,updateTime)
(alarmTime,alarmDevice,alarmType,alarmLevel,alarmReceivePersonnel,receivePersonnelTelephone,alarmStatus,alarmContent,createTime,updateUserId,updateTime,siteId,deviceCode,deviceName)
VALUES
<foreach collection="data.dataList" item="item" index="index" separator="," >
(#{item.alarmTime},#{item.alarmDevice},#{item.siteId},#{item.alarmType},#{item.alarmLevel},#{item.alarmReceivePersonnel},#{item.receivePersonnelTelephone},#{item.alarmStatus},#{item.alarmContent},#{item.createTime},#{item.updateUserId},#{item.updateTime})
(#{item.alarmTime},#{item.alarmDevice},#{item.alarmType},#{item.alarmLevel},#{item.alarmReceivePersonnel},#{item.receivePersonnelTelephone},#{item.alarmStatus},#{item.alarmContent},#{item.createTime},#{item.updateUserId},#{item.updateTime},#{item.siteId},#{item.deviceCode},#{item.deviceName})
</foreach>
</insert>
......@@ -99,12 +107,6 @@
<if test="(colPickMode==0 and data.containsKey('alarmDeviceIncrement')) or (colPickMode==1 and !data.containsKey('alarmDeviceIncrement'))">
a.alarmDevice=ifnull(a.alarmDevice,0) + #{data.alarmDeviceIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('alarmType')) or (colPickMode==1 and !data.containsKey('alarmType'))">
a.alarmType=#{data.alarmType},
</if>
......@@ -144,6 +146,18 @@
<if test="(colPickMode==0 and data.containsKey('updateTime')) or (colPickMode==1 and !data.containsKey('updateTime'))">
a.updateTime=#{data.updateTime},
</if>
<if test="(colPickMode==0 and data.containsKey('siteId')) or (colPickMode==1 and !data.containsKey('siteId'))">
a.siteId=#{data.siteId},
</if>
<if test="(colPickMode==0 and data.containsKey('siteIdIncrement')) or (colPickMode==1 and !data.containsKey('siteIdIncrement'))">
a.siteId=ifnull(a.siteId,0) + #{data.siteIdIncrement},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceCode')) or (colPickMode==1 and !data.containsKey('deviceCode'))">
a.deviceCode=#{data.deviceCode},
</if>
<if test="(colPickMode==0 and data.containsKey('deviceName')) or (colPickMode==1 and !data.containsKey('deviceName'))">
a.deviceName=#{data.deviceName},
</if>
</trim>
<trim suffixOverrides="where" suffix="">
where
......@@ -175,18 +189,6 @@
</choose>
</foreach>
</trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="alarmType=(case" suffix="ELSE alarmType end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
......@@ -270,6 +272,32 @@
</if>
</foreach>
</trim>
<trim prefix="siteId=(case" suffix="ELSE siteId end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<choose>
<when test="(colPickMode==0 and item.containsKey('siteId')) or (colPickMode==1 and !item.containsKey('siteId'))">
when a.id=#{item.id} then #{item.siteId}
</when>
<when test="(colPickMode==0 and item.containsKey('siteIdIncrement')) or (colPickMode==1 and !item.containsKey('siteIdIncrement'))">
when a.id=#{item.id} then ifnull(a.siteId,0) + #{item.siteIdIncrement}
</when>
</choose>
</foreach>
</trim>
<trim prefix="deviceCode=(case" suffix="ELSE deviceCode end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceCode')) or (colPickMode==1 and !item.containsKey('deviceCode'))">
when a.id=#{item.id} then #{item.deviceCode}
</if>
</foreach>
</trim>
<trim prefix="deviceName=(case" suffix="ELSE deviceName end),">
<foreach collection="data.dataList" item="item" index="index" separator="" >
<if test="(colPickMode==0 and item.containsKey('deviceName')) or (colPickMode==1 and !item.containsKey('deviceName'))">
when a.id=#{item.id} then #{item.deviceName}
</if>
</foreach>
</trim>
</trim>
where id in
<foreach collection="data.dataList" item="item" index="index" open="(" separator="," close=")">
......@@ -293,6 +321,21 @@
#{item}
</foreach>
</delete>
<!-- 根据主健列表删除一批，针对单一主健有效 -->
<delete id="deleteByKeyList">
delete from mortals_xhx_device_alarm_info where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item}
</foreach>
</delete>
<!-- 根据对象列表删除一批，针对单一主健有效 -->
<delete id="deleteByEntityList">
delete from mortals_xhx_device_alarm_info where id in
<foreach collection="list" item="item" index="index" open="(" separator="," close=")">
#{item.id}
</foreach>
</delete>
<!-- 根据paramDto删除一批 -->
<delete id="deleteByMap" parameterType="paramDto">
delete a.* from mortals_xhx_device_alarm_info as a
......@@ -379,12 +422,18 @@
${_conditionType_} a.id is null
</if>
</if>
<if test="conditionParamRef.containsKey('idList')">
<if test="conditionParamRef.containsKey('idList') and conditionParamRef.idList.size() > 0">
${_conditionType_} a.id in
<foreach collection="conditionParamRef.idList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idNotList') and conditionParamRef.idNotList.size() > 0">
${_conditionType_} a.id not in
<foreach collection="conditionParamRef.idNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('idStart') and conditionParamRef.idStart != null">
${_conditionType_} a.id <![CDATA[ >= ]]> #{${_conditionParam_}.idStart}
</if>
......@@ -415,12 +464,18 @@
${_conditionType_} a.alarmDevice is null
</if>
</if>
<if test="conditionParamRef.containsKey('alarmDeviceList')">
<if test="conditionParamRef.containsKey('alarmDeviceList') and conditionParamRef.alarmDeviceList.size() > 0">
${_conditionType_} a.alarmDevice in
<foreach collection="conditionParamRef.alarmDeviceList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmDeviceNotList') and conditionParamRef.alarmDeviceNotList.size() > 0">
${_conditionType_} a.alarmDevice not in
<foreach collection="conditionParamRef.alarmDeviceNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmDeviceStart') and conditionParamRef.alarmDeviceStart != null">
${_conditionType_} a.alarmDevice <![CDATA[ >= ]]> #{${_conditionParam_}.alarmDeviceStart}
</if>
......@@ -428,27 +483,6 @@
${_conditionType_} a.alarmDevice <![CDATA[ <= ]]> #{${_conditionParam_}.alarmDeviceEnd}
</if>
<if test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList')">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('alarmType')">
<if test="conditionParamRef.alarmType != null ">
${_conditionType_} a.alarmType = #{${_conditionParam_}.alarmType}
......@@ -457,12 +491,18 @@
${_conditionType_} a.alarmType is null
</if>
</if>
<if test="conditionParamRef.containsKey('alarmTypeList')">
<if test="conditionParamRef.containsKey('alarmTypeList') and conditionParamRef.alarmTypeList.size() > 0">
${_conditionType_} a.alarmType in
<foreach collection="conditionParamRef.alarmTypeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmTypeNotList') and conditionParamRef.alarmTypeNotList.size() > 0">
${_conditionType_} a.alarmType not in
<foreach collection="conditionParamRef.alarmTypeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmTypeStart') and conditionParamRef.alarmTypeStart != null">
${_conditionType_} a.alarmType <![CDATA[ >= ]]> #{${_conditionParam_}.alarmTypeStart}
</if>
......@@ -478,12 +518,18 @@
${_conditionType_} a.alarmLevel is null
</if>
</if>
<if test="conditionParamRef.containsKey('alarmLevelList')">
<if test="conditionParamRef.containsKey('alarmLevelList') and conditionParamRef.alarmLevelList.size() > 0">
${_conditionType_} a.alarmLevel in
<foreach collection="conditionParamRef.alarmLevelList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmLevelNotList') and conditionParamRef.alarmLevelNotList.size() > 0">
${_conditionType_} a.alarmLevel not in
<foreach collection="conditionParamRef.alarmLevelNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmLevelStart') and conditionParamRef.alarmLevelStart != null">
${_conditionType_} a.alarmLevel <![CDATA[ >= ]]> #{${_conditionParam_}.alarmLevelStart}
</if>
......@@ -500,12 +546,18 @@
${_conditionType_} a.alarmReceivePersonnel is null
</if>
</if>
<if test="conditionParamRef.containsKey('alarmReceivePersonnelList')">
<if test="conditionParamRef.containsKey('alarmReceivePersonnelList') and conditionParamRef.alarmReceivePersonnelList.size() > 0">
${_conditionType_} a.alarmReceivePersonnel in
<foreach collection="conditionParamRef.alarmReceivePersonnelList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmReceivePersonnelNotList') and conditionParamRef.alarmReceivePersonnelNotList.size() > 0">
${_conditionType_} a.alarmReceivePersonnel not in
<foreach collection="conditionParamRef.alarmReceivePersonnelNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('receivePersonnelTelephone')">
<if test="conditionParamRef.receivePersonnelTelephone != null and conditionParamRef.receivePersonnelTelephone != ''">
......@@ -515,12 +567,18 @@
${_conditionType_} a.receivePersonnelTelephone is null
</if>
</if>
<if test="conditionParamRef.containsKey('receivePersonnelTelephoneList')">
<if test="conditionParamRef.containsKey('receivePersonnelTelephoneList') and conditionParamRef.receivePersonnelTelephoneList.size() > 0">
${_conditionType_} a.receivePersonnelTelephone in
<foreach collection="conditionParamRef.receivePersonnelTelephoneList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('receivePersonnelTelephoneNotList') and conditionParamRef.receivePersonnelTelephoneNotList.size() > 0">
${_conditionType_} a.receivePersonnelTelephone not in
<foreach collection="conditionParamRef.receivePersonnelTelephoneNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmStatus')">
<if test="conditionParamRef.alarmStatus != null ">
${_conditionType_} a.alarmStatus = #{${_conditionParam_}.alarmStatus}
......@@ -529,12 +587,18 @@
${_conditionType_} a.alarmStatus is null
</if>
</if>
<if test="conditionParamRef.containsKey('alarmStatusList')">
<if test="conditionParamRef.containsKey('alarmStatusList') and conditionParamRef.alarmStatusList.size() > 0">
${_conditionType_} a.alarmStatus in
<foreach collection="conditionParamRef.alarmStatusList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmStatusNotList') and conditionParamRef.alarmStatusNotList.size() > 0">
${_conditionType_} a.alarmStatus not in
<foreach collection="conditionParamRef.alarmStatusNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmStatusStart') and conditionParamRef.alarmStatusStart != null">
${_conditionType_} a.alarmStatus <![CDATA[ >= ]]> #{${_conditionParam_}.alarmStatusStart}
</if>
......@@ -551,12 +615,18 @@
${_conditionType_} a.alarmContent is null
</if>
</if>
<if test="conditionParamRef.containsKey('alarmContentList')">
<if test="conditionParamRef.containsKey('alarmContentList') and conditionParamRef.alarmContentList.size() > 0">
${_conditionType_} a.alarmContent in
<foreach collection="conditionParamRef.alarmContentList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('alarmContentNotList') and conditionParamRef.alarmContentNotList.size() > 0">
${_conditionType_} a.alarmContent not in
<foreach collection="conditionParamRef.alarmContentNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('createTime')">
<if test="conditionParamRef.createTime != null ">
......@@ -580,12 +650,18 @@
${_conditionType_} a.updateUserId is null
</if>
</if>
<if test="conditionParamRef.containsKey('updateUserIdList')">
<if test="conditionParamRef.containsKey('updateUserIdList') and conditionParamRef.updateUserIdList.size() > 0">
${_conditionType_} a.updateUserId in
<foreach collection="conditionParamRef.updateUserIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdNotList') and conditionParamRef.updateUserIdNotList.size() > 0">
${_conditionType_} a.updateUserId not in
<foreach collection="conditionParamRef.updateUserIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('updateUserIdStart') and conditionParamRef.updateUserIdStart != null">
${_conditionType_} a.updateUserId <![CDATA[ >= ]]> #{${_conditionParam_}.updateUserIdStart}
</if>
......@@ -608,6 +684,75 @@
<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 test="conditionParamRef.containsKey('siteId')">
<if test="conditionParamRef.siteId != null ">
${_conditionType_} a.siteId = #{${_conditionParam_}.siteId}
</if>
<if test="conditionParamRef.siteId == null">
${_conditionType_} a.siteId is null
</if>
</if>
<if test="conditionParamRef.containsKey('siteIdList') and conditionParamRef.siteIdList.size() > 0">
${_conditionType_} a.siteId in
<foreach collection="conditionParamRef.siteIdList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdNotList') and conditionParamRef.siteIdNotList.size() > 0">
${_conditionType_} a.siteId not in
<foreach collection="conditionParamRef.siteIdNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('siteIdStart') and conditionParamRef.siteIdStart != null">
${_conditionType_} a.siteId <![CDATA[ >= ]]> #{${_conditionParam_}.siteIdStart}
</if>
<if test="conditionParamRef.containsKey('siteIdEnd') and conditionParamRef.siteIdEnd != null">
${_conditionType_} a.siteId <![CDATA[ <= ]]> #{${_conditionParam_}.siteIdEnd}
</if>
<if test="conditionParamRef.containsKey('deviceCode')">
<if test="conditionParamRef.deviceCode != null and conditionParamRef.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') and conditionParamRef.deviceCodeList.size() > 0">
${_conditionType_} a.deviceCode in
<foreach collection="conditionParamRef.deviceCodeList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceCodeNotList') and conditionParamRef.deviceCodeNotList.size() > 0">
${_conditionType_} a.deviceCode not in
<foreach collection="conditionParamRef.deviceCodeNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceName')">
<if test="conditionParamRef.deviceName != null and conditionParamRef.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') and conditionParamRef.deviceNameList.size() > 0">
${_conditionType_} a.deviceName in
<foreach collection="conditionParamRef.deviceNameList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
<if test="conditionParamRef.containsKey('deviceNameNotList') and conditionParamRef.deviceNameNotList.size() > 0">
${_conditionType_} a.deviceName not in
<foreach collection="conditionParamRef.deviceNameNotList" open="(" close=")" index="index" item="item" separator=",">
#{item}
</foreach>
</if>
</sql>
<sql id="_orderCols_">
<if test="orderColList != null and !orderColList.isEmpty()">
......@@ -636,11 +781,6 @@
<if test='orderCol.alarmDevice != null and "DESC".equalsIgnoreCase(orderCol.alarmDevice)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('alarmType')">
a.alarmType
<if test='orderCol.alarmType != null and "DESC".equalsIgnoreCase(orderCol.alarmType)'>DESC</if>
......@@ -686,6 +826,21 @@
<if test='orderCol.updateTime != null and "DESC".equalsIgnoreCase(orderCol.updateTime)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('siteId')">
a.siteId
<if test='orderCol.siteId != null and "DESC".equalsIgnoreCase(orderCol.siteId)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deviceCode')">
a.deviceCode
<if test='orderCol.deviceCode != null and "DESC".equalsIgnoreCase(orderCol.deviceCode)'>DESC</if>
,
</if>
<if test="orderCol.containsKey('deviceName')">
a.deviceName
<if test='orderCol.deviceName != null and "DESC".equalsIgnoreCase(orderCol.deviceName)'>DESC</if>
,
</if>
</trim>
</if>
</sql>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment