Merge remote-tracking branch 'origin/master'

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/mapper/operation/AbnormalAlarmMapper.java

@@ -1,14 +0,0 @@
-package com.hnac.hzims.scheduled.mapper.operation;
-
-import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity;
-import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
-
-import java.util.List;
-
-/**
- * @author ysj
- */
-public interface AbnormalAlarmMapper extends UserDataScopeBaseMapper<AbnormalAlarmEntity> {
-
-	List<String> abnormalAlarms();
-}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/AbnormalAlarmService.java

@@ -1,15 +0,0 @@
-package com.hnac.hzims.scheduled.service.operation.alarm;
-
-import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity;
-import org.springblade.core.mp.base.BaseService;
-
-import java.util.List;
-
-/**
- * 告警处理接口
- * @author ysj
- */
-public interface AbnormalAlarmService extends BaseService<AbnormalAlarmEntity> {
-
-    List<String> abnormalAlarms();
-}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/alarm/impl/AbnormalAlarmServiceImpl.java

@@ -1,33 +0,0 @@
-package com.hnac.hzims.scheduled.service.operation.alarm.impl;
-
-import com.hnac.hzims.operational.alert.entity.AbnormalAlarmEntity;
-import com.hnac.hzims.scheduled.mapper.operation.AbnormalAlarmMapper;
-import com.hnac.hzims.scheduled.service.operation.alarm.AbnormalAlarmService;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springblade.core.mp.base.BaseServiceImpl;
-import org.springblade.core.tool.utils.CollectionUtil;
-import org.springframework.stereotype.Service;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 告警实现类
- * @author ysj
- */
-@Slf4j
-@Service
-@RequiredArgsConstructor
-public class AbnormalAlarmServiceImpl extends BaseServiceImpl<AbnormalAlarmMapper, AbnormalAlarmEntity> implements AbnormalAlarmService {
-
-
-    @Override
-    public List<String> abnormalAlarms() {
-        List<String> alarmList = this.baseMapper.abnormalAlarms();
-        if(CollectionUtil.isEmpty(alarmList)){
-            return new ArrayList<>();
-        }
-        return alarmList;
-    }
-}

hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/service/operation/monitor/impl/MonitorServiceImpl.java

@@ -20,7 +20,6 @@ import com.hnac.hzims.operational.station.entity.StationAttributeEntity;
 import com.hnac.hzims.operational.station.entity.StationEntity;
 import com.hnac.hzims.scheduled.service.alarm.AlarmQueryService;
 import com.hnac.hzims.scheduled.service.equipment.WorkshopInfoService;
-import com.hnac.hzims.scheduled.service.operation.alarm.AbnormalAlarmService;
 import com.hnac.hzims.scheduled.service.operation.alarm.RecordService;
 import com.hnac.hzims.scheduled.service.operation.monitor.MonitorService;
 import com.hnac.hzims.scheduled.service.operation.station.StationAttrConfigService;
@@ -61,7 +60,6 @@ public class MonitorServiceImpl implements MonitorService {
     private final AlarmQueryService alarmQueryService;
     private final StationAttributeService attbtService;
     private final WorkshopInfoService workshopInfoService;
-    private final AbnormalAlarmService abnormalAlarmService;
     private final StationAttrConfigService attrConfigService;
     private final RedisTemplate redisTemplate;
     private final ISysClient sysClient;

hzims-service/hzims-scheduled/src/main/resources/mapper/operation/AbnormalAlarmMapper.xml

@@ -1,11 +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.hnac.hzims.scheduled.mapper.operation.AbnormalAlarmMapper">
-
-    <select id="abnormalAlarms" resultType="java.lang.String">
-        select distinct station_id from hzims_abnormal_alarm
-        where is_deleted = 0
-          and type in (13,14)
-          and `STATUS` = 0
-    </select>
-</mapper>