From 75f043dfa6660716364e66ee0b3cf99f44255686 Mon Sep 17 00:00:00 2001
From: DYL0109 <dn18191638832@163.com>
Date: 星期三, 16 四月 2025 19:20:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into dyl_dev

---
 zhitan-system/src/main/java/com/zhitan/model/service/impl/DaqTemplateServiceImpl.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/impl/DaqTemplateServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/model/service/impl/DaqTemplateServiceImpl.java
index c1d84f2..9c80ef8 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/impl/DaqTemplateServiceImpl.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/impl/DaqTemplateServiceImpl.java
@@ -114,6 +114,17 @@
         return count > 0;
     }
 
+    @Override
+    public boolean dapCodeHasExist(String key, String deviceType) {
+        int count = daqTemplateMapper.dapHasExist(key, deviceType);
+        return count > 0;
+    }
+    @Override
+    public boolean dapCodeHasExist(DaqTemplate daqTemplate) {
+        int count = daqTemplateMapper.dapHasExistWhenUpdate(daqTemplate.getId(), daqTemplate.getGatewayKey(), daqTemplate.getDeviceType());
+        return count > 0;
+    }
+
     /**
      * 鏌ヨ鎸囨爣妯℃澘
      *

--
Gitblit v1.9.3