From dda18320f831275bf3d295cdfd62a1f5a31ac6a9 Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Tue, 4 Mar 2025 14:10:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../detection/handler/SocketDevResponseService.java | 2 +- .../gather/plan/service/impl/AdPlanServiceImpl.java | 2 +- .../gather/storage/service/AdHarmonicService.java | 9 +++++++-- .../storage/service/impl/AdHarmonicServiceImpl.java | 13 ++++++++----- .../system/dictionary/mapper/DictTreeMapper.java | 7 +++++++ .../dictionary/mapper/mapping/DictTreeMapper.xml | 3 +++ 6 files changed, 27 insertions(+), 9 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 2f1d6c68..715b0bf7 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 @@ -785,7 +785,7 @@ public class SocketDevResponseService { StorageParam storageParam = new StorageParam(); storageParam.setCode(Integer.valueOf(param.getCode())); storageParam.setScriptId(param.getScriptId()); - List indexes = adHarmonicService.getIndex(storageParam); + List indexes = adHarmonicService.getIndex(storageParam,false); issueParam.setIndexList(indexes); issueParam.setIsPhaseSequence(SourceOperateCodeEnum.COEFFICIENT_TEST.getValue()); } else { diff --git a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java index 8069f33a..e92075ad 100644 --- a/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/plan/service/impl/AdPlanServiceImpl.java @@ -382,7 +382,7 @@ public class AdPlanServiceImpl extends ServiceImpl impleme StorageParam storageParam = new StorageParam(); storageParam.setCode(Integer.valueOf(adPlan.getCode())); storageParam.setScriptId(adPlan.getScriptId()); - List indexes = adHarmonicService.getIndex(storageParam); + List indexes = adHarmonicService.getIndex(storageParam,true); scriptDtlsList = scriptDtlsList.stream().filter(obj -> indexes.contains(obj.getScriptIndex())).collect(Collectors.toList()); } diff --git a/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java b/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java index 67f5a53b..175d9f77 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/AdHarmonicService.java @@ -43,8 +43,13 @@ public interface AdHarmonicService extends IService { */ Map listHarmResultData(StorageParam param) ; - - List getIndex(StorageParam param); + /** + * 获取索引 + * @param param + * @param isExculdePhaseAngle 是否排除电压相角、电流相角 + * @return + */ + List getIndex(StorageParam param,Boolean isExculdePhaseAngle); AdHarmonicResult getSingleResult(SingleNonHarmParam singleNonHarmParam); } diff --git a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java index a594daaa..10ef106e 100644 --- a/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java +++ b/storage/src/main/java/com/njcn/gather/storage/service/impl/AdHarmonicServiceImpl.java @@ -22,7 +22,6 @@ import com.njcn.gather.storage.pojo.vo.RawResultDataVO; import com.njcn.gather.storage.service.AdHarmonicService; import com.njcn.gather.system.dictionary.mapper.DictTreeMapper; import com.njcn.gather.system.dictionary.pojo.enums.DictDataEnum; -import com.njcn.gather.system.dictionary.pojo.po.DictData; import com.njcn.gather.system.dictionary.pojo.po.DictTree; import com.njcn.gather.system.dictionary.service.IDictDataService; import lombok.RequiredArgsConstructor; @@ -76,7 +75,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl adHarmonicResults = this.getBaseMapper().selectJoinList(AdHarmonicResult.class, wrapper); Map> info = new LinkedHashMap<>(3); - if(CollectionUtil.isNotEmpty(adHarmonicResults)){ + if (CollectionUtil.isNotEmpty(adHarmonicResults)) { List harmNum = param.getHarmNum(); RawDataVO dataVO; List rawDataVOS; @@ -178,7 +177,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl getIndex(StorageParam param) { + public List getIndex(StorageParam param, Boolean isExculdePhaseAngle) { String prefix = "ad_harmonic_result_"; String prefixNon = "ad_non_harmonic_result_"; DynamicTableNameHandler.setTableName(prefix + param.getCode()); @@ -211,9 +210,12 @@ public class AdHarmonicServiceImpl extends ServiceImpl phaseAngleIds = dictTreeMapper.getPhaseAngleIds(); + resultLambdaQueryWrapper.notIn(AdNonHarmonicResult::getAdType, phaseAngleIds); + } List nonHarmonicResults = adNonHarmonicMapper.selectList(resultLambdaQueryWrapper); indexes.addAll(nonHarmonicResults.stream().map(AdNonHarmonicResult::getSort).collect(Collectors.toList())); - DynamicTableNameHandler.remove(); return indexes; } @@ -234,6 +236,7 @@ public class AdHarmonicServiceImpl extends ServiceImpl numbers) { List isData = numbers.stream().filter(x -> ObjectUtil.isNotNull(x.getData())).filter(x -> 4 != x.getIsData()).map(RawResultDataVO.DetectionData::getIsData).distinct().collect(Collectors.toList()); return getInteger(isData); diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/mapper/DictTreeMapper.java b/system/src/main/java/com/njcn/gather/system/dictionary/mapper/DictTreeMapper.java index 3bfd9214..c94df211 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/mapper/DictTreeMapper.java +++ b/system/src/main/java/com/njcn/gather/system/dictionary/mapper/DictTreeMapper.java @@ -13,4 +13,11 @@ import java.util.List; */ public interface DictTreeMapper extends BaseMapper { List queryLastLevelById(@Param("id") String id); + + /** + * 获取电压相角、电流相角的id列表 + * + * @return + */ + List getPhaseAngleIds(); } diff --git a/system/src/main/java/com/njcn/gather/system/dictionary/mapper/mapping/DictTreeMapper.xml b/system/src/main/java/com/njcn/gather/system/dictionary/mapper/mapping/DictTreeMapper.xml index fbf70df3..4e340386 100644 --- a/system/src/main/java/com/njcn/gather/system/dictionary/mapper/mapping/DictTreeMapper.xml +++ b/system/src/main/java/com/njcn/gather/system/dictionary/mapper/mapping/DictTreeMapper.xml @@ -16,4 +16,7 @@ WHERE b.pids LIKE concat('%',#{id},'%') and a.id = b.pid) + \ No newline at end of file