设备告警改造

ems/ems-cloud/ems-server/src/main/java/com/ruoyi/ems/controller/AdmOpAlarmController.java

@@ -1,158 +0,0 @@
-package com.ruoyi.ems.controller;
-
-import java.util.List;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.huashe.common.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.page.TableDataInfo;
-import com.ruoyi.common.log.annotation.Log;
-import com.ruoyi.common.log.enums.BusinessType;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.ems.domain.AdmOpAlarm;
-import com.ruoyi.ems.service.IAdmOpAlarmService;
-
-import io.swagger.annotations.Api;
-
-/**
- * 能源设施告警Controller
- *
- * @author ruoyi
- * @date 2024-08-26
- */
-@RestController
-@RequestMapping("/alarm-info")
-@Api(value = "AdmOpAlarmController", description = "能源设施告警")
-public class AdmOpAlarmController extends BaseController {
-    @Autowired
-    private IAdmOpAlarmService opAlarmService;
-
-    /**
-     * 查询能源设施告警列表
-     */
-    @RequiresPermissions("ems:alarm-info:list")
-    @GetMapping("/list")
-    public TableDataInfo list(AdmOpAlarm admOpAlarm) {
-        startPage();
-        List<AdmOpAlarm> list = opAlarmService.selectAdmOpAlarmList(admOpAlarm);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出能源设施告警列表
-     */
-    @RequiresPermissions("ems:alarm-info:export")
-    @Log(title = "能源设施告警", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, AdmOpAlarm admOpAlarm) {
-        List<AdmOpAlarm> list = opAlarmService.selectAdmOpAlarmList(admOpAlarm);
-        ExcelUtil<AdmOpAlarm> util = new ExcelUtil<AdmOpAlarm>(AdmOpAlarm.class);
-        util.exportExcel(response, list, "能源设施告警数据");
-    }
-
-    /**
-     * 获取能源设施告警详细信息
-     */
-    @RequiresPermissions("ems:alarm-info:query")
-    @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id) {
-        return success(opAlarmService.selectAdmOpAlarmById(id));
-    }
-
-    /**
-     * 新增能源设施告警
-     */
-    @RequiresPermissions("ems:alarm-info:add")
-    @Log(title = "能源设施告警", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody AdmOpAlarm admOpAlarm) {
-        return toAjax(opAlarmService.insertAdmOpAlarm(admOpAlarm));
-    }
-
-    /**
-     * 修改能源设施告警
-     */
-    @RequiresPermissions("ems:alarm-info:edit")
-    @Log(title = "能源设施告警", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody AdmOpAlarm admOpAlarm) {
-        return toAjax(opAlarmService.updateAdmOpAlarm(admOpAlarm));
-    }
-
-    /**
-     * 删除能源设施告警
-     */
-    @RequiresPermissions("ems:alarm-info:remove")
-    @Log(title = "能源设施告警", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids) {
-        return toAjax(opAlarmService.deleteAdmOpAlarmByIds(ids));
-    }
-
-    @GetMapping("/alarm/type/index")
-    @RequiresPermissions("ems:alarm-info:query")
-    public AjaxResult qryAlarmTypeIndex(@RequestParam("areaCode") String areaCode,
-        @RequestParam("startRecTime") String startTime, @RequestParam("endRecTime") String endTime) {
-        return success(opAlarmService.qryAlarmTypeIndex(areaCode, startTime, endTime));
-    }
-
-    @GetMapping("/alarm/type/index/day")
-    @RequiresPermissions("ems:alarm-info:query")
-    public AjaxResult qryAlarmTypeIndexDay(@RequestParam("areaCode") String areaCode) {
-        return success(opAlarmService.qryAlarmTypeIndexDay(areaCode));
-    }
-
-    @GetMapping("/alarm/type/index/month")
-    @RequiresPermissions("ems:alarm-info:query")
-    public AjaxResult qryAlarmTypeIndexMonth(@RequestParam("areaCode") String areaCode) {
-        return success(opAlarmService.qryAlarmTypeIndexMonth(areaCode));
-    }
-
-    @GetMapping("/alarm/type/index/year")
-    @RequiresPermissions("ems:alarm-info:query")
-    public AjaxResult qryAlarmTypeIndexYear(@RequestParam("areaCode") String areaCode) {
-        return success(opAlarmService.qryAlarmTypeIndexYear(areaCode));
-    }
-
-    @GetMapping("/subsys/index/day")
-    @RequiresPermissions("ems:alarm-info:query")
-    public AjaxResult qrySubSysIndexDay(@RequestParam("areaCode") String areaCode) {
-        return success(opAlarmService.qrySubSysIndexDay(areaCode));
-    }
-
-    @GetMapping("/subsys/index/month")
-    @RequiresPermissions("ems:alarm-info:query")
-    public AjaxResult qrySubSysIndexMonth(@RequestParam("areaCode") String areaCode) {
-        return success(opAlarmService.qrySubSysIndexMonth(areaCode));
-    }
-
-    @GetMapping("/subsys/index/year")
-    @RequiresPermissions("ems:alarm-info:query")
-    public AjaxResult qrySubSysIndexYear(@RequestParam("areaCode") String areaCode) {
-        return success(opAlarmService.qrySubSysIndexYear(areaCode));
-    }
-
-    @GetMapping("/cnt/handled")
-    public AjaxResult cntHandledAlarmByDate(AdmOpAlarm admOpAlarm) {
-        return success(opAlarmService.cntHandledAlarmByDate(admOpAlarm));
-    }
-
-    @GetMapping("/cnt/date/alarm/type")
-    public AjaxResult qryAlarmTypeIndexByDate(AdmOpAlarm admOpAlarm) {
-        return success(opAlarmService.qryAlarmTypeIndexByDate(admOpAlarm));
-    }
-
-}

ems/ems-core/src/main/java/com/ruoyi/ems/domain/AdmOpAlarm.java

@@ -1,232 +0,0 @@
-package com.ruoyi.ems.domain;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.huashe.common.annotation.Excel;
-import com.huashe.common.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * 能源设施告警对象 adm_op_alarm
- *
- * @author ruoyi
- * @date 2024-08-26
- */
-public class AdmOpAlarm extends BaseEntity
-{
-    private static final long serialVersionUID = 1L;
-
-    /** 序号 */
-    private Long id;
-
-    /** 园区代码 */
-    private String areaCode;
-
-    @Excel(name = "园区名称")
-    private String areaName;
-
-    private String areaShortName;
-
-    /** 对象类型 */
-    @Excel(name = "对象类型")
-    private Integer objType;
-
-    @Excel(name = "子系统")
-    private String subSystemName;
-
-    private String systemCode;
-
-    /** 对象代码 */
-    @Excel(name = "对象代码")
-    private String objCode;
-
-    @Excel(name = "对象名称")
-    private String objName;
-
-    /** 告警日期 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "告警日期", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date alarmDate;
-
-    /** 告警时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "告警时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date alarmTime;
-
-    /** 告警代码 */
-    @Excel(name = "告警代码")
-    private String alarmCode;
-
-    /** 告警描述 */
-    @Excel(name = "告警描述")
-    private String alarmMsg;
-
-    /** 告警类型 */
-    @Excel(name = "告警类型")
-    private Integer alarmType;
-
-    /** 告警状态 */
-    @Excel(name = "告警状态")
-    private Integer alarmState;
-
-    private List<Integer> alarmStateList;
-
-    public void setId(Long id)
-    {
-        this.id = id;
-    }
-
-    public Long getId()
-    {
-        return id;
-    }
-    public void setAreaCode(String areaCode)
-    {
-        this.areaCode = areaCode;
-    }
-
-    public String getAreaCode()
-    {
-        return areaCode;
-    }
-
-    public String getAreaName() {
-        return areaName;
-    }
-
-    public void setAreaName(String areaName) {
-        this.areaName = areaName;
-    }
-
-    public String getAreaShortName() {
-        return areaShortName;
-    }
-
-    public void setAreaShortName(String areaShortName) {
-        this.areaShortName = areaShortName;
-    }
-
-    public void setObjType(Integer objType)
-    {
-        this.objType = objType;
-    }
-
-    public Integer getObjType()
-    {
-        return objType;
-    }
-    public void setObjCode(String objCode)
-    {
-        this.objCode = objCode;
-    }
-
-    public String getObjCode()
-    {
-        return objCode;
-    }
-    public void setAlarmDate(Date alarmDate)
-    {
-        this.alarmDate = alarmDate;
-    }
-
-    public Date getAlarmDate()
-    {
-        return alarmDate;
-    }
-    public void setAlarmTime(Date alarmTime)
-    {
-        this.alarmTime = alarmTime;
-    }
-
-    public Date getAlarmTime()
-    {
-        return alarmTime;
-    }
-    public void setAlarmCode(String alarmCode)
-    {
-        this.alarmCode = alarmCode;
-    }
-
-    public String getAlarmCode()
-    {
-        return alarmCode;
-    }
-    public void setAlarmMsg(String alarmMsg)
-    {
-        this.alarmMsg = alarmMsg;
-    }
-
-    public String getAlarmMsg()
-    {
-        return alarmMsg;
-    }
-    public void setAlarmType(Integer alarmType)
-    {
-        this.alarmType = alarmType;
-    }
-
-    public Integer getAlarmType()
-    {
-        return alarmType;
-    }
-    public void setAlarmState(Integer alarmState)
-    {
-        this.alarmState = alarmState;
-    }
-
-    public Integer getAlarmState()
-    {
-        return alarmState;
-    }
-
-    public String getSubSystemName() {
-        return subSystemName;
-    }
-
-    public void setSubSystemName(String subSystemName) {
-        this.subSystemName = subSystemName;
-    }
-
-    public String getSystemCode() {
-        return systemCode;
-    }
-
-    public void setSystemCode(String systemCode) {
-        this.systemCode = systemCode;
-    }
-
-    public List<Integer> getAlarmStateList() {
-        return alarmStateList;
-    }
-
-    public void setAlarmStateList(List<Integer> alarmStateList) {
-        this.alarmStateList = alarmStateList;
-    }
-
-    public String getObjName() {
-        return objName;
-    }
-
-    public void setObjName(String objName) {
-        this.objName = objName;
-    }
-
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("areaCode", getAreaCode())
-            .append("objType", getObjType())
-            .append("objCode", getObjCode())
-            .append("alarmDate", getAlarmDate())
-            .append("alarmTime", getAlarmTime())
-            .append("alarmCode", getAlarmCode())
-            .append("alarmMsg", getAlarmMsg())
-            .append("alarmType", getAlarmType())
-            .append("alarmState", getAlarmState())
-            .toString();
-    }
-}

ems/ems-core/src/main/java/com/ruoyi/ems/mapper/AdmOpAlarmMapper.java

@@ -1,89 +0,0 @@
-package com.ruoyi.ems.mapper;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.ruoyi.ems.domain.AdmOpAlarm;
-
-/**
- * 能源设施告警Mapper接口
- *
- * @author ruoyi
- * @date 2024-08-26
- */
-public interface AdmOpAlarmMapper {
-    /**
-     * 查询能源设施告警
-     *
-     * @param id 能源设施告警主键
-     * @return 能源设施告警
-     */
-    AdmOpAlarm selectAdmOpAlarmById(Long id);
-
-    /**
-     * 查询能源设施告警列表
-     *
-     * @param admOpAlarm 能源设施告警
-     * @return 能源设施告警集合
-     */
-    List<AdmOpAlarm> selectAdmOpAlarmList(AdmOpAlarm admOpAlarm);
-
-    /**
-     * 新增能源设施告警
-     *
-     * @param admOpAlarm 能源设施告警
-     * @return 结果
-     */
-    int insertAdmOpAlarm(AdmOpAlarm admOpAlarm);
-
-    /**
-     * 修改能源设施告警
-     *
-     * @param admOpAlarm 能源设施告警
-     * @return 结果
-     */
-    int updateAdmOpAlarm(AdmOpAlarm admOpAlarm);
-
-    /**
-     * 删除能源设施告警
-     *
-     * @param id 能源设施告警主键
-     * @return 结果
-     */
-    int deleteAdmOpAlarmById(Long id);
-
-    /**
-     * 批量删除能源设施告警
-     *
-     * @param ids 需要删除的数据主键集合
-     * @return 结果
-     */
-    int deleteAdmOpAlarmByIds(Long[] ids);
-
-    List<Map<String, Object>> qryAlarmTypeIndex(@Param("areaCode") String areaCode,
-        @Param("startTime") String startTime, @Param("endTime") String endTime);
-
-    List<Map<String, Object>> qryAlarmTypeIndexByDate(AdmOpAlarm admOpAlarm);
-    List<Map<String, Object>> qryAlarmTypeIndexDay(@Param("alarmDate") String alarmDate,
-        @Param("areaCode") String areaCode);
-
-    List<Map<String, Object>> qryAlarmTypeIndexMonth(@Param("alarmDate") String alarmDate,
-        @Param("areaCode") String areaCode);
-
-    List<Map<String, Object>> qryAlarmTypeIndexYear(@Param("alarmDate") String alarmDate,
-        @Param("areaCode") String areaCode);
-
-    List<Map<String, Object>> qrySubSysIndexDay(@Param("alarmDate") String alarmDate,
-        @Param("areaCode") String areaCode);
-
-    List<Map<String, Object>> qrySubSysIndexMonth(@Param("alarmDate") String alarmDate,
-        @Param("areaCode") String areaCode);
-
-    List<Map<String, Object>> qrySubSysIndexYear(@Param("alarmDate") String alarmDate,
-        @Param("areaCode") String areaCode);
-
-    Map<String, Object> cntHandledAlarmByDate(AdmOpAlarm admOpAlarm);
-
-}

ems/ems-core/src/main/java/com/ruoyi/ems/service/IAdmOpAlarmService.java

@@ -1,80 +0,0 @@
-package com.ruoyi.ems.service;
-
-import com.ruoyi.ems.domain.AdmOpAlarm;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * 能源设施告警Service接口
- *
- * @author ruoyi
- * @date 2024-08-26
- */
-public interface IAdmOpAlarmService {
-    /**
-     * 查询能源设施告警
-     *
-     * @param id 能源设施告警主键
-     * @return 能源设施告警
-     */
-    AdmOpAlarm selectAdmOpAlarmById(Long id);
-
-    /**
-     * 查询能源设施告警列表
-     *
-     * @param admOpAlarm 能源设施告警
-     * @return 能源设施告警集合
-     */
-    List<AdmOpAlarm> selectAdmOpAlarmList(AdmOpAlarm admOpAlarm);
-
-    /**
-     * 新增能源设施告警
-     *
-     * @param admOpAlarm 能源设施告警
-     * @return 结果
-     */
-    int insertAdmOpAlarm(AdmOpAlarm admOpAlarm);
-
-    /**
-     * 修改能源设施告警
-     *
-     * @param admOpAlarm 能源设施告警
-     * @return 结果
-     */
-    int updateAdmOpAlarm(AdmOpAlarm admOpAlarm);
-
-    /**
-     * 批量删除能源设施告警
-     *
-     * @param ids 需要删除的能源设施告警主键集合
-     * @return 结果
-     */
-    int deleteAdmOpAlarmByIds(Long[] ids);
-
-    /**
-     * 删除能源设施告警信息
-     *
-     * @param id 能源设施告警主键
-     * @return 结果
-     */
-    int deleteAdmOpAlarmById(Long id);
-
-    List<Map<String, Object>> qryAlarmTypeIndex(String areaCode, String startTime, String endTime);
-
-    List<Map<String, Object>> qryAlarmTypeIndexByDate(AdmOpAlarm params);
-
-    List<Map<String, Object>> qryAlarmTypeIndexDay(String areaCode);
-
-    List<Map<String, Object>> qryAlarmTypeIndexMonth(String areaCode);
-
-    List<Map<String, Object>> qryAlarmTypeIndexYear(String areaCode);
-
-    List<Map<String, Object>> qrySubSysIndexDay(String areaCode);
-
-    List<Map<String, Object>> qrySubSysIndexMonth(String areaCode);
-
-    List<Map<String, Object>> qrySubSysIndexYear(String areaCode);
-
-    Map<String, Object> cntHandledAlarmByDate(AdmOpAlarm admOpAlarm);
-}

ems/ems-core/src/main/java/com/ruoyi/ems/service/impl/AdmOpAlarmServiceImpl.java

@@ -1,178 +0,0 @@
-package com.ruoyi.ems.service.impl;
-
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.lang3.ObjectUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import com.ruoyi.common.core.utils.DateTimeUtil;
-import com.ruoyi.ems.domain.AdmOpAlarm;
-import com.ruoyi.ems.domain.Area;
-import com.ruoyi.ems.domain.EmsDevice;
-import com.ruoyi.ems.domain.EmsFacs;
-import com.ruoyi.ems.enums.AlarmObjType;
-import com.ruoyi.ems.mapper.AdmOpAlarmMapper;
-import com.ruoyi.ems.mapper.AreaMapper;
-import com.ruoyi.ems.mapper.EmsDeviceMapper;
-import com.ruoyi.ems.mapper.EmsFacsMapper;
-import com.ruoyi.ems.service.IAdmOpAlarmService;
-
-/**
- * 能源设施告警Service业务层处理
- *
- * @author ruoyi
- * @date 2024-08-26
- */
-@Service
-public class AdmOpAlarmServiceImpl implements IAdmOpAlarmService {
-    @Autowired
-    private AdmOpAlarmMapper admOpAlarmMapper;
-
-    @Autowired
-    private AreaMapper areaMapper;
-
-    @Autowired
-    private EmsFacsMapper emsFacsMapper;
-
-    @Autowired
-    private EmsDeviceMapper emsDeviceMapper;
-
-    /**
-     * 查询能源设施告警
-     *
-     * @param id 能源设施告警主键
-     * @return 能源设施告警
-     */
-    @Override
-    public AdmOpAlarm selectAdmOpAlarmById(Long id) {
-        return admOpAlarmMapper.selectAdmOpAlarmById(id);
-    }
-
-    /**
-     * 查询能源设施告警列表
-     *
-     * @param admOpAlarm 能源设施告警
-     * @return 能源设施告警
-     */
-    @Override
-    public List<AdmOpAlarm> selectAdmOpAlarmList(AdmOpAlarm admOpAlarm) {
-        return admOpAlarmMapper.selectAdmOpAlarmList(admOpAlarm);
-    }
-
-    /**
-     * 新增能源设施告警
-     *
-     * @param admOpAlarm 能源设施告警
-     * @return 结果
-     */
-    @Override
-    public int insertAdmOpAlarm(AdmOpAlarm admOpAlarm) {
-        admOpAlarm.setObjName(getObjInfo(admOpAlarm.getObjType(), admOpAlarm.getObjCode()));
-        return admOpAlarmMapper.insertAdmOpAlarm(admOpAlarm);
-    }
-
-    /**
-     * 修改能源设施告警
-     *
-     * @param admOpAlarm 能源设施告警
-     * @return 结果
-     */
-    @Override
-    public int updateAdmOpAlarm(AdmOpAlarm admOpAlarm) {
-        admOpAlarm.setObjName(getObjInfo(admOpAlarm.getObjType(), admOpAlarm.getObjCode()));
-        return admOpAlarmMapper.updateAdmOpAlarm(admOpAlarm);
-    }
-
-    /**
-     * 批量删除能源设施告警
-     *
-     * @param ids 需要删除的能源设施告警主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmOpAlarmByIds(Long[] ids) {
-        return admOpAlarmMapper.deleteAdmOpAlarmByIds(ids);
-    }
-
-    /**
-     * 删除能源设施告警信息
-     *
-     * @param id 能源设施告警主键
-     * @return 结果
-     */
-    @Override
-    public int deleteAdmOpAlarmById(Long id) {
-        return admOpAlarmMapper.deleteAdmOpAlarmById(id);
-    }
-
-    @Override
-    public List<Map<String, Object>> qryAlarmTypeIndex(String areaCode, String startTime, String endTime) {
-        return admOpAlarmMapper.qryAlarmTypeIndex(areaCode, startTime, endTime);
-    }
-
-    @Override
-    public List<Map<String, Object>> qryAlarmTypeIndexByDate(AdmOpAlarm params) {
-        return admOpAlarmMapper.qryAlarmTypeIndexByDate(params);
-    }
-
-    @Override
-    public List<Map<String, Object>> qryAlarmTypeIndexDay(String areaCode) {
-        String dateTime = DateTimeUtil.currentDateTime(DateTimeUtil.DateFormatter.yyyy_MM_dd);
-        return admOpAlarmMapper.qryAlarmTypeIndexDay(dateTime, areaCode);
-    }
-
-    @Override
-    public List<Map<String, Object>> qryAlarmTypeIndexMonth(String areaCode) {
-        String firstDayOfRecentMonth = DateTimeUtil.getFirstDayOfRecentMonth();
-        return admOpAlarmMapper.qryAlarmTypeIndexMonth(firstDayOfRecentMonth, areaCode);
-    }
-
-    @Override
-    public List<Map<String, Object>> qryAlarmTypeIndexYear(String areaCode) {
-        String firstDayOfRecentYear = DateTimeUtil.getFirstDayOfRecentYear();
-        return admOpAlarmMapper.qryAlarmTypeIndexYear(firstDayOfRecentYear, areaCode);
-    }
-
-    @Override
-    public List<Map<String, Object>> qrySubSysIndexDay(String areaCode) {
-        String dateTime = DateTimeUtil.currentDateTime(DateTimeUtil.DateFormatter.yyyy_MM_dd);
-        return admOpAlarmMapper.qrySubSysIndexDay(dateTime, areaCode);
-    }
-
-    @Override
-    public List<Map<String, Object>> qrySubSysIndexMonth(String areaCode) {
-        String firstDayOfRecentMonth = DateTimeUtil.getFirstDayOfRecentMonth();
-        return admOpAlarmMapper.qrySubSysIndexMonth(firstDayOfRecentMonth, areaCode);
-    }
-
-    @Override
-    public List<Map<String, Object>> qrySubSysIndexYear(String areaCode) {
-        String firstDayOfRecentYear = DateTimeUtil.getFirstDayOfRecentYear();
-        return admOpAlarmMapper.qrySubSysIndexYear(firstDayOfRecentYear, areaCode);
-    }
-
-    @Override
-    public Map<String, Object> cntHandledAlarmByDate(AdmOpAlarm admOpAlarm) {
-        return admOpAlarmMapper.cntHandledAlarmByDate(admOpAlarm);
-    }
-
-    private String getObjInfo(Integer objType, String objCode) {
-        if (AlarmObjType.AREA.getCode().equals(objType)) {
-            Area area = areaMapper.selectAreaByCode(objCode);
-            return ObjectUtils.isEmpty(area) ? StringUtils.EMPTY : area.getAreaName();
-        }
-        if (AlarmObjType.FACS.getCode().equals(objType)) {
-            EmsFacs emsFacs = emsFacsMapper.selectEmsFacsByCode(objCode);
-            return ObjectUtils.isEmpty(emsFacs) ? StringUtils.EMPTY : emsFacs.getFacsName();
-        }
-        if (AlarmObjType.DEVICE.getCode().equals(objType)) {
-            EmsDevice emsDevice = emsDeviceMapper.selectDeviceByCode(objCode);
-            return ObjectUtils.isEmpty(emsDevice) ? StringUtils.EMPTY : emsDevice.getDeviceName();
-        }
-
-        return StringUtils.EMPTY;
-    }
-}

ems/ems-core/src/main/resources/mapper/ems/AdmOpAlarmMapper.xml

@@ -1,254 +0,0 @@
-<?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.ruoyi.ems.mapper.AdmOpAlarmMapper">
-
-    <resultMap type="com.ruoyi.ems.domain.AdmOpAlarm" id="AdmOpAlarmResult">
-        <result property="id" column="id"/>
-        <result property="areaCode" column="area_code"/>
-        <result property="areaName" column="area_name"/>
-        <result property="areaShortName" column="area_short_name"/>
-        <result property="objType" column="obj_type"/>
-        <result property="objCode" column="obj_code"/>
-        <result property="alarmDate" column="alarm_date"/>
-        <result property="alarmTime" column="alarm_time"/>
-        <result property="alarmCode" column="alarm_code"/>
-        <result property="subSystemName" column="sub_system_name"/>
-        <result property="systemCode" column="system_code"/>
-        <result property="objName" column="obj_name"/>
-        <result property="alarmMsg" column="alarm_msg"/>
-        <result property="alarmType" column="alarm_type"/>
-        <result property="alarmState" column="alarm_state"/>
-    </resultMap>
-
-    <sql id="selectOpAlarmVo">
-        select
-            id, area_code, obj_type, obj_code, alarm_date, alarm_time, alarm_code, alarm_msg, alarm_type, alarm_state, obj_name, system_code
-        from
-            adm_op_alarm alarm
-    </sql>
-
-    <select id="selectAdmOpAlarmList" parameterType="com.ruoyi.ems.domain.AdmOpAlarm" resultMap="AdmOpAlarmResult">
-        select
-            alarm.id, alarm.area_code, a.area_name, a.short_name as area_short_name, alarm.obj_type, alarm.obj_code, alarm.alarm_date, alarm.alarm_time, alarm.alarm_code, alarm.alarm_msg, alarm.alarm_type, alarm.alarm_state, alarm.obj_name, sub.system_name sub_system_name, alarm.system_code
-        from
-            adm_op_alarm alarm
-            left join adm_ems_subsystem sub on sub.system_code = alarm.system_code
-            left join adm_area a on alarm.area_code = a.area_code
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode != '-1'">and alarm.area_code = #{areaCode}</if>
-            <if test="objType != null ">and alarm.obj_type = #{objType}</if>
-            <if test="objCode != null  and objCode != ''">and alarm.obj_code = #{objCode}</if>
-            <if test="alarmCode != null  and alarmCode != ''">and alarm.alarm_code = #{alarmCode}</if>
-            <if test="objName !=null and objName!=''">and alarm.obj_name like concat('%', #{objName}, '%')</if>
-            <if test="systemCode !=null and systemCode != ''">and alarm.system_code = #{systemCode}</if>
-            <if test="alarmMsg != null  and alarmMsg != ''">and alarm.alarm_msg like concat('%', #{alarmMsg}, '%')</if>
-            <if test="alarmType != null ">and alarm.alarm_type = #{alarmType}</if>
-            <if test="alarmState != null ">and alarm.alarm_state = #{alarmState}</if>
-            <if test="startRecTime != null  and startRecTime != '' and endRecTime != null and endRecTime !=''">
-                and alarm.alarm_time &gt;= #{startRecTime} and alarm.alarm_time &lt;= #{endRecTime}
-            </if>
-            <if test="alarmStateList != null and alarmStateList.size() > 0">
-                and alarm.alarm_state in
-                <foreach collection="alarmStateList" item="alarmState" open="(" close=")" separator=",">
-                    #{alarmState}
-                </foreach>
-            </if>
-        </where>
-        order by alarm.alarm_time desc
-    </select>
-
-    <select id="selectAdmOpAlarmById" parameterType="Long" resultMap="AdmOpAlarmResult">
-        <include refid="selectOpAlarmVo"/>
-        where alarm.id = #{id}
-    </select>
-
-    <insert id="insertAdmOpAlarm" parameterType="com.ruoyi.ems.domain.AdmOpAlarm" useGeneratedKeys="true"
-            keyProperty="id">
-        insert into adm_op_alarm
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="areaCode != null and areaCode != ''">area_code,</if>
-            <if test="objType != null">obj_type,</if>
-            <if test="objCode != null and objCode != ''">obj_code,</if>
-            <if test="objName != null and objName!=''">obj_name,</if>
-            <if test="alarmDate != null">alarm_date,</if>
-            <if test="alarmTime != null">alarm_time,</if>
-            <if test="systemCode !=null">system_code,</if>
-            <if test="alarmCode != null">alarm_code,</if>
-            <if test="alarmMsg != null">alarm_msg,</if>
-            <if test="alarmType != null">alarm_type,</if>
-            <if test="alarmState != null">alarm_state,</if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="areaCode != null and areaCode != ''">#{areaCode},</if>
-            <if test="objType != null">#{objType},</if>
-            <if test="objCode != null and objCode != ''">#{objCode},</if>
-            <if test="objName != null and objName!=''">#{objName},</if>
-            <if test="alarmDate != null">#{alarmDate},</if>
-            <if test="alarmTime != null">#{alarmTime},</if>
-            <if test="systemCode !=null">#{systemCode},</if>
-            <if test="alarmCode != null">#{alarmCode},</if>
-            <if test="alarmMsg != null">#{alarmMsg},</if>
-            <if test="alarmType != null">#{alarmType},</if>
-            <if test="alarmState != null">#{alarmState},</if>
-        </trim>
-    </insert>
-
-    <update id="updateAdmOpAlarm" parameterType="com.ruoyi.ems.domain.AdmOpAlarm">
-        update adm_op_alarm
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="areaCode != null and areaCode != ''">area_code = #{areaCode},</if>
-            <if test="objType != null">obj_type = #{objType},</if>
-            <if test="objCode != null and objCode != ''">obj_code = #{objCode},</if>
-            <if test="objName != null and objName!=''">obj_name = #{objName},</if>
-            <if test="alarmDate != null">alarm_date = #{alarmDate},</if>
-            <if test="alarmTime != null">alarm_time = #{alarmTime},</if>
-            <if test="alarmCode != null">alarm_code = #{alarmCode},</if>
-            <if test="systemCode !=null">system_code = #{systemCode},</if>
-            <if test="alarmMsg != null">alarm_msg = #{alarmMsg},</if>
-            <if test="alarmType != null">alarm_type = #{alarmType},</if>
-            <if test="alarmState != null">alarm_state = #{alarmState},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteAdmOpAlarmById" parameterType="Long">
-        delete
-        from adm_op_alarm
-        where id = #{id}
-    </delete>
-
-    <delete id="deleteAdmOpAlarmByIds" parameterType="String">
-        delete from adm_op_alarm where id in
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-
-    <select id="qryAlarmTypeIndex" resultType="java.util.Map">
-        SELECT count(*) cnt,
-        alarm_type alarmType
-        FROM adm_op_alarm
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode !='-1'">and area_code = #{areaCode}</if>
-            <if test="startTime != null  and startTime != '' and endTime != null and endTime !=''">
-                and alarm_time &gt;= #{startTime} and alarm_time &lt;= #{endTime}
-            </if>
-        </where>
-        GROUP BY alarm_type
-    </select>
-
-    <select id="qryAlarmTypeIndexByDate" parameterType="admOpAlarm" resultType="java.util.Map">
-        SELECT count(*) cnt,
-        alarm_type alarmType
-        FROM adm_op_alarm
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode !='-1'">and area_code = #{areaCode}</if>
-            <if test="startRecTime != null and startRecTime != ''">
-                and alarm_date like CONCAT(#{startRecTime},'%')
-            </if>
-        </where>
-        GROUP BY alarm_type
-    </select>
-
-    <select id="qryAlarmTypeIndexDay" resultType="java.util.Map">
-        SELECT count(*)                         cnt,
-               alarm_type                       alarmType,
-               DATE_FORMAT(alarm_time, '%H:00') dateIndex
-        FROM adm_op_alarm
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode !='-1'">and area_code = #{areaCode}</if>
-            <if test="alarmDate != null and alarmDate != ''">and alarm_date = #{alarmDate}</if>
-        </where>
-        GROUP BY DATE_FORMAT(alarm_time, '%H:00'), alarm_type
-        ORDER BY alarm_type, dateIndex
-    </select>
-
-    <select id="qryAlarmTypeIndexMonth" resultType="java.util.Map">
-        SELECT count(*)                               cnt,
-               alarm_type                             alarmType,
-               DATE_FORMAT(alarm_date, '%Y-%m-%d') AS dateIndex
-        FROM adm_op_alarm
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode !='-1'">and area_code = #{areaCode}</if>
-            <if test="alarmDate != null and alarmDate != ''">and alarm_date &gt;= #{alarmDate}</if>
-        </where>
-        GROUP BY alarm_type, alarm_date
-        ORDER BY alarm_type, dateIndex
-    </select>
-
-    <select id="qryAlarmTypeIndexYear" resultType="java.util.Map">
-        SELECT count(*)                            cnt,
-               alarm_type                          alarmType,
-               DATE_FORMAT(alarm_date, '%Y-%m') AS dateIndex
-        FROM adm_op_alarm
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode !='-1'">and area_code = #{areaCode}</if>
-            <if test="alarmDate != null and alarmDate != ''">and alarm_date &gt;= #{alarmDate}</if>
-        </where>
-        GROUP BY alarm_type, DATE_FORMAT(alarm_date, '%Y-%m')
-        ORDER BY alarm_type, dateIndex
-    </select>
-
-    <select id="qrySubSysIndexDay" resultType="java.util.Map">
-        SELECT count(*)                         cnt,
-               alarm.system_code                systemCode,
-               sub.system_name                  systemName,
-               DATE_FORMAT(alarm_time, '%H:00') dateIndex
-        FROM adm_op_alarm alarm
-                 left join adm_ems_subsystem sub
-                           on alarm.system_code = sub.system_code
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode !='-1'">and area_code = #{areaCode}</if>
-            <if test="alarmDate != null and alarmDate != ''">and alarm_date = #{alarmDate}</if>
-        </where>
-        GROUP BY DATE_FORMAT(alarm_time, '%H:00'), alarm.system_code
-        ORDER BY alarm.system_code, dateIndex
-    </select>
-
-    <select id="qrySubSysIndexMonth" resultType="java.util.Map">
-        SELECT count(*)                               cnt,
-               alarm.system_code                      systemCode,
-               sub.system_name                        systemName,
-               DATE_FORMAT(alarm_date, '%Y-%m-%d') AS dateIndex
-        FROM adm_op_alarm alarm
-                 left join adm_ems_subsystem sub
-                           on alarm.system_code = sub.system_code
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode !='-1'">and area_code = #{areaCode}</if>
-            <if test="alarmDate != null and alarmDate != ''">and alarm_date &gt;= #{alarmDate}</if>
-        </where>
-        GROUP BY alarm.system_code, alarm_date
-        ORDER BY alarm.system_code, dateIndex
-    </select>
-
-    <select id="qrySubSysIndexYear" resultType="java.util.Map">
-        SELECT count(*)                            cnt,
-               alarm.system_code                   systemCode,
-               sub.system_name                     systemName,
-               DATE_FORMAT(alarm_date, '%Y-%m') AS dateIndex
-        FROM adm_op_alarm alarm
-                 left join adm_ems_subsystem sub
-                           on alarm.system_code = sub.system_code
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode !='-1'">and area_code = #{areaCode}</if>
-            <if test="alarmDate != null and alarmDate != ''">and alarm_date &gt;= #{alarmDate}</if>
-        </where>
-        GROUP BY alarm.system_code,
-                 DATE_FORMAT(alarm_date, '%Y-%m')
-        ORDER BY alarm.system_code,
-                 dateIndex
-    </select>
-    <select id="cntHandledAlarmByDate" parameterType="admOpAlarm"  resultType="java.util.Map">
-        SELECT
-        count(id) cnt,
-        sum( CASE WHEN aoa.alarm_state = 1 THEN 1 ELSE 0 END) handledCnt
-        from
-        adm_op_alarm aoa
-        <where>
-            <if test="areaCode != null and areaCode != '' and areaCode !='-1'">and area_code = #{areaCode}</if>
-            <if test="startRecTime != null and startRecTime != ''">and aoa.alarm_date like CONCAT(#{startRecTime}, '%')</if>
-        </where>
-    </select>
-</mapper>