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/IDaqTemplateService.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/IDaqTemplateService.java b/zhitan-system/src/main/java/com/zhitan/model/service/IDaqTemplateService.java
index e722df0..eb64518 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/service/IDaqTemplateService.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/service/IDaqTemplateService.java
@@ -74,6 +74,15 @@
     boolean dapHasExist(DaqTemplate daqTemplate);
 
     /**
+     * 鏌ヨ鐩稿悓璁惧绫诲瀷涓嬫槸鍚︽湁閲嶅鐨勭紪鐮�
+     *
+     * @param code       鍙傛暟缂栫爜
+     * @param deviceType 璁惧绫诲瀷
+     * @return 鏄惁瀛樺湪
+     */
+    boolean dapCodeHasExist(String code, String deviceType);
+    boolean dapCodeHasExist(DaqTemplate daqTemplate);
+    /**
      * 鏌ヨ鎸囨爣妯℃澘
      *
      * @return 缁撴灉

--
Gitblit v1.9.3