Merge remote-tracking branch 'origin/dev' into dev

ems-admin/src/main/java/com/xzzn/web/controller/ems/EmsAlarmRecordsController.java

@@ -0,0 +1,37 @@
+package com.xzzn.web.controller.ems;
+
+import com.xzzn.common.core.controller.BaseController;
+import com.xzzn.common.core.page.TableDataInfo;
+import com.xzzn.ems.domain.vo.AlarmRecordListRequestVo;
+import com.xzzn.ems.domain.vo.AlarmRecordListResponseVo;
+import com.xzzn.ems.service.IEmsAlarmRecordsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 单站监控-故障告警
+ * 
+ * @author xzzn
+ */
+@RestController
+@RequestMapping("/ems/siteAlarm")
+public class EmsAlarmRecordsController extends BaseController
+{
+
+    @Autowired
+    private IEmsAlarmRecordsService iEmsAlarmRecordsService;
+
+    /**
+     * 获取告警详情列表
+     */
+    @GetMapping("/getAlarmDetailList")
+    public TableDataInfo getAlarmDetailList(AlarmRecordListRequestVo requestVo)
+    {
+        startPage();
+        List<AlarmRecordListResponseVo> list = iEmsAlarmRecordsService.getAlarmRecordDetailList(requestVo);
+        return getDataTable(list);
+    }
+
+}

ems-system/src/main/java/com/xzzn/ems/domain/vo/AlarmRecordListRequestVo.java

@@ -0,0 +1,65 @@
+package com.xzzn.ems.domain.vo;
+
+
+import java.util.Date;
+
+/**
+ * 单站监控-故障告警请求
+ *
+ */
+public class AlarmRecordListRequestVo {
+    /** 站点id */
+    private String siteId;
+
+    /** 设备类型 */
+    private String deviceType;
+
+    /** 告警等级 */
+    private String alarmLevel;
+
+    /** 告警发生时间 */
+    private String alarmStartTime;
+
+    /** 告警结束时间 */
+    private String alarmEndTime;
+
+    public String getSiteId() {
+        return siteId;
+    }
+
+    public void setSiteId(String siteId) {
+        this.siteId = siteId;
+    }
+
+    public String getDeviceType() {
+        return deviceType;
+    }
+
+    public void setDeviceType(String deviceType) {
+        this.deviceType = deviceType;
+    }
+
+    public String getAlarmLevel() {
+        return alarmLevel;
+    }
+
+    public void setAlarmLevel(String alarmLevel) {
+        this.alarmLevel = alarmLevel;
+    }
+
+    public String getAlarmStartTime() {
+        return alarmStartTime;
+    }
+
+    public void setAlarmStartTime(String alarmStartTime) {
+        this.alarmStartTime = alarmStartTime;
+    }
+
+    public String getAlarmEndTime() {
+        return alarmEndTime;
+    }
+
+    public void setAlarmEndTime(String alarmEndTime) {
+        this.alarmEndTime = alarmEndTime;
+    }
+}

ems-system/src/main/java/com/xzzn/ems/domain/vo/AlarmRecordListResponseVo.java

@@ -0,0 +1,78 @@
+package com.xzzn.ems.domain.vo;
+
+
+import com.xzzn.common.annotation.Excel;
+
+import java.util.Date;
+
+/**
+ * 单站监控-故障告警返回
+ *
+ */
+public class AlarmRecordListResponseVo {
+    /** 设备名称 */
+    private String deviceName;
+
+    /** 告警等级 */
+    private String alarmLevel;
+
+    /** 告警内容 */
+    private String alarmContent;
+
+    /** 告警发生时间 */
+    private Date alarmStartTime;
+
+    /** 告警结束时间 */
+    private Date alarmEndTime;
+
+    /** 状态 */
+    private String status;
+
+    public String getDeviceName() {
+        return deviceName;
+    }
+
+    public void setDeviceName(String deviceName) {
+        this.deviceName = deviceName;
+    }
+
+    public String getAlarmLevel() {
+        return alarmLevel;
+    }
+
+    public void setAlarmLevel(String alarmLevel) {
+        this.alarmLevel = alarmLevel;
+    }
+
+    public String getAlarmContent() {
+        return alarmContent;
+    }
+
+    public void setAlarmContent(String alarmContent) {
+        this.alarmContent = alarmContent;
+    }
+
+    public Date getAlarmStartTime() {
+        return alarmStartTime;
+    }
+
+    public void setAlarmStartTime(Date alarmStartTime) {
+        this.alarmStartTime = alarmStartTime;
+    }
+
+    public Date getAlarmEndTime() {
+        return alarmEndTime;
+    }
+
+    public void setAlarmEndTime(Date alarmEndTime) {
+        this.alarmEndTime = alarmEndTime;
+    }
+
+    public String getStatus() {
+        return status;
+    }
+
+    public void setStatus(String status) {
+        this.status = status;
+    }
+}

ems-system/src/main/java/com/xzzn/ems/mapper/EmsAlarmRecordsMapper.java

@@ -2,9 +2,7 @@ package com.xzzn.ems.mapper;
 
 import java.util.List;
 import com.xzzn.ems.domain.EmsAlarmRecords;
-import com.xzzn.ems.domain.vo.AlarmTrendList;
+import com.xzzn.ems.domain.vo.*;
-import com.xzzn.ems.domain.vo.DeviceAlarmProportionList;
-import com.xzzn.ems.domain.vo.SiteMonitorHomeAlarmVo;
 
 /**
  * 告警记录Mapper接口
@@ -79,4 +77,6 @@ public interface EmsAlarmRecordsMapper
      *
      */
     public List<DeviceAlarmProportionList> getDeviceAlarmPropList();
+
+    public List<AlarmRecordListResponseVo> getAlarmRecordDetailList(AlarmRecordListRequestVo requestVo);
 }

ems-system/src/main/java/com/xzzn/ems/service/IEmsAlarmRecordsService.java

@@ -0,0 +1,70 @@
+package com.xzzn.ems.service;
+
+import java.util.List;
+import com.xzzn.ems.domain.EmsAlarmRecords;
+import com.xzzn.ems.domain.vo.AlarmRecordListRequestVo;
+import com.xzzn.ems.domain.vo.AlarmRecordListResponseVo;
+
+/**
+ * 告警记录Service接口
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+public interface IEmsAlarmRecordsService
+{
+    /**
+     * 查询告警记录
+     *
+     * @param id 告警记录主键
+     * @return 告警记录
+     */
+    public EmsAlarmRecords selectEmsAlarmRecordsById(Long id);
+
+    /**
+     * 查询告警记录列表
+     *
+     * @param emsAlarmRecords 告警记录
+     * @return 告警记录集合
+     */
+    public List<EmsAlarmRecords> selectEmsAlarmRecordsList(EmsAlarmRecords emsAlarmRecords);
+
+    /**
+     * 新增告警记录
+     *
+     * @param emsAlarmRecords 告警记录
+     * @return 结果
+     */
+    public int insertEmsAlarmRecords(EmsAlarmRecords emsAlarmRecords);
+
+    /**
+     * 修改告警记录
+     *
+     * @param emsAlarmRecords 告警记录
+     * @return 结果
+     */
+    public int updateEmsAlarmRecords(EmsAlarmRecords emsAlarmRecords);
+
+    /**
+     * 批量删除告警记录
+     *
+     * @param ids 需要删除的告警记录主键集合
+     * @return 结果
+     */
+    public int deleteEmsAlarmRecordsByIds(Long[] ids);
+
+    /**
+     * 删除告警记录信息
+     *
+     * @param id 告警记录主键
+     * @return 结果
+     */
+    public int deleteEmsAlarmRecordsById(Long id);
+
+    /**
+     * 获取故障告警列表
+     * @param requestVo
+     * @return
+     */
+    public List<AlarmRecordListResponseVo> getAlarmRecordDetailList(AlarmRecordListRequestVo requestVo);
+}

ems-system/src/main/java/com/xzzn/ems/service/impl/EmsAlarmRecordsServiceImpl.java

@@ -0,0 +1,103 @@
+package com.xzzn.ems.service.impl;
+
+import java.util.List;
+import com.xzzn.common.utils.DateUtils;
+import com.xzzn.ems.domain.vo.AlarmRecordListRequestVo;
+import com.xzzn.ems.domain.vo.AlarmRecordListResponseVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.xzzn.ems.mapper.EmsAlarmRecordsMapper;
+import com.xzzn.ems.domain.EmsAlarmRecords;
+import com.xzzn.ems.service.IEmsAlarmRecordsService;
+
+/**
+ * 告警记录Service业务层处理
+ *
+ * @author xzzn
+ * @date 2025-06-29
+ */
+@Service
+public class EmsAlarmRecordsServiceImpl implements IEmsAlarmRecordsService
+{
+    @Autowired
+    private EmsAlarmRecordsMapper emsAlarmRecordsMapper;
+
+    /**
+     * 查询告警记录
+     *
+     * @param id 告警记录主键
+     * @return 告警记录
+     */
+    @Override
+    public EmsAlarmRecords selectEmsAlarmRecordsById(Long id)
+    {
+        return emsAlarmRecordsMapper.selectEmsAlarmRecordsById(id);
+    }
+
+    /**
+     * 查询告警记录列表
+     *
+     * @param emsAlarmRecords 告警记录
+     * @return 告警记录
+     */
+    @Override
+    public List<EmsAlarmRecords> selectEmsAlarmRecordsList(EmsAlarmRecords emsAlarmRecords)
+    {
+        return emsAlarmRecordsMapper.selectEmsAlarmRecordsList(emsAlarmRecords);
+    }
+
+    /**
+     * 新增告警记录
+     *
+     * @param emsAlarmRecords 告警记录
+     * @return 结果
+     */
+    @Override
+    public int insertEmsAlarmRecords(EmsAlarmRecords emsAlarmRecords)
+    {
+        emsAlarmRecords.setCreateTime(DateUtils.getNowDate());
+        return emsAlarmRecordsMapper.insertEmsAlarmRecords(emsAlarmRecords);
+    }
+
+    /**
+     * 修改告警记录
+     *
+     * @param emsAlarmRecords 告警记录
+     * @return 结果
+     */
+    @Override
+    public int updateEmsAlarmRecords(EmsAlarmRecords emsAlarmRecords)
+    {
+        emsAlarmRecords.setUpdateTime(DateUtils.getNowDate());
+        return emsAlarmRecordsMapper.updateEmsAlarmRecords(emsAlarmRecords);
+    }
+
+    /**
+     * 批量删除告警记录
+     *
+     * @param ids 需要删除的告警记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsAlarmRecordsByIds(Long[] ids)
+    {
+        return emsAlarmRecordsMapper.deleteEmsAlarmRecordsByIds(ids);
+    }
+
+    /**
+     * 删除告警记录信息
+     *
+     * @param id 告警记录主键
+     * @return 结果
+     */
+    @Override
+    public int deleteEmsAlarmRecordsById(Long id)
+    {
+        return emsAlarmRecordsMapper.deleteEmsAlarmRecordsById(id);
+    }
+
+    @Override
+    public List<AlarmRecordListResponseVo> getAlarmRecordDetailList(AlarmRecordListRequestVo requestVo) {
+        return emsAlarmRecordsMapper.getAlarmRecordDetailList(requestVo);
+    }
+}

ems-system/src/main/resources/mapper/ems/EmsAlarmRecordsMapper.xml

@@ -132,4 +132,24 @@
         from ems_alarm_records
         group by device_type
     </select>
+
+    <select id="getAlarmRecordDetailList" parameterType="AlarmRecordListRequestVo" resultType="com.xzzn.ems.domain.vo.AlarmRecordListResponseVo">
+        select t.device_name as deviceName,t.alarm_level as alarmLevel,
+               t.alarm_content as alarmContent,t.status as status,
+               t.alarm_start_time as alarmStartTime,t.alarm_end_time as alarmEndTime
+        from ems_alarm_records t
+        where t.site_id = #{siteId}
+        <if test="deviceType != null and deviceType != 0">
+            AND t.device_type = #{deviceType}
+        </if>
+        <if test="alarmLevel != null and alarmLevel != ''">
+            AND t.alarm_level = #{alarmLevel}
+        </if>
+        <if test="alarmStartTime != null and alarmStartTime != ''">
+            AND date_format(t.alarm_start_time,'%Y%m%d') &gt;= date_format(#{alarmStartTime},'%Y%m%d')
+        </if>
+        <if test="alarmEndTime != null and alarmEndTime != ''"><!-- 结束时间检索 -->
+            AND date_format(t.alarm_end_time,'%Y%m%d') &lt;= date_format(#{alarmEndTime},'%Y%m%d')
+        </if>
+    </select>
 </mapper>