From e49ebf51acec077224a2c3d211970a3cdc50f556 Mon Sep 17 00:00:00 2001 From: chendaofei <857448963@qq.com> Date: Wed, 8 Jan 2025 15:10:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detection/handler/SocketDevResponseService.java | 2 +- .../detection/handler/SocketSourceResponseService.java | 6 +++++- .../storage/service/impl/DetectionDataServiceImpl.java | 8 ++++++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java index c9d235e9..d7168db6 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketDevResponseService.java @@ -626,7 +626,7 @@ public class SocketDevResponseService { issueParam.setPlanId(param.getPlanId()); issueParam.setSourceId(param.getSourceId()); issueParam.setDevIds(param.getDevIds()); - issueParam.setScriptId("a303b2224845fcc6f60198b8ca23dca9"); + issueParam.setScriptId(param.getScriptId()); SocketMsg xuMsg = new SocketMsg<>(); xuMsg.setOperateCode(SourceOperateCodeEnum.OPER_GATHER.getValue()); diff --git a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java index e1593c90..f75a1c0f 100644 --- a/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java +++ b/detection/src/main/java/com/njcn/gather/detection/handler/SocketSourceResponseService.java @@ -246,14 +246,18 @@ public class SocketSourceResponseService { socketMsg.setRequestId(SourceOperateCodeEnum.FORMAL_REAL.getValue()+"&&"+sourceIssue.getType()); int ignoreCount; + int readData; if(sourceIssue.getType().equals(DicDataEnum.HP.getCode())||sourceIssue.getType().equals(DicDataEnum.F.getCode())){ ignoreCount = 1; + readData = 2; socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_01.getValue()); }else if(DicDataEnum.VOLTAGE.getCode().equals(sourceIssue.getType())){ ignoreCount = 1; + readData = 1; socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_03.getValue()); }else { ignoreCount = 7; + readData = 5; socketMsg.setOperateCode(SourceOperateCodeEnum.DEV_DATA_REQUEST_02.getValue()); } @@ -263,7 +267,7 @@ public class SocketSourceResponseService { System.out.println("向装置下发的参数"+comm); phaseSequenceParam.setMoniterIdList(moniterIdList); phaseSequenceParam.setDataType(comm); - phaseSequenceParam.setReadCount(2); + phaseSequenceParam.setReadCount(readData); phaseSequenceParam.setIgnoreCount(ignoreCount); diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java index 5008cc28..5ac80005 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/DetectionDataServiceImpl.java @@ -35,7 +35,9 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl monitorIds = adNonHarmonicResultList.stream().map(AdNonHarmonicResult::getMonitorId).distinct().collect(Collectors.toList()); if(CollUtil.isNotEmpty(monitorIds)){ - adNonHarmonicService.remove(new LambdaQueryWrapper().in(AdNonHarmonicResult::getMonitorId, monitorIds).eq(AdNonHarmonicResult::getScriptId,adNonHarmonicResultList.get(0).getScriptId())); + adNonHarmonicService.remove(new LambdaQueryWrapper().in(AdNonHarmonicResult::getMonitorId, monitorIds) + .eq(AdNonHarmonicResult::getScriptId,adNonHarmonicResultList.get(0).getScriptId()) + .eq(AdNonHarmonicResult::getAdType,adNonHarmonicResultList.get(0).getAdType())); adNonHarmonicService.saveBatch(adNonHarmonicResultList, 100); } DynamicTableNameHandler.remove(); @@ -49,7 +51,9 @@ public class DetectionDataServiceImpl extends ReplenishMybatisServiceImpl monitorIds = adHarmonicResultList.stream().map(AdHarmonicResult::getMonitorId).distinct().collect(Collectors.toList()); if(CollUtil.isNotEmpty(monitorIds)){ - this.remove(new LambdaQueryWrapper().in(AdHarmonicResult::getMonitorId, monitorIds).eq(AdHarmonicResult::getScriptId,adHarmonicResultList.get(0).getScriptId())); + this.remove(new LambdaQueryWrapper().in(AdHarmonicResult::getMonitorId, monitorIds) + .eq(AdHarmonicResult::getScriptId,adHarmonicResultList.get(0).getScriptId()) + .eq(AdHarmonicResult::getAdType,adHarmonicResultList.get(0).getAdType())); this.saveBatch(adHarmonicResultList, 100); }