diff --git a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml index 671e1283..abece248 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml +++ b/event_smart/src/main/java/com/njcn/gather/event/devcie/mapper/mapping/PqLineMapper.xml @@ -50,5 +50,9 @@ and pq_line.SUBV_INDEX = PQ_SUBVOLTAGE.SUBV_INDEX and PQ_SUBVOLTAGE.DEV_INDEX = pq_device.DEV_INDEX and pq_device.SUB_INDEX = PQ_SUBSTATION.SUB_INDEX + and pq_line.line_index in + + #{item} + \ No newline at end of file diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/LargeScreenCountController.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/LargeScreenCountController.java index fed03512..081993ef 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/LargeScreenCountController.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/controller/LargeScreenCountController.java @@ -2,6 +2,7 @@ package com.njcn.gather.event.transientes.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.gather.event.transientes.pojo.param.LargeScreenCountParam; @@ -80,9 +81,6 @@ public class LargeScreenCountController extends BaseController { } - - - @OperateInfo @PostMapping("/noDealEventList") @ApiOperation("未处理暂降事件列表") @@ -94,8 +92,15 @@ public class LargeScreenCountController extends BaseController { } - - + @OperateInfo(operateType= OperateType.UPDATE) + @PostMapping("/lookEvent") + @ApiOperation("处理暂降事件") + @ApiImplicitParam(name = "eventIds", value = "暂降事件id", required = true) + public HttpResult lookEvent(@RequestBody List eventIds) { + String methodDescribe = getMethodDescribe("lookEvent"); + boolean result = largeScreenCountService.lookEvent(eventIds); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventInfoMapper.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventInfoMapper.java new file mode 100644 index 00000000..8810dc44 --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/mapper/MsgEventInfoMapper.java @@ -0,0 +1,9 @@ +package com.njcn.gather.event.transientes.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface MsgEventInfoMapper extends BaseMapper { +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventInfo.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventInfo.java new file mode 100644 index 00000000..57a957b7 --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/MsgEventInfo.java @@ -0,0 +1,49 @@ +package com.njcn.gather.event.transientes.pojo.po; + +/** + * @Author: cdf + * @CreateTime: 2025-06-25 + * @Description: + */ + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import java.io.Serializable; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.Date; + +/** + * 消息事件信息实体 + */ +@Data +@TableName("MSG_EVENT_INFO") +public class MsgEventInfo implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 消息索引 + */ + private String msgIndex; + + /** + * 用户ID + */ + private String userId; + + /** + * 发送时间 + */ + private LocalDateTime sendTime; + + /** + * 消息内容 + */ + private String msgContent; + + /** + * 事件索引 + */ + private String eventIndex; +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetail.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetail.java index dfe56b43..61338589 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetail.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/po/PqsEventdetail.java @@ -6,6 +6,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import java.math.BigDecimal; import java.time.LocalDateTime; + +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.NoArgsConstructor; @@ -28,6 +30,7 @@ public class PqsEventdetail { private Integer lineid; @TableField(value = "TIMEID") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime timeid; @TableField(value = "MS") diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java index 1c586aad..70912d29 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/pojo/vo/EventDetailVO.java @@ -1,5 +1,6 @@ package com.njcn.gather.event.transientes.pojo.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.math.BigDecimal; @@ -15,13 +16,14 @@ import java.time.LocalDateTime; @Data public class EventDetailVO { - private String eventdetailIndex; + private String eventdetail_index; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime timeid; private BigDecimal ms; - private Short wavetype; + private String wavetype; private Double eventvalue; @@ -29,10 +31,14 @@ public class EventDetailVO { private Integer noticeFlag; - private String lineName; + private Integer lineid; + + private String pointname; + + private String persisttime; - private String stationName; + private String bdname; private String objName; } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/LargeScreenCountService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/LargeScreenCountService.java index ef4f155d..58c110b3 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/LargeScreenCountService.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/LargeScreenCountService.java @@ -29,4 +29,5 @@ public interface LargeScreenCountService { List noDealEventList(LargeScreenCountParam largeScreenCountParam); + boolean lookEvent(List ids); } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventInfoService.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventInfoService.java new file mode 100644 index 00000000..0508a4d6 --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/MsgEventInfoService.java @@ -0,0 +1,7 @@ +package com.njcn.gather.event.transientes.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo; + +public interface MsgEventInfoService extends IService { +} diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java index 9966fd47..790aae6e 100644 --- a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/LargeScreenCountServiceImpl.java @@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.github.yulichang.wrapper.segments.Fun; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; @@ -277,15 +278,22 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { } List eventList = pqsEventdetailService.list(lambdaQueryWrapper); if(CollUtil.isNotEmpty(eventList)){ - List pqLineList = pqLineMapper.getBaseLineInfo(deptslineIds); + List ids = eventList.stream().map(PqsEventdetail::getLineid).distinct().collect(Collectors.toList()); + List pqLineList = pqLineMapper.getBaseLineInfo(ids); Map ledgerBaseInfoDTOMap = pqLineList.stream().collect(Collectors.toMap(LedgerBaseInfoDTO::getLineId, Function.identity())); eventList.forEach(it->{ EventDetailVO eventDetailVO = new EventDetailVO(); - BeanUtil.copyProperties(it,eventDetailVO); + eventDetailVO.setEventdetail_index(it.getEventdetailIndex()); + eventDetailVO.setTimeid(it.getTimeid()); + eventDetailVO.setMs(it.getMs()); + eventDetailVO.setWavetype(it.getWavetype().toString()); + eventDetailVO.setPersisttime(it.getPersisttime().toString()); + eventDetailVO.setEventvalue(it.getEventvalue()); if(ledgerBaseInfoDTOMap.containsKey(it.getLineid())){ LedgerBaseInfoDTO ledgerBaseInfoDTO = ledgerBaseInfoDTOMap.get(it.getLineid()); - eventDetailVO.setLineName(ledgerBaseInfoDTO.getLineName()); - eventDetailVO.setStationName(ledgerBaseInfoDTO.getStationName()); + eventDetailVO.setLineid(ledgerBaseInfoDTO.getLineId()); + eventDetailVO.setPointname(ledgerBaseInfoDTO.getLineName()); + eventDetailVO.setBdname(ledgerBaseInfoDTO.getStationName()); } result.add(eventDetailVO); }); @@ -293,5 +301,13 @@ public class LargeScreenCountServiceImpl implements LargeScreenCountService { return result; } + @Override + public boolean lookEvent(List ids) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.in(PqsEventdetail::getEventdetailIndex,ids).set(PqsEventdetail::getLookFlag,DataStateEnum.ENABLE.getCode()); + pqsEventdetailService.update(updateWrapper); + return true; + } + } diff --git a/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventInfoServiceImpl.java b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventInfoServiceImpl.java new file mode 100644 index 00000000..b3e7b13f --- /dev/null +++ b/event_smart/src/main/java/com/njcn/gather/event/transientes/service/impl/MsgEventInfoServiceImpl.java @@ -0,0 +1,14 @@ +package com.njcn.gather.event.transientes.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.gather.event.transientes.mapper.MsgEventInfoMapper; +import com.njcn.gather.event.transientes.pojo.po.MsgEventInfo; +import com.njcn.gather.event.transientes.service.MsgEventInfoService; + +/** + * @Author: cdf + * @CreateTime: 2025-06-25 + * @Description: + */ +public class MsgEventInfoServiceImpl extends ServiceImpl implements MsgEventInfoService { +}