From d84d91a24112615df84092b0b6d8857ee457b5a9 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Tue, 30 Jun 2026 13:38:07 +0800 Subject: [PATCH] =?UTF-8?q?refactor(service):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E5=89=8D=E7=BD=AE=E5=91=8A=E8=AD=A6=E4=BF=A1=E6=81=AF=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=B1=BB=E5=9E=8B=E4=B8=BA=E4=B8=93=E7=94=A8VO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加FrontWarnVo类用于封装前置告警信息 - 将getFrontWarnInfo方法的返回类型从Page改为Page - 在实现类中创建新的Page对象并复制数据 - 使用BeanUtils将CsEventPO属性复制到FrontWarnVo对象 - 更新控制器中的返回类型以匹配新的VO类型 - 移除旧的FrontWarnVO类定义 --- .../njcn/csharmonic/pojo/vo/FrontWarnVO.java | 32 ------------------- .../controller/EventUserController.java | 5 +-- .../service/CsEventUserPOService.java | 3 +- .../impl/CsEventUserPOServiceImpl.java | 15 +++++++-- 4 files changed, 18 insertions(+), 37 deletions(-) delete mode 100644 cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/FrontWarnVO.java diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/FrontWarnVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/FrontWarnVO.java deleted file mode 100644 index 08ebded..0000000 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/FrontWarnVO.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.njcn.csharmonic.pojo.vo; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -/** - * @author xy - */ -@Data -public class FrontWarnVO implements Serializable { - - @ApiModelProperty("前置id") - private String frontId; - - @ApiModelProperty("前置ip") - private String frontIp; - - @ApiModelProperty("前置进程号") - private Integer processNo; - - @ApiModelProperty("事件发生时间") - private String startTime; - - @ApiModelProperty("告警描述") - private String tag; - - @ApiModelProperty("告警码") - private Integer code; - -} diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java index e32344c..efd8f28 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/EventUserController.java @@ -14,6 +14,7 @@ import com.njcn.csharmonic.param.CsEventUserQueryParam; import com.njcn.csharmonic.pojo.po.CsEventPO; import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.njcn.csharmonic.pojo.vo.EventDetailVO; +import com.njcn.csharmonic.pojo.vo.FrontWarnVo; import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO; import com.njcn.csharmonic.service.CsEventUserPOService; import com.njcn.web.controller.BaseController; @@ -89,9 +90,9 @@ public class EventUserController extends BaseController { @PostMapping("/frontWarnInfo") @ApiOperation("前置告警信息") @ApiImplicitParam(name = "baseParam", value = "基础查询数据", required = true) - public HttpResult> frontWarnInfo(@RequestBody CldWarnParam baseParam) { + public HttpResult> frontWarnInfo(@RequestBody CldWarnParam baseParam) { String methodDescribe = getMethodDescribe("frontWarnInfo"); - Page list = csEventUserPOService.getFrontWarnInfo(baseParam); + Page list = csEventUserPOService.getFrontWarnInfo(baseParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe); } diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java index 0af4864..1ab8039 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventUserPOService.java @@ -9,6 +9,7 @@ import com.njcn.csharmonic.pojo.dto.UnReadEventDto; import com.njcn.csharmonic.pojo.po.CsEventPO; import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.njcn.csharmonic.pojo.vo.EventDetailVO; +import com.njcn.csharmonic.pojo.vo.FrontWarnVo; import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO; import com.njcn.web.pojo.param.BaseParam; @@ -38,7 +39,7 @@ public interface CsEventUserPOService extends IService{ Page queryEventPageWeb(CsEventUserQueryPage csEventUserQueryPage); - Page getFrontWarnInfo(CldWarnParam baseParam); + Page getFrontWarnInfo(CldWarnParam baseParam); /** * 查询用户事件列表 diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java index 0a72046..49f2000 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java @@ -27,6 +27,7 @@ import com.njcn.csharmonic.pojo.po.CsEventPO; import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.njcn.csharmonic.pojo.po.PqGovernPlan; import com.njcn.csharmonic.pojo.vo.EventDetailVO; +import com.njcn.csharmonic.pojo.vo.FrontWarnVo; import com.njcn.csharmonic.pojo.vo.event.EventStatisticVO; import com.njcn.csharmonic.service.CsEventUserPOService; import com.njcn.csharmonic.utils.DataChangeUtil; @@ -556,7 +557,8 @@ public class CsEventUserPOServiceImpl extends ServiceImpl getFrontWarnInfo(CldWarnParam baseParam) { + public Page getFrontWarnInfo(CldWarnParam baseParam) { + Page result = new Page<>(baseParam.getPageNum(), baseParam.getPageSize()); Page page = new Page<>(baseParam.getPageNum(), baseParam.getPageSize()); List nodeList = nodeFeignClient.nodeAllList().getData(); Map nodeMap = new HashMap<>(); @@ -588,8 +590,10 @@ public class CsEventUserPOServiceImpl extends ServiceImpl records = page.getRecords(); if (CollUtil.isNotEmpty(records)) { + List frontWarnVos = new ArrayList<>(); Map finalNodeMap = nodeMap; page.getRecords().forEach(item->{ + FrontWarnVo vo = new FrontWarnVo(); //这边将前置名称放进lineId字段；将前置IP放进wavePath字段；进程号使用clDid Node node = finalNodeMap.get(item.getDeviceId()); item.setLineId(Objects.isNull(node) ? null : node.getName()); @@ -602,9 +606,16 @@ public class CsEventUserPOServiceImpl extends ServiceImpl