diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/AdvanceEventDetailVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/AdvanceEventDetailVO.java index 063af3857..947620d17 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/AdvanceEventDetailVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/AdvanceEventDetailVO.java @@ -105,6 +105,12 @@ public class AdvanceEventDetailVO { @ApiModelProperty(value = "监测点名称") private String lineName; + @ApiModelProperty(value = "干扰源类型") + private String loadType; + + @ApiModelProperty(value = "监测对象") + private String objName; + private String voltageId; @ApiModelProperty(value = "特征值是否计算") diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java index 317121ba4..04ff34b6f 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/RmpEventDetailServiceImpl.java @@ -3,7 +3,6 @@ package com.njcn.event.service.majornetwork.Impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; -import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; @@ -41,11 +40,13 @@ import com.njcn.event.mapper.majornetwork.RmpEventDetailMapper; import com.njcn.event.pojo.dto.EventCount; import com.njcn.event.pojo.param.EventBaseParam; import com.njcn.event.pojo.param.UniversalFrontEndParam; +import com.njcn.event.pojo.po.RMpEventDetailM; import com.njcn.event.pojo.po.RmpEventDetailPO; -import com.njcn.event.pojo.vo.*; +import com.njcn.event.pojo.vo.AdvanceEventDetailVO; +import com.njcn.event.pojo.vo.EventDetailVO; +import com.njcn.event.pojo.vo.RmpEventDetailVO; import com.njcn.event.service.majornetwork.RmpEventDetailService; import com.njcn.harmonic.pojo.param.StatSubstationBizBaseParam; -import com.njcn.event.pojo.po.RMpEventDetailM; import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataEnum; import com.njcn.system.enums.DicDataTypeEnum; @@ -55,6 +56,11 @@ import com.njcn.user.pojo.dto.DeptDTO; import com.njcn.web.factory.PageFactory; import com.njcn.web.pojo.param.BaseParam; import com.njcn.web.utils.RequestUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.BeanUtils; +import org.springframework.stereotype.Service; +import org.springframework.util.StringUtils; import java.math.BigDecimal; import java.util.*; @@ -62,12 +68,6 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.Stream; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; -import org.springframework.util.StringUtils; - /** * 暂态事件明细 @@ -502,6 +502,9 @@ public class RmpEventDetailServiceImpl extends ServiceImpl