From 75f9894ebac12b13c7ead27c3e16db833ee9251a Mon Sep 17 00:00:00 2001
From: z1415143022 <z1415143022@163.com>
Date: 星期二, 25 三月 2025 20:02:45 +0800
Subject: [PATCH] Merge branch 'develop1.0' into zhangjw_from_develop1.0
---
zhitan-admin/src/main/java/com/zhitan/web/controller/model/DaqTemplateController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/model/DaqTemplateController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/model/DaqTemplateController.java
index aadde5f..788d218 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/model/DaqTemplateController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/model/DaqTemplateController.java
@@ -70,9 +70,12 @@
boolean isExist = daqTemplateService.dapHasExist(daqTemplate.getCode(), daqTemplate.getDeviceType());
if (isExist) {
return AjaxResult.error("鐩稿悓璁惧绫诲瀷涓嬬殑鍙傛暟缂栫爜涓嶈兘閲嶅锛�");
- } else {
- return toAjax(daqTemplateService.insertDaqTemplate(daqTemplate));
}
+ boolean isCodeExist = daqTemplateService.dapCodeHasExist(daqTemplate.getGatewayKey(), daqTemplate.getDeviceType());
+ if (isCodeExist) {
+ return AjaxResult.error("鐩稿悓璁惧绫诲瀷涓嬬殑閲囬泦鍙傛暟缂栫爜涓嶈兘閲嶅锛�");
+ }
+ return toAjax(daqTemplateService.insertDaqTemplate(daqTemplate));
}
/**
@@ -85,11 +88,13 @@
boolean isExist = daqTemplateService.dapHasExist(daqTemplate);
if (isExist) {
return AjaxResult.error("鐩稿悓璁惧绫诲瀷涓嬬殑鍙傛暟缂栫爜涓嶈兘閲嶅锛�");
- } else {
- return toAjax(daqTemplateService.updateDaqTemplate(daqTemplate));
}
+ boolean isCodeExist = daqTemplateService.dapCodeHasExist(daqTemplate);
+ if (isCodeExist) {
+ return AjaxResult.error("鐩稿悓璁惧绫诲瀷涓嬬殑閲囬泦鍙傛暟缂栫爜涓嶈兘閲嶅锛�");
+ }
+ return toAjax(daqTemplateService.updateDaqTemplate(daqTemplate));
}
-
/**
* 鍒犻櫎閲囬泦鍙傛暟妯℃澘
*/
--
Gitblit v1.9.3