Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.微调

Browse Source
This commit is contained in:
wr
2026-07-08 15:38:40 +08:00
parent f594915363
commit 5269496f24
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/po/Line.java
View File

@@ -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;
/**
* <p>
*
@@ -61,6 +64,8 @@ public class Line extends BaseEntity {
private Integer state;
@TableField(exist = false)
private List<Line> children;
}

3
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineDetailDataVO.java
View File

@@ -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;

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/LineDataExcel.java
View File

@@ -49,6 +49,6 @@ public class LineDataExcel implements Serializable {
private BigDecimal integrity;
@ExcelProperty(value = "国网ID")
private BigDecimal monitorId;
private String monitorId;
}

2
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java
View File

@@ -487,7 +487,7 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
lineDataExcel.setOnlineRate(onLineRate(onlineRateByDev, Arrays.asList(dto.getDeviceId())));
lineDataExcel.setIntegrity(integrity(integrityList, Arrays.asList(dto.getLineId())));
if (num == 1) {
lineDataExcel.setMonitorId(new BigDecimal(dto.getMonitorId()));
lineDataExcel.setMonitorId(dto.getMonitorId());
}
lineDataExcels1.add(lineDataExcel);
}

1
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java
View File

@@ -4107,6 +4107,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
});
});
} catch (Exception e) {
log.info("台账同步推送异常：" + e);
//出现异常，直接重启整个前置
exFlag=true;
for (Node node : nodes) {

1
pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java
View File

@@ -160,6 +160,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> 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());