【验收】6-保护方案告警同步云端&& 【验收】7-下发操作日志同步云端

This commit is contained in:
2025-11-16 22:48:14 +08:00
parent c62aa46fcb
commit 3ee99fa8d4
10 changed files with 767 additions and 15 deletions

View File

@ -0,0 +1,150 @@
package com.xzzn.ems.domain;
import java.math.BigDecimal;
import java.util.Date;
import com.xzzn.common.core.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.xzzn.common.annotation.Excel;
/**
* 告警保护方案下发日志对象 ems_fault_issue_log
*
* @author xzzn
* @date 2025-11-15
*/
public class EmsFaultIssueLog extends BaseEntity
{
private static final long serialVersionUID = 1L;
/** 主键 */
private Long id;
/** 日志IDUUID */
@Excel(name = "日志ID", readConverterExp = "U=UID")
private String logId;
/** 日志时间(精确到秒) */
@Excel(name = "日志时间", readConverterExp = "精=确到秒")
private Date logTime;
/** 日志等级同方案等级1/2/3等 */
@Excel(name = "日志等级", readConverterExp = "同=方案等级1/2/3等")
private Integer logLevel;
/** 站点名称/编号 */
@Excel(name = "站点名称/编号")
private String siteId;
/** 设备ID */
@Excel(name = "设备ID")
private String deviceId;
/** 操作点位 */
@Excel(name = "操作点位")
private String point;
/** 设置数据 */
@Excel(name = "设置数据")
private BigDecimal value;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setLogId(String logId)
{
this.logId = logId;
}
public String getLogId()
{
return logId;
}
public void setLogTime(Date logTime)
{
this.logTime = logTime;
}
public Date getLogTime()
{
return logTime;
}
public void setLogLevel(Integer logLevel)
{
this.logLevel = logLevel;
}
public Integer getLogLevel()
{
return logLevel;
}
public void setSiteId(String siteId)
{
this.siteId = siteId;
}
public String getSiteId()
{
return siteId;
}
public void setDeviceId(String deviceId)
{
this.deviceId = deviceId;
}
public String getDeviceId()
{
return deviceId;
}
public void setPoint(String point)
{
this.point = point;
}
public String getPoint()
{
return point;
}
public void setValue(BigDecimal value)
{
this.value = value;
}
public BigDecimal getValue()
{
return value;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("logId", getLogId())
.append("logTime", getLogTime())
.append("logLevel", getLogLevel())
.append("site", getSiteId())
.append("deviceId", getDeviceId())
.append("point", getPoint())
.append("value", getValue())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("remark", getRemark())
.toString();
}
}

View File

@ -0,0 +1,64 @@
package com.xzzn.ems.mapper;
import java.util.List;
import com.xzzn.ems.domain.EmsFaultIssueLog;
/**
* 告警保护方案下发日志Mapper接口
*
* @author xzzn
* @date 2025-11-15
*/
public interface EmsFaultIssueLogMapper
{
/**
* 查询告警保护方案下发日志
*
* @param id 告警保护方案下发日志主键
* @return 告警保护方案下发日志
*/
public EmsFaultIssueLog selectEmsFaultIssueLogById(Long id);
/**
* 查询告警保护方案下发日志列表
*
* @param emsFaultIssueLog 告警保护方案下发日志
* @return 告警保护方案下发日志集合
*/
public List<EmsFaultIssueLog> selectEmsFaultIssueLogList(EmsFaultIssueLog emsFaultIssueLog);
/**
* 新增告警保护方案下发日志
*
* @param emsFaultIssueLog 告警保护方案下发日志
* @return 结果
*/
public int insertEmsFaultIssueLog(EmsFaultIssueLog emsFaultIssueLog);
/**
* 修改告警保护方案下发日志
*
* @param emsFaultIssueLog 告警保护方案下发日志
* @return 结果
*/
public int updateEmsFaultIssueLog(EmsFaultIssueLog emsFaultIssueLog);
/**
* 删除告警保护方案下发日志
*
* @param id 告警保护方案下发日志主键
* @return 结果
*/
public int deleteEmsFaultIssueLogById(Long id);
/**
* 批量删除告警保护方案下发日志
*
* @param ids 需要删除的数据主键集合
* @return 结果
*/
public int deleteEmsFaultIssueLogByIds(Long[] ids);
// 根据logId获取日志
public EmsFaultIssueLog selectEmsFaultIssueLogByLogId(String logId);
}

View File

@ -95,4 +95,7 @@ public interface IEmsAlarmRecordsService
// 根据site_id和deviceId更新对应的redis
public void updateRedisAlarmRecords(String siteId, String deviceId);
// 处理本地端同步的保护策略告警信息
public void dealSyncData(String content, String operateType);
}

View File

@ -0,0 +1,64 @@
package com.xzzn.ems.service;
import java.util.List;
import com.xzzn.ems.domain.EmsFaultIssueLog;
/**
* 告警保护方案下发日志Service接口
*
* @author xzzn
* @date 2025-11-15
*/
public interface IEmsFaultIssueLogService
{
/**
* 查询告警保护方案下发日志
*
* @param id 告警保护方案下发日志主键
* @return 告警保护方案下发日志
*/
public EmsFaultIssueLog selectEmsFaultIssueLogById(Long id);
/**
* 查询告警保护方案下发日志列表
*
* @param emsFaultIssueLog 告警保护方案下发日志
* @return 告警保护方案下发日志集合
*/
public List<EmsFaultIssueLog> selectEmsFaultIssueLogList(EmsFaultIssueLog emsFaultIssueLog);
/**
* 新增告警保护方案下发日志
*
* @param emsFaultIssueLog 告警保护方案下发日志
* @return 结果
*/
public int insertEmsFaultIssueLog(EmsFaultIssueLog emsFaultIssueLog);
/**
* 修改告警保护方案下发日志
*
* @param emsFaultIssueLog 告警保护方案下发日志
* @return 结果
*/
public int updateEmsFaultIssueLog(EmsFaultIssueLog emsFaultIssueLog);
/**
* 批量删除告警保护方案下发日志
*
* @param ids 需要删除的告警保护方案下发日志主键集合
* @return 结果
*/
public int deleteEmsFaultIssueLogByIds(Long[] ids);
/**
* 删除告警保护方案下发日志信息
*
* @param id 告警保护方案下发日志主键
* @return 结果
*/
public int deleteEmsFaultIssueLogById(Long id);
// 处理本地端同步的告警保护下发日志信息
public void dealSyncData(String content, String operateType);
}

View File

@ -4,6 +4,7 @@ import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import com.alibaba.fastjson2.JSON;
import com.xzzn.common.constant.RedisKeyConstants;
import com.xzzn.common.core.domain.entity.SysUser;
import com.xzzn.common.core.redis.RedisCache;
@ -18,7 +19,6 @@ import com.xzzn.ems.domain.vo.AlarmRecordListRequestVo;
import com.xzzn.ems.domain.vo.AlarmRecordListResponseVo;
import com.xzzn.ems.mapper.EmsAlarmMatchDataMapper;
import com.xzzn.ems.mapper.EmsTicketMapper;
import com.xzzn.ems.service.IEmsTicketService;
import com.xzzn.system.mapper.SysUserMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -292,5 +292,21 @@ public class EmsAlarmRecordsServiceImpl implements IEmsAlarmRecordsService
redisCache.setAllCacheMapValue(redisKey, newAlarms);
}
@Override
public void dealSyncData(String content, String operateType) {
if (StringUtils.isEmpty(content)) {
return;
}
EmsAlarmRecords alarmRecords = JSON.parseObject(content, EmsAlarmRecords.class);
switch(operateType) {
case "INSERT":
insertEmsAlarmRecords(alarmRecords);
break;
default:
break;
}
}
}

View File

@ -0,0 +1,129 @@
package com.xzzn.ems.service.impl;
import java.util.List;
import com.alibaba.fastjson2.JSON;
import com.xzzn.common.utils.DateUtils;
import com.xzzn.common.utils.StringUtils;
import com.xzzn.ems.domain.EmsAlarmRecords;
import com.xzzn.ems.service.IFXXAlarmDataProcessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.xzzn.ems.mapper.EmsFaultIssueLogMapper;
import com.xzzn.ems.domain.EmsFaultIssueLog;
import com.xzzn.ems.service.IEmsFaultIssueLogService;
/**
* 告警保护方案下发日志Service业务层处理
*
* @author xzzn
* @date 2025-11-15
*/
@Service
public class EmsFaultIssueLogServiceImpl implements IEmsFaultIssueLogService
{
@Autowired
private EmsFaultIssueLogMapper emsFaultIssueLogMapper;
/**
* 查询告警保护方案下发日志
*
* @param id 告警保护方案下发日志主键
* @return 告警保护方案下发日志
*/
@Override
public EmsFaultIssueLog selectEmsFaultIssueLogById(Long id)
{
return emsFaultIssueLogMapper.selectEmsFaultIssueLogById(id);
}
/**
* 新增告警保护方案下发日志
*
* @param emsFaultIssueLog 告警保护方案下发日志
* @return 结果
*/
@Override
public int insertEmsFaultIssueLog(EmsFaultIssueLog emsFaultIssueLog)
{
emsFaultIssueLog.setCreateTime(DateUtils.getNowDate());
return emsFaultIssueLogMapper.insertEmsFaultIssueLog(emsFaultIssueLog);
}
/**
* 查询告警保护方案下发日志列表
*
* @param emsFaultIssueLog 告警保护方案下发日志
* @return 告警保护方案下发日志
*/
@Override
public List<EmsFaultIssueLog> selectEmsFaultIssueLogList(EmsFaultIssueLog emsFaultIssueLog)
{
return emsFaultIssueLogMapper.selectEmsFaultIssueLogList(emsFaultIssueLog);
}
/**
* 修改告警保护方案下发日志
*
* @param emsFaultIssueLog 告警保护方案下发日志
* @return 结果
*/
@Override
public int updateEmsFaultIssueLog(EmsFaultIssueLog emsFaultIssueLog)
{
emsFaultIssueLog.setUpdateTime(DateUtils.getNowDate());
return emsFaultIssueLogMapper.updateEmsFaultIssueLog(emsFaultIssueLog);
}
/**
* 批量删除告警保护方案下发日志
*
* @param ids 需要删除的告警保护方案下发日志主键
* @return 结果
*/
@Override
public int deleteEmsFaultIssueLogByIds(Long[] ids)
{
return emsFaultIssueLogMapper.deleteEmsFaultIssueLogByIds(ids);
}
/**
* 删除告警保护方案下发日志信息
*
* @param id 告警保护方案下发日志主键
* @return 结果
*/
@Override
public int deleteEmsFaultIssueLogById(Long id)
{
return emsFaultIssueLogMapper.deleteEmsFaultIssueLogById(id);
}
@Override
public void dealSyncData(String content, String operateType) {
if (StringUtils.isEmpty(content)) {
return;
}
EmsFaultIssueLog issueLog = JSON.parseObject(content, EmsFaultIssueLog.class);
String logId = issueLog.getLogId();
if (checkLogIsExist(logId)) {
return;
}
switch(operateType) {
case "INSERT":
insertEmsFaultIssueLog(issueLog);
break;
default:
break;
}
}
private boolean checkLogIsExist(String logId) {
EmsFaultIssueLog issueLog = emsFaultIssueLogMapper.selectEmsFaultIssueLogByLogId(logId);
if (issueLog != null) {
return true;
}
return false;
}
}

View File

@ -0,0 +1,111 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.xzzn.ems.mapper.EmsFaultIssueLogMapper">
<resultMap type="EmsFaultIssueLog" id="EmsFaultIssueLogResult">
<result property="id" column="id" />
<result property="logId" column="log_id" />
<result property="logTime" column="log_time" />
<result property="logLevel" column="log_level" />
<result property="siteId" column="site_id" />
<result property="deviceId" column="device_id" />
<result property="point" column="point" />
<result property="value" column="value" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
<sql id="selectEmsFaultIssueLogVo">
select id, log_id, log_time, log_level, site_id, device_id, point, value, create_by, create_time, update_by, update_time, remark from ems_fault_issue_log
</sql>
<select id="selectEmsFaultIssueLogList" parameterType="EmsFaultIssueLog" resultMap="EmsFaultIssueLogResult">
<include refid="selectEmsFaultIssueLogVo"/>
<where>
<if test="logId != null and logId != ''"> and log_id = #{logId}</if>
<if test="logTime != null "> and log_time = #{logTime}</if>
<if test="logLevel != null "> and log_level = #{logLevel}</if>
<if test="siteId != null and siteId != ''"> and site_id = #{siteId}</if>
<if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
<if test="point != null and point != ''"> and point = #{point}</if>
<if test="value != null "> and value = #{value}</if>
</where>
</select>
<select id="selectEmsFaultIssueLogById" parameterType="Long" resultMap="EmsFaultIssueLogResult">
<include refid="selectEmsFaultIssueLogVo"/>
where id = #{id}
</select>
<insert id="insertEmsFaultIssueLog" parameterType="EmsFaultIssueLog" useGeneratedKeys="true" keyProperty="id">
insert into ems_fault_issue_log
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="logId != null and logId != ''">log_id,</if>
<if test="logTime != null">log_time,</if>
<if test="logLevel != null">log_level,</if>
<if test="siteId != null">site_id,</if>
<if test="deviceId != null">device_id,</if>
<if test="point != null and point != ''">point,</if>
<if test="value != null">value,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="logId != null and logId != ''">#{logId},</if>
<if test="logTime != null">#{logTime},</if>
<if test="logLevel != null">#{logLevel},</if>
<if test="siteId != null">#{siteId},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="point != null and point != ''">#{point},</if>
<if test="value != null">#{value},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
<if test="remark != null">#{remark},</if>
</trim>
</insert>
<update id="updateEmsFaultIssueLog" parameterType="EmsFaultIssueLog">
update ems_fault_issue_log
<trim prefix="SET" suffixOverrides=",">
<if test="logId != null and logId != ''">log_id = #{logId},</if>
<if test="logTime != null">log_time = #{logTime},</if>
<if test="logLevel != null">log_level = #{logLevel},</if>
<if test="siteId != null">site_id = #{siteId},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="point != null and point != ''">point = #{point},</if>
<if test="value != null">value = #{value},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
</trim>
where id = #{id}
</update>
<delete id="deleteEmsFaultIssueLogById" parameterType="Long">
delete from ems_fault_issue_log where id = #{id}
</delete>
<delete id="deleteEmsFaultIssueLogByIds" parameterType="String">
delete from ems_fault_issue_log where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<select id="selectEmsFaultIssueLogByLogId" parameterType="String" resultMap="EmsFaultIssueLogResult">
<include refid="selectEmsFaultIssueLogVo"/>
where log_id = #{logId}
</select>
</mapper>