parent
7e8f292a48
commit
d2819a22f2
@ -1,479 +1,222 @@
|
||||
package com.ruoyi.page.domain;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
import com.baomidou.mybatisplus.annotation.TableField;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
import com.ruoyi.common.annotation.Excel;
|
||||
import com.ruoyi.common.core.domain.BaseEntity;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* 报警事件对象 alarm
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2024-05-30
|
||||
*/
|
||||
public class Alarm extends BaseEntity
|
||||
{
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键id */
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class Alarm extends BaseEntity {
|
||||
|
||||
private static final long serialVersionUID = 682569575060211748L;
|
||||
/**
|
||||
* 主键id
|
||||
*/
|
||||
private Long emergencyEventId;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long emergencyEventSource;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long emergencyEventStatus;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long warnResponseStatus;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long emergencyResponseStatus;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String emergencyEventTitle;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long emergencyEventType;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long emergencyEventLevel;
|
||||
|
||||
/** 报警时间 */
|
||||
/**
|
||||
* 报警时间
|
||||
*/
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "报警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date emergencyEventTime;
|
||||
|
||||
/** 报警内容 */
|
||||
/**
|
||||
* 报警内容
|
||||
*/
|
||||
@Excel(name = "报警内容")
|
||||
private String emergencyEventDesc;
|
||||
|
||||
/** 报警地址 */
|
||||
/**
|
||||
* 报警地址
|
||||
*/
|
||||
@Excel(name = "报警地址")
|
||||
private String emergencyEventAddress;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String emergencyEventArea;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private BigDecimal emergencyEventLon;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private BigDecimal emergencyEventLat;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String submitUnit;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String submitUnitContact;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String submitUnitTelephone;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String reportPerson;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String reportPersonTelephone;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String fileUrls;
|
||||
|
||||
/** 是否删除 0未删除 1删除 */
|
||||
/**
|
||||
* 是否删除 0未删除 1删除
|
||||
*/
|
||||
private Integer delFlag;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String sendOutTimes;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long groupId;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long isRehearsal;
|
||||
|
||||
/** 报警电话 */
|
||||
/**
|
||||
* 报警电话
|
||||
*/
|
||||
@Excel(name = "报警电话")
|
||||
private String alarmPhoneNumber;
|
||||
|
||||
/** 源id */
|
||||
/**
|
||||
* 源id
|
||||
*/
|
||||
@Excel(name = "源id")
|
||||
private String sourceId;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private Long isJudged;
|
||||
|
||||
/** $column.columnComment */
|
||||
/**
|
||||
* $column.columnComment
|
||||
*/
|
||||
@Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
|
||||
private String eventDetail;
|
||||
|
||||
/** 预警大类 */
|
||||
/**
|
||||
* 预警大类
|
||||
*/
|
||||
@Excel(name = "预警大类")
|
||||
private String aiClass;
|
||||
|
||||
/** 预警小类 */
|
||||
/**
|
||||
* 预警小类
|
||||
*/
|
||||
@Excel(name = "预警小类")
|
||||
private String aiClass2;
|
||||
|
||||
/** 紧急程度 */
|
||||
/**
|
||||
* 紧急程度
|
||||
*/
|
||||
@Excel(name = "紧急程度")
|
||||
private String aiLevel;
|
||||
|
||||
/** 紧急系数 */
|
||||
/**
|
||||
* 紧急系数
|
||||
*/
|
||||
@Excel(name = "紧急系数")
|
||||
private BigDecimal aiNum;
|
||||
|
||||
public void setEmergencyEventId(Long emergencyEventId)
|
||||
{
|
||||
this.emergencyEventId = emergencyEventId;
|
||||
}
|
||||
|
||||
public Long getEmergencyEventId()
|
||||
{
|
||||
return emergencyEventId;
|
||||
}
|
||||
public void setEmergencyEventSource(Long emergencyEventSource)
|
||||
{
|
||||
this.emergencyEventSource = emergencyEventSource;
|
||||
}
|
||||
|
||||
public Long getEmergencyEventSource()
|
||||
{
|
||||
return emergencyEventSource;
|
||||
}
|
||||
public void setEmergencyEventStatus(Long emergencyEventStatus)
|
||||
{
|
||||
this.emergencyEventStatus = emergencyEventStatus;
|
||||
}
|
||||
|
||||
public Long getEmergencyEventStatus()
|
||||
{
|
||||
return emergencyEventStatus;
|
||||
}
|
||||
public void setWarnResponseStatus(Long warnResponseStatus)
|
||||
{
|
||||
this.warnResponseStatus = warnResponseStatus;
|
||||
}
|
||||
|
||||
public Long getWarnResponseStatus()
|
||||
{
|
||||
return warnResponseStatus;
|
||||
}
|
||||
public void setEmergencyResponseStatus(Long emergencyResponseStatus)
|
||||
{
|
||||
this.emergencyResponseStatus = emergencyResponseStatus;
|
||||
}
|
||||
|
||||
public Long getEmergencyResponseStatus()
|
||||
{
|
||||
return emergencyResponseStatus;
|
||||
}
|
||||
public void setEmergencyEventTitle(String emergencyEventTitle)
|
||||
{
|
||||
this.emergencyEventTitle = emergencyEventTitle;
|
||||
}
|
||||
|
||||
public String getEmergencyEventTitle()
|
||||
{
|
||||
return emergencyEventTitle;
|
||||
}
|
||||
public void setEmergencyEventType(Long emergencyEventType)
|
||||
{
|
||||
this.emergencyEventType = emergencyEventType;
|
||||
}
|
||||
|
||||
public Long getEmergencyEventType()
|
||||
{
|
||||
return emergencyEventType;
|
||||
}
|
||||
public void setEmergencyEventLevel(Long emergencyEventLevel)
|
||||
{
|
||||
this.emergencyEventLevel = emergencyEventLevel;
|
||||
}
|
||||
|
||||
public Long getEmergencyEventLevel()
|
||||
{
|
||||
return emergencyEventLevel;
|
||||
}
|
||||
public void setEmergencyEventTime(Date emergencyEventTime)
|
||||
{
|
||||
this.emergencyEventTime = emergencyEventTime;
|
||||
}
|
||||
|
||||
public Date getEmergencyEventTime()
|
||||
{
|
||||
return emergencyEventTime;
|
||||
}
|
||||
public void setEmergencyEventDesc(String emergencyEventDesc)
|
||||
{
|
||||
this.emergencyEventDesc = emergencyEventDesc;
|
||||
}
|
||||
|
||||
public String getEmergencyEventDesc()
|
||||
{
|
||||
return emergencyEventDesc;
|
||||
}
|
||||
public void setEmergencyEventAddress(String emergencyEventAddress)
|
||||
{
|
||||
this.emergencyEventAddress = emergencyEventAddress;
|
||||
}
|
||||
|
||||
public String getEmergencyEventAddress()
|
||||
{
|
||||
return emergencyEventAddress;
|
||||
}
|
||||
public void setEmergencyEventArea(String emergencyEventArea)
|
||||
{
|
||||
this.emergencyEventArea = emergencyEventArea;
|
||||
}
|
||||
|
||||
public String getEmergencyEventArea()
|
||||
{
|
||||
return emergencyEventArea;
|
||||
}
|
||||
public void setEmergencyEventLon(BigDecimal emergencyEventLon)
|
||||
{
|
||||
this.emergencyEventLon = emergencyEventLon;
|
||||
}
|
||||
|
||||
public BigDecimal getEmergencyEventLon()
|
||||
{
|
||||
return emergencyEventLon;
|
||||
}
|
||||
public void setEmergencyEventLat(BigDecimal emergencyEventLat)
|
||||
{
|
||||
this.emergencyEventLat = emergencyEventLat;
|
||||
}
|
||||
|
||||
public BigDecimal getEmergencyEventLat()
|
||||
{
|
||||
return emergencyEventLat;
|
||||
}
|
||||
public void setSubmitUnit(String submitUnit)
|
||||
{
|
||||
this.submitUnit = submitUnit;
|
||||
}
|
||||
|
||||
public String getSubmitUnit()
|
||||
{
|
||||
return submitUnit;
|
||||
}
|
||||
public void setSubmitUnitContact(String submitUnitContact)
|
||||
{
|
||||
this.submitUnitContact = submitUnitContact;
|
||||
}
|
||||
|
||||
public String getSubmitUnitContact()
|
||||
{
|
||||
return submitUnitContact;
|
||||
}
|
||||
public void setSubmitUnitTelephone(String submitUnitTelephone)
|
||||
{
|
||||
this.submitUnitTelephone = submitUnitTelephone;
|
||||
}
|
||||
|
||||
public String getSubmitUnitTelephone()
|
||||
{
|
||||
return submitUnitTelephone;
|
||||
}
|
||||
public void setReportPerson(String reportPerson)
|
||||
{
|
||||
this.reportPerson = reportPerson;
|
||||
}
|
||||
|
||||
public String getReportPerson()
|
||||
{
|
||||
return reportPerson;
|
||||
}
|
||||
public void setReportPersonTelephone(String reportPersonTelephone)
|
||||
{
|
||||
this.reportPersonTelephone = reportPersonTelephone;
|
||||
}
|
||||
|
||||
public String getReportPersonTelephone()
|
||||
{
|
||||
return reportPersonTelephone;
|
||||
}
|
||||
public void setFileUrls(String fileUrls)
|
||||
{
|
||||
this.fileUrls = fileUrls;
|
||||
}
|
||||
|
||||
public String getFileUrls()
|
||||
{
|
||||
return fileUrls;
|
||||
}
|
||||
public void setDelFlag(Integer delFlag)
|
||||
{
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
public Integer getDelFlag()
|
||||
{
|
||||
return delFlag;
|
||||
}
|
||||
public void setSendOutTimes(String sendOutTimes)
|
||||
{
|
||||
this.sendOutTimes = sendOutTimes;
|
||||
}
|
||||
|
||||
public String getSendOutTimes()
|
||||
{
|
||||
return sendOutTimes;
|
||||
}
|
||||
public void setGroupId(Long groupId)
|
||||
{
|
||||
this.groupId = groupId;
|
||||
}
|
||||
|
||||
public Long getGroupId()
|
||||
{
|
||||
return groupId;
|
||||
}
|
||||
public void setIsRehearsal(Long isRehearsal)
|
||||
{
|
||||
this.isRehearsal = isRehearsal;
|
||||
}
|
||||
|
||||
public Long getIsRehearsal()
|
||||
{
|
||||
return isRehearsal;
|
||||
}
|
||||
public void setAlarmPhoneNumber(String alarmPhoneNumber)
|
||||
{
|
||||
this.alarmPhoneNumber = alarmPhoneNumber;
|
||||
}
|
||||
|
||||
public String getAlarmPhoneNumber()
|
||||
{
|
||||
return alarmPhoneNumber;
|
||||
}
|
||||
public void setSourceId(String sourceId)
|
||||
{
|
||||
this.sourceId = sourceId;
|
||||
}
|
||||
|
||||
public String getSourceId()
|
||||
{
|
||||
return sourceId;
|
||||
}
|
||||
public void setIsJudged(Long isJudged)
|
||||
{
|
||||
this.isJudged = isJudged;
|
||||
}
|
||||
|
||||
public Long getIsJudged()
|
||||
{
|
||||
return isJudged;
|
||||
}
|
||||
public void setEventDetail(String eventDetail)
|
||||
{
|
||||
this.eventDetail = eventDetail;
|
||||
}
|
||||
|
||||
public String getEventDetail()
|
||||
{
|
||||
return eventDetail;
|
||||
}
|
||||
public void setAiClass(String aiClass)
|
||||
{
|
||||
this.aiClass = aiClass;
|
||||
}
|
||||
|
||||
public String getAiClass()
|
||||
{
|
||||
return aiClass;
|
||||
}
|
||||
public void setAiClass2(String aiClass2)
|
||||
{
|
||||
this.aiClass2 = aiClass2;
|
||||
}
|
||||
|
||||
public String getAiClass2()
|
||||
{
|
||||
return aiClass2;
|
||||
}
|
||||
public void setAiLevel(String aiLevel)
|
||||
{
|
||||
this.aiLevel = aiLevel;
|
||||
}
|
||||
|
||||
public String getAiLevel()
|
||||
{
|
||||
return aiLevel;
|
||||
}
|
||||
public void setAiNum(BigDecimal aiNum)
|
||||
{
|
||||
this.aiNum = aiNum;
|
||||
}
|
||||
|
||||
public BigDecimal getAiNum()
|
||||
{
|
||||
return aiNum;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("emergencyEventId", getEmergencyEventId())
|
||||
.append("emergencyEventSource", getEmergencyEventSource())
|
||||
.append("emergencyEventStatus", getEmergencyEventStatus())
|
||||
.append("warnResponseStatus", getWarnResponseStatus())
|
||||
.append("emergencyResponseStatus", getEmergencyResponseStatus())
|
||||
.append("emergencyEventTitle", getEmergencyEventTitle())
|
||||
.append("emergencyEventType", getEmergencyEventType())
|
||||
.append("emergencyEventLevel", getEmergencyEventLevel())
|
||||
.append("emergencyEventTime", getEmergencyEventTime())
|
||||
.append("emergencyEventDesc", getEmergencyEventDesc())
|
||||
.append("emergencyEventAddress", getEmergencyEventAddress())
|
||||
.append("emergencyEventArea", getEmergencyEventArea())
|
||||
.append("emergencyEventLon", getEmergencyEventLon())
|
||||
.append("emergencyEventLat", getEmergencyEventLat())
|
||||
.append("submitUnit", getSubmitUnit())
|
||||
.append("submitUnitContact", getSubmitUnitContact())
|
||||
.append("submitUnitTelephone", getSubmitUnitTelephone())
|
||||
.append("reportPerson", getReportPerson())
|
||||
.append("reportPersonTelephone", getReportPersonTelephone())
|
||||
.append("remark", getRemark())
|
||||
.append("fileUrls", getFileUrls())
|
||||
.append("delFlag", getDelFlag())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("sendOutTimes", getSendOutTimes())
|
||||
.append("groupId", getGroupId())
|
||||
.append("isRehearsal", getIsRehearsal())
|
||||
.append("alarmPhoneNumber", getAlarmPhoneNumber())
|
||||
.append("sourceId", getSourceId())
|
||||
.append("isJudged", getIsJudged())
|
||||
.append("eventDetail", getEventDetail())
|
||||
.append("aiClass", getAiClass())
|
||||
.append("aiClass2", getAiClass2())
|
||||
.append("aiLevel", getAiLevel())
|
||||
.append("aiNum", getAiNum())
|
||||
.toString();
|
||||
}
|
||||
/**
|
||||
* 120的event_id
|
||||
*/
|
||||
@ApiModelProperty(value = "120的event_id")
|
||||
@TableField(value = "ai_120_id")
|
||||
private String ai120Id;
|
||||
}
|
||||
|
||||
@ -1,99 +1,91 @@
|
||||
package com.ruoyi.page.service.impl;
|
||||
|
||||
import java.util.List;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.page.domain.Alarm;
|
||||
import com.ruoyi.page.domain.dto.request.AlarmFindRequest;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.ruoyi.page.mapper.AlarmMapper;
|
||||
import com.ruoyi.page.domain.Alarm;
|
||||
import com.ruoyi.page.service.IAlarmService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 报警事件Service业务层处理
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
* @date 2024-05-30
|
||||
*/
|
||||
@Service
|
||||
public class AlarmServiceImpl implements IAlarmService
|
||||
{
|
||||
public class AlarmServiceImpl implements IAlarmService {
|
||||
@Resource
|
||||
private AlarmMapper alarmMapper;
|
||||
|
||||
/**
|
||||
* 查询报警事件
|
||||
*
|
||||
*
|
||||
* @param emergencyEventId 报警事件主键
|
||||
* @return 报警事件
|
||||
*/
|
||||
@Override
|
||||
public Alarm selectAlarmByEmergencyEventId(Long emergencyEventId)
|
||||
{
|
||||
public Alarm selectAlarmByEmergencyEventId(Long emergencyEventId) {
|
||||
return alarmMapper.selectAlarmByEmergencyEventId(emergencyEventId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询报警事件列表
|
||||
*
|
||||
*
|
||||
* @param req 报警事件
|
||||
* @return 报警事件
|
||||
*/
|
||||
@Override
|
||||
public List<Alarm> selectAlarmList(AlarmFindRequest req)
|
||||
{
|
||||
public List<Alarm> selectAlarmList(AlarmFindRequest req) {
|
||||
return alarmMapper.selectAlarmList(req);
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增报警事件
|
||||
*
|
||||
*
|
||||
* @param alarm 报警事件
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int insertAlarm(Alarm alarm)
|
||||
{
|
||||
public int insertAlarm(Alarm alarm) {
|
||||
alarm.setCreateTime(DateUtils.getNowDate());
|
||||
return alarmMapper.insertAlarm(alarm);
|
||||
}
|
||||
|
||||
/**
|
||||
* 修改报警事件
|
||||
*
|
||||
*
|
||||
* @param alarm 报警事件
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int updateAlarm(Alarm alarm)
|
||||
{
|
||||
public int updateAlarm(Alarm alarm) {
|
||||
alarm.setUpdateTime(DateUtils.getNowDate());
|
||||
return alarmMapper.updateAlarm(alarm);
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量删除报警事件
|
||||
*
|
||||
*
|
||||
* @param emergencyEventIds 需要删除的报警事件主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteAlarmByEmergencyEventIds(Long[] emergencyEventIds)
|
||||
{
|
||||
public int deleteAlarmByEmergencyEventIds(Long[] emergencyEventIds) {
|
||||
return alarmMapper.deleteAlarmByEmergencyEventIds(emergencyEventIds);
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除报警事件信息
|
||||
*
|
||||
*
|
||||
* @param emergencyEventId 报警事件主键
|
||||
* @return 结果
|
||||
*/
|
||||
@Override
|
||||
public int deleteAlarmByEmergencyEventId(Long emergencyEventId)
|
||||
{
|
||||
public int deleteAlarmByEmergencyEventId(Long emergencyEventId) {
|
||||
return alarmMapper.deleteAlarmByEmergencyEventId(emergencyEventId);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,61 +1,61 @@
|
||||
# 数据源配置
|
||||
spring:
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driverClassName: com.mysql.cj.jdbc.Driver
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
url: jdbc:mysql://localhost:3306/algorithms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: jichuang@123
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
enabled: false
|
||||
url:
|
||||
username:
|
||||
password:
|
||||
# 初始连接数
|
||||
initialSize: 5
|
||||
# 最小连接池数量
|
||||
minIdle: 10
|
||||
# 最大连接池数量
|
||||
maxActive: 20
|
||||
# 配置获取连接等待超时的时间
|
||||
maxWait: 60000
|
||||
# 配置连接超时时间
|
||||
connectTimeout: 30000
|
||||
# 配置网络超时时间
|
||||
socketTimeout: 60000
|
||||
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
|
||||
timeBetweenEvictionRunsMillis: 60000
|
||||
# 配置一个连接在池中最小生存的时间，单位是毫秒
|
||||
minEvictableIdleTimeMillis: 300000
|
||||
# 配置一个连接在池中最大生存的时间，单位是毫秒
|
||||
maxEvictableIdleTimeMillis: 900000
|
||||
# 配置检测连接是否有效
|
||||
validationQuery: SELECT 1 FROM DUAL
|
||||
testWhileIdle: true
|
||||
testOnBorrow: false
|
||||
testOnReturn: false
|
||||
webStatFilter:
|
||||
enabled: true
|
||||
statViewServlet:
|
||||
enabled: true
|
||||
# 设置白名单，不填则允许所有访问
|
||||
allow:
|
||||
url-pattern: /druid/*
|
||||
# 控制台管理用户名和密码
|
||||
login-username: ruoyi
|
||||
login-password: 123456
|
||||
filter:
|
||||
stat:
|
||||
enabled: true
|
||||
# 慢SQL记录
|
||||
log-slow-sql: true
|
||||
slow-sql-millis: 1000
|
||||
merge-sql: true
|
||||
wall:
|
||||
config:
|
||||
multi-statement-allow: true
|
||||
datasource:
|
||||
type: com.alibaba.druid.pool.DruidDataSource
|
||||
driverClassName: com.mysql.cj.jdbc.Driver
|
||||
druid:
|
||||
# 主库数据源
|
||||
master:
|
||||
url: jdbc:mysql://localhost:3306/algorithms?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
|
||||
username: root
|
||||
password: jichuang@123
|
||||
# 从库数据源
|
||||
slave:
|
||||
# 从数据源开关/默认关闭
|
||||
enabled: false
|
||||
url:
|
||||
username:
|
||||
password:
|
||||
# 初始连接数
|
||||
initialSize: 5
|
||||
# 最小连接池数量
|
||||
minIdle: 10
|
||||
# 最大连接池数量
|
||||
maxActive: 20
|
||||
# 配置获取连接等待超时的时间
|
||||
maxWait: 60000
|
||||
# 配置连接超时时间
|
||||
connectTimeout: 30000
|
||||
# 配置网络超时时间
|
||||
socketTimeout: 60000
|
||||
# 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
|
||||
timeBetweenEvictionRunsMillis: 60000
|
||||
# 配置一个连接在池中最小生存的时间，单位是毫秒
|
||||
minEvictableIdleTimeMillis: 300000
|
||||
# 配置一个连接在池中最大生存的时间，单位是毫秒
|
||||
maxEvictableIdleTimeMillis: 900000
|
||||
# 配置检测连接是否有效
|
||||
validationQuery: SELECT 1 FROM DUAL
|
||||
testWhileIdle: true
|
||||
testOnBorrow: false
|
||||
testOnReturn: false
|
||||
webStatFilter:
|
||||
enabled: true
|
||||
statViewServlet:
|
||||
enabled: true
|
||||
# 设置白名单，不填则允许所有访问
|
||||
allow:
|
||||
url-pattern: /druid/*
|
||||
# 控制台管理用户名和密码
|
||||
login-username: ruoyi
|
||||
login-password: 123456
|
||||
filter:
|
||||
stat:
|
||||
enabled: true
|
||||
# 慢SQL记录
|
||||
log-slow-sql: true
|
||||
slow-sql-millis: 1000
|
||||
merge-sql: true
|
||||
wall:
|
||||
config:
|
||||
multi-statement-allow: true
|
||||
@ -1,20 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE configuration
|
||||
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-config.dtd">
|
||||
PUBLIC "-//mybatis.org//DTD Config 3.0//EN"
|
||||
"http://mybatis.org/dtd/mybatis-3-config.dtd">
|
||||
<configuration>
|
||||
<!-- 全局参数 -->
|
||||
<settings>
|
||||
<!-- 使全局的映射器启用或禁用缓存 -->
|
||||
<setting name="cacheEnabled" value="true" />
|
||||
<setting name="cacheEnabled" value="true"/>
|
||||
<!-- 允许JDBC 支持自动生成主键 -->
|
||||
<setting name="useGeneratedKeys" value="true" />
|
||||
<setting name="useGeneratedKeys" value="true"/>
|
||||
<!-- 配置默认的执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
|
||||
<setting name="defaultExecutorType" value="SIMPLE" />
|
||||
<!-- 指定 MyBatis 所用日志的具体实现 -->
|
||||
<setting name="logImpl" value="SLF4J" />
|
||||
<setting name="defaultExecutorType" value="SIMPLE"/>
|
||||
<!-- 指定 MyBatis 所用日志的具体实现 -->
|
||||
<setting name="logImpl" value="SLF4J"/>
|
||||
<!-- 使用驼峰命名法转换字段 -->
|
||||
<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
|
||||
</settings>
|
||||
|
||||
<!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
|
||||
</settings>
|
||||
|
||||
</configuration>
|
||||
|
||||
@ -1,121 +1,120 @@
|
||||
package com.ruoyi.common.core.domain;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Date;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Entity基类
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
public class BaseEntity implements Serializable
|
||||
{
|
||||
public class BaseEntity implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 搜索值 */
|
||||
/**
|
||||
* 搜索值
|
||||
*/
|
||||
@JsonIgnore
|
||||
private String searchValue;
|
||||
|
||||
/** 创建者 */
|
||||
/**
|
||||
* 创建者
|
||||
*/
|
||||
private String createBy;
|
||||
|
||||
/** 创建时间 */
|
||||
/**
|
||||
* 创建时间
|
||||
*/
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
||||
/** 更新者 */
|
||||
/**
|
||||
* 更新者
|
||||
*/
|
||||
private String updateBy;
|
||||
|
||||
/** 更新时间 */
|
||||
/**
|
||||
* 更新时间
|
||||
*/
|
||||
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date updateTime;
|
||||
|
||||
/** 备注 */
|
||||
/**
|
||||
* 备注
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/** 请求参数 */
|
||||
/**
|
||||
* 请求参数
|
||||
*/
|
||||
@JsonInclude(JsonInclude.Include.NON_EMPTY)
|
||||
private Map<String, Object> params;
|
||||
|
||||
public String getSearchValue()
|
||||
{
|
||||
public String getSearchValue() {
|
||||
return searchValue;
|
||||
}
|
||||
|
||||
public void setSearchValue(String searchValue)
|
||||
{
|
||||
public void setSearchValue(String searchValue) {
|
||||
this.searchValue = searchValue;
|
||||
}
|
||||
|
||||
public String getCreateBy()
|
||||
{
|
||||
public String getCreateBy() {
|
||||
return createBy;
|
||||
}
|
||||
|
||||
public void setCreateBy(String createBy)
|
||||
{
|
||||
public void setCreateBy(String createBy) {
|
||||
this.createBy = createBy;
|
||||
}
|
||||
|
||||
public Date getCreateTime()
|
||||
{
|
||||
public Date getCreateTime() {
|
||||
return createTime;
|
||||
}
|
||||
|
||||
public void setCreateTime(Date createTime)
|
||||
{
|
||||
public void setCreateTime(Date createTime) {
|
||||
this.createTime = createTime;
|
||||
}
|
||||
|
||||
public String getUpdateBy()
|
||||
{
|
||||
public String getUpdateBy() {
|
||||
return updateBy;
|
||||
}
|
||||
|
||||
public void setUpdateBy(String updateBy)
|
||||
{
|
||||
public void setUpdateBy(String updateBy) {
|
||||
this.updateBy = updateBy;
|
||||
}
|
||||
|
||||
public Date getUpdateTime()
|
||||
{
|
||||
public Date getUpdateTime() {
|
||||
return updateTime;
|
||||
}
|
||||
|
||||
public void setUpdateTime(Date updateTime)
|
||||
{
|
||||
public void setUpdateTime(Date updateTime) {
|
||||
this.updateTime = updateTime;
|
||||
}
|
||||
|
||||
public String getRemark()
|
||||
{
|
||||
public String getRemark() {
|
||||
return remark;
|
||||
}
|
||||
|
||||
public void setRemark(String remark)
|
||||
{
|
||||
public void setRemark(String remark) {
|
||||
this.remark = remark;
|
||||
}
|
||||
|
||||
public Map<String, Object> getParams()
|
||||
{
|
||||
if (params == null)
|
||||
{
|
||||
public Map<String, Object> getParams() {
|
||||
if (params == null) {
|
||||
params = new HashMap<>();
|
||||
}
|
||||
return params;
|
||||
}
|
||||
|
||||
public void setParams(Map<String, Object> params)
|
||||
{
|
||||
public void setParams(Map<String, Object> params) {
|
||||
this.params = params;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,77 +1,74 @@
|
||||
package com.ruoyi.common.core.domain;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
||||
import com.ruoyi.common.core.domain.entity.SysDept;
|
||||
import com.ruoyi.common.core.domain.entity.SysMenu;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* Treeselect树结构实体类
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
public class TreeSelect implements Serializable
|
||||
{
|
||||
public class TreeSelect implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 节点ID */
|
||||
/**
|
||||
* 节点ID
|
||||
*/
|
||||
private Long id;
|
||||
|
||||
/** 节点名称 */
|
||||
/**
|
||||
* 节点名称
|
||||
*/
|
||||
private String label;
|
||||
|
||||
/** 子节点 */
|
||||
/**
|
||||
* 子节点
|
||||
*/
|
||||
@JsonInclude(JsonInclude.Include.NON_EMPTY)
|
||||
private List<TreeSelect> children;
|
||||
|
||||
public TreeSelect()
|
||||
{
|
||||
public TreeSelect() {
|
||||
|
||||
}
|
||||
|
||||
public TreeSelect(SysDept dept)
|
||||
{
|
||||
public TreeSelect(SysDept dept) {
|
||||
this.id = dept.getDeptId();
|
||||
this.label = dept.getDeptName();
|
||||
this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public TreeSelect(SysMenu menu)
|
||||
{
|
||||
public TreeSelect(SysMenu menu) {
|
||||
this.id = menu.getMenuId();
|
||||
this.label = menu.getMenuName();
|
||||
this.children = menu.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
|
||||
}
|
||||
|
||||
public Long getId()
|
||||
{
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setId(Long id)
|
||||
{
|
||||
public void setId(Long id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getLabel()
|
||||
{
|
||||
public String getLabel() {
|
||||
return label;
|
||||
}
|
||||
|
||||
public void setLabel(String label)
|
||||
{
|
||||
public void setLabel(String label) {
|
||||
this.label = label;
|
||||
}
|
||||
|
||||
public List<TreeSelect> getChildren()
|
||||
{
|
||||
public List<TreeSelect> getChildren() {
|
||||
return children;
|
||||
}
|
||||
|
||||
public void setChildren(List<TreeSelect> children)
|
||||
{
|
||||
public void setChildren(List<TreeSelect> children) {
|
||||
this.children = children;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,36 +1,32 @@
|
||||
package com.ruoyi.common.enums;
|
||||
|
||||
import org.springframework.lang.Nullable;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import org.springframework.lang.Nullable;
|
||||
|
||||
/**
|
||||
* 请求方式
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
public enum HttpMethod
|
||||
{
|
||||
public enum HttpMethod {
|
||||
GET, HEAD, POST, PUT, PATCH, DELETE, OPTIONS, TRACE;
|
||||
|
||||
private static final Map<String, HttpMethod> mappings = new HashMap<>(16);
|
||||
|
||||
static
|
||||
{
|
||||
for (HttpMethod httpMethod : values())
|
||||
{
|
||||
static {
|
||||
for (HttpMethod httpMethod : values()) {
|
||||
mappings.put(httpMethod.name(), httpMethod);
|
||||
}
|
||||
}
|
||||
|
||||
@Nullable
|
||||
public static HttpMethod resolve(@Nullable String method)
|
||||
{
|
||||
public static HttpMethod resolve(@Nullable String method) {
|
||||
return (method != null ? mappings.get(method) : null);
|
||||
}
|
||||
|
||||
public boolean matches(String method)
|
||||
{
|
||||
public boolean matches(String method) {
|
||||
return (this == resolve(method));
|
||||
}
|
||||
}
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue