From 5269496f2489d9b5ce4791235fada1111e8e6b8e Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 8 Jul 2026 15:38:40 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/njcn/device/pq/pojo/po/Line.java | 5 +++++ .../com/njcn/device/pq/pojo/vo/LineDetailDataVO.java | 3 +++ .../device/pq/pojo/vo/dataClean/LineDataExcel.java | 2 +- .../pq/service/impl/PqDataVerifyBakServiceImpl.java | 2 +- .../common/service/impl/TerminalBaseServiceImpl.java | 1 + .../njcn/device/line/service/impl/LineServiceImpl.java | 1 + .../common/service/impl/EventDetailServiceImpl.java | 10 ---------- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Line.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Line.java index d818b47bc..e4856ac36 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Line.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Line.java @@ -1,10 +1,13 @@ package com.njcn.device.pq.pojo.po; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.njcn.db.bo.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.List; + /** *

* @@ -61,6 +64,8 @@ public class Line extends BaseEntity { private Integer state; + @TableField(exist = false) + private List children; } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java index a915c04fd..9b96d517d 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java @@ -46,6 +46,9 @@ public class LineDetailDataVO { @ApiModelProperty(name = "devName",value = "终端名称") private String devName; + @ApiModelProperty(name = "装置型号") + private String devType; + @ApiModelProperty(name = "ip",value = "网络参数") private String ip; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/LineDataExcel.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/LineDataExcel.java index 7be6f2a4f..32f409030 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/LineDataExcel.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/LineDataExcel.java @@ -49,6 +49,6 @@ public class LineDataExcel implements Serializable { private BigDecimal integrity; @ExcelProperty(value = "国网ID") - private BigDecimal monitorId; + private String monitorId; } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java index 6e0589e68..8d6185557 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java @@ -487,7 +487,7 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl imple }); }); } catch (Exception e) { + log.info("台账同步推送异常：" + e); //出现异常，直接重启整个前置 exFlag=true; for (Node node : nodes) { diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java index 461f36b98..66852afbf 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java @@ -160,6 +160,7 @@ public class LineServiceImpl extends ServiceImpl implements Li lineDetailDataVO.setIp(device.getIp()); lineDetailDataVO.setLoginTime(device.getLoginTime()); lineDetailDataVO.setDevId(device.getId()); + lineDetailDataVO.setDevType(device.getDevType()); lineDetailDataVO.setBusinessType(dicDataFeignClient.getDicDataById(lineDetail.getBusinessType()).getData().getName()); lineDetailDataVO.setLoadType(dicDataFeignClient.getDicDataById(lineDetail.getLoadType()).getData().getName()); lineDetailDataVO.setObjId(lineDetail.getObjId()); diff --git a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventDetailServiceImpl.java b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventDetailServiceImpl.java index 91a687e6c..6af005c49 100644 --- a/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventDetailServiceImpl.java +++ b/pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/EventDetailServiceImpl.java @@ -388,15 +388,5 @@ public class EventDetailServiceImpl extends ServiceImpl