From ca8bd9fea241c9a96eb6137896d176aa2cefbbf0 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Tue, 16 Jun 2026 14:52:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E7=BD=AE?= =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=A3=85=E7=BD=AE=E8=BF=9B=E7=A8=8B=E9=87=8D?= =?UTF-8?q?=E7=BD=AE=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../advance/service/impl/EventWaveAnalysisServiceImpl.java | 2 +- .../device/common/service/impl/TerminalBaseServiceImpl.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java index 22f956b75..1dd6ed557 100644 --- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java +++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/impl/EventWaveAnalysisServiceImpl.java @@ -182,7 +182,7 @@ public class EventWaveAnalysisServiceImpl implements EventWaveAnalysisService { JSONObject jsonObject = JSONObject.fromObject(hdrStr); translateData(jsonObject, rmpEventDetailPO.getStartTime(), entityAdvancedData); - if (rmpEventDetailPO.getDealFlag() != 1) { + if (!Objects.equals(rmpEventDetailPO.getDealFlag(),1) ) { //如果存在三个文件但是没有调用dll/so计算 getDataFromDLL(rmpEventDetailPO, waveOriginalData, rect, entityAdvancedData, causeStruct); } diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java index fda370404..b0dffcf95 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java @@ -4362,6 +4362,10 @@ public class TerminalBaseServiceImpl extends ServiceImpl imple // 比较装置 所属前置 flag |= compareAndAppend(stringBuilder, devDetail.getNodeId(), updateDeviceParam.getNodeId(), "终端所属前置机"); + //如果前置机切换，可能装置在进程2上，但是切换后前置机只有一个进程，因此修改装置进程表设为默认进程1 + if(!Objects.equals(updateDeviceParam.getNodeId(), devDetail.getNodeId())){ + deviceProcessService.lambdaUpdate().eq(DeviceProcess::getId,devDetail.getId()).set(DeviceProcess::getProcessNo,1).update(); + } // 比较装置端口号 flag |= compareAndAppend(stringBuilder, devDetail.getPort(), updateDeviceParam.getPort(), "终端端口号"); From 9a9a8151d93d4fc5b7908ca59fac07e593afefd6 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Tue, 16 Jun 2026 15:55:22 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/event/common/service/impl/EventDetailServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 46b0048e9..d0c815cb8 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 @@ -157,7 +157,7 @@ public class EventDetailServiceImpl extends ServiceImpl Date: Tue, 16 Jun 2026 16:25:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/common/service/impl/EventDetailServiceImpl.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 d0c815cb8..2fbb7e014 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 @@ -37,6 +37,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.influxdb.dto.QueryResult; import org.influxdb.impl.InfluxDBResultMapper; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -159,7 +160,13 @@ public class EventDetailServiceImpl extends ServiceImpl Date: Wed, 17 Jun 2026 13:54:44 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=85=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RStatIntegrityDServiceImpl.java | 33 ++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java index ef4231e0a..4b9af8b60 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RStatIntegrityDServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.StopWatch; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -37,6 +38,7 @@ import com.njcn.device.userledger.service.UserLedgerService; import com.njcn.supervision.pojo.param.user.UserReportParam; import com.njcn.supervision.pojo.vo.user.UserLedgerVO; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -60,6 +62,7 @@ import java.util.stream.Collectors; */ @Service @RequiredArgsConstructor +@Slf4j public class RStatIntegrityDServiceImpl extends MppServiceImpl implements IRStatIntegrityDService { private final RStatOnlinerateDMapper onlineRateMapper; @@ -153,8 +156,14 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl deviceInfo = deviceService.getDeviceInfo(param, null, Collections.singletonList(1)); + sw.stop(); + if (CollUtil.isNotEmpty(deviceInfo)) { List lineIds = deviceInfo.stream() .flatMap(x -> x.getLineIndexes().stream()).collect(Collectors.toList()) @@ -165,7 +174,12 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl data = commLineClient.getLineAllDetailList(lineIds).getData(); + sw.stop(); + sw.start("内存过滤线路"); + filterLineList= data.stream() .filter(dto -> { LineALLInfoDTO.LineLineDTO lineDTO = dto.getLineLineDTO(); @@ -183,9 +197,12 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl finalFilterLineList = filterLineList; //根据过滤后监测点过滤 + sw.start("过滤后重新组装"); deviceInfo= deviceInfo.stream() .filter(dto -> { List original = dto.getLineIndexes(); @@ -204,9 +221,16 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl lineIntegrityRateInfo = rStatIntegrityDMapper.getLineIntegrityRateInfo(filterLineList, param.getSearchBeginTime(), param.getSearchEndTime()); + sw.stop(); + sw.start("查询线路详情"); + //获取所有监测点信息信息 List LineInfoByIds = lineService.getLineDetailByIds(filterLineList); + sw.stop(); rate.setBelowNum(CollUtil.isNotEmpty(lineIntegrityRateInfo) ? calculateIntegrityRate(lineIntegrityRateInfo, 90, filterLineList.size()) : lineIds.size()); rate.setTotalOnlineRate(calculateIntegrityRate(lineIntegrityRateInfo, filterLineList).doubleValue()>100.0?BigDecimal.valueOf(100.0) : calculateIntegrityRate(lineIntegrityRateInfo, lineIds)); @@ -214,7 +238,12 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl userLedgerVOS = userLedgerService.selectUserList(new UserReportParam()); + sw.stop(); + sw.start("组装响应"); + Map objMap = userLedgerVOS.stream().collect(Collectors.toMap(UserLedgerVO::getId, UserLedgerVO::getProjectName)); for (GeneralDeviceDTO dto : deviceInfo) { //获取部门终端集合 @@ -252,7 +281,9 @@ public class RStatIntegrityDServiceImpl extends MppServiceImpl