|
|
|
@ -10,7 +10,10 @@ import com.hnac.hzims.operational.alert.entity.HistoryAbnormalAlarmEntity;
|
|
|
|
|
import com.hnac.hzims.operational.alert.mapper.HistoryAbnormalAlarmMapper; |
|
|
|
|
import com.hnac.hzims.operational.alert.service.AlarmHandleService; |
|
|
|
|
import com.hnac.hzims.operational.alert.service.HistoryAbnormalAlarmService; |
|
|
|
|
import com.hnac.hzims.operational.alert.vo.*; |
|
|
|
|
import com.hnac.hzims.operational.alert.vo.AlarmDataVo; |
|
|
|
|
import com.hnac.hzims.operational.alert.vo.AlarmParamVo; |
|
|
|
|
import com.hnac.hzims.operational.alert.vo.AlarmReustVo; |
|
|
|
|
import com.hnac.hzims.operational.alert.vo.HistoryAlarmVo; |
|
|
|
|
import com.hnac.hzims.operational.config.vo.AlarmDataPageVo; |
|
|
|
|
import com.hnac.hzims.operational.config.vo.AlarmVo; |
|
|
|
|
import com.hnac.hzims.operational.config.vo.IntelligentAlarmCountVo; |
|
|
|
@ -38,7 +41,6 @@ import org.springblade.core.tool.utils.ObjectUtil;
|
|
|
|
|
import org.springblade.system.entity.Dept; |
|
|
|
|
import org.springblade.system.feign.ISysClient; |
|
|
|
|
import org.springframework.beans.factory.annotation.Value; |
|
|
|
|
import org.springframework.data.redis.core.RedisTemplate; |
|
|
|
|
import org.springframework.stereotype.Service; |
|
|
|
|
|
|
|
|
|
import java.lang.reflect.Field; |
|
|
|
@ -46,7 +48,6 @@ import java.math.BigDecimal;
|
|
|
|
|
import java.time.LocalDateTime; |
|
|
|
|
import java.time.format.DateTimeFormatter; |
|
|
|
|
import java.util.*; |
|
|
|
|
import java.util.concurrent.TimeUnit; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
@ -225,7 +226,9 @@ public class HistoryAbnormalAlarmServiceImpl extends BaseServiceImpl<HistoryAbno
|
|
|
|
|
LambdaQueryWrapper<StationEntity> wrapper = Wrappers.lambdaQuery(); |
|
|
|
|
wrapper.eq(StationEntity::getServeType,HomePageConstant.HYDROPOWER_SERVETYPE); |
|
|
|
|
wrapper.in(StationEntity::getRefDept,result.getData().stream().map(Dept::getId).collect(Collectors.toList())); |
|
|
|
|
|
|
|
|
|
if(StringUtils.isNotEmpty(param.getCode())){ |
|
|
|
|
wrapper.eq(StationEntity::getCode,param.getCode()); |
|
|
|
|
} |
|
|
|
|
List<StationEntity> stations = stationService.list(wrapper); |
|
|
|
|
if(CollectionUtil.isEmpty(stations)){ |
|
|
|
|
return new AlarmReustVo(); |
|
|
|
|