From 92b34ac4c1dcf3c02eca2f0c8fe47b18900008fd Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Mon, 10 Feb 2025 16:22:39 +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 --- .../njcn/gather/source/service/impl/PqSourceServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java b/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java index f240dd14..ef135851 100644 --- a/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java +++ b/detection/src/main/java/com/njcn/gather/source/service/impl/PqSourceServiceImpl.java @@ -199,12 +199,12 @@ public class PqSourceServiceImpl extends ServiceImpl i * @return 检测源名称 */ private String generatePqSourceName(PqSourceParam param, boolean isAdd) { - DevType devType = devTypeService.getById(param.getDevType()); + DictData devType = dictDataService.getDictDataById(param.getDevType()); DictData typeDictData = dictDataService.getDictDataById(param.getType()); if (ObjectUtil.isNotNull(devType) && ObjectUtil.isNotNull(typeDictData)) { if (isAdd) { - int count = this.lambdaQuery().eq(PqSource::getPattern, param.getPattern()).count(); + int count = this.lambdaQuery().eq(PqSource::getPattern, param.getPattern()).eq(PqSource::getState, DataStateEnum.ENABLE.getCode()).count(); return typeDictData.getName() + "-" + devType.getName() + "-" + (count + 1); } else { PqSource pqSource = this.lambdaQuery().eq(PqSource::getId, ((PqSourceParam.UpdateParam) param).getId()).one();