From 9ece1854986cccb844b8ad308339b0e59823b48d Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 8 Jan 2024 09:18:46 +0800
Subject: [PATCH] =?UTF-8?q?pert:=20=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=9F=9F?=
 =?UTF-8?q?=E5=92=8C=E4=B8=BB=E8=AE=BE=E5=A4=87=E5=90=8D=E7=A7=B0=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/repository/JgRepository.java   | 5 +++++
 src/main/java/com/xydl/cac/repository/ZsbRepository.java  | 5 +++++
 .../java/com/xydl/cac/service/impl/JgServiceImpl.java     | 8 ++++++++
 .../java/com/xydl/cac/service/impl/ZsbServiceImpl.java    | 8 ++++++++
 4 files changed, 26 insertions(+)

diff --git a/src/main/java/com/xydl/cac/repository/JgRepository.java b/src/main/java/com/xydl/cac/repository/JgRepository.java
index 4416fc9..583228b 100644
--- a/src/main/java/com/xydl/cac/repository/JgRepository.java
+++ b/src/main/java/com/xydl/cac/repository/JgRepository.java
@@ -10,5 +10,10 @@ import java.util.List;
 
 @Repository
 public interface JgRepository extends JpaRepository<Jg, Integer>, JpaSpecificationExecutor<Jg> {
+
     List<Jg> findByBdzid(Integer bdzId);
+
+    List<Jg> findByBdzidAndMc(Integer bdzId, String mc);
+
+    List<Jg> findByBdzidAndMcAndIdIsNot(Integer bdzId, String mc, Integer id);
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/repository/ZsbRepository.java b/src/main/java/com/xydl/cac/repository/ZsbRepository.java
index 76229ee..3c4ce6f 100644
--- a/src/main/java/com/xydl/cac/repository/ZsbRepository.java
+++ b/src/main/java/com/xydl/cac/repository/ZsbRepository.java
@@ -10,5 +10,10 @@ import java.util.List;
 
 @Repository
 public interface ZsbRepository extends JpaRepository<Zsb, Integer>, JpaSpecificationExecutor<Zsb> {
+
     List<Zsb> findByJgid(Integer jgid);
+
+    List<Zsb> findByJgidAndMc(Integer jgid, String mc);
+
+    List<Zsb> findByJgidAndMcAndIdIsNot(Integer jgid, String mc, Integer id);
 }
\ No newline at end of file
diff --git a/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java
index 67bc593..23e9272 100644
--- a/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/JgServiceImpl.java
@@ -67,6 +67,10 @@ public class JgServiceImpl implements JgService {
         if (!optionalBdz.isPresent()) {
             throw new Exception("未找到该变电站");
         }
+        List<Jg> list = repository.findByBdzidAndMc(item.getBdzid(), item.getMc());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new Exception("该名称已被使用");
+        }
         return repository.save(item);
     }
 
@@ -76,6 +80,10 @@ public class JgServiceImpl implements JgService {
         if (!optionalBdz.isPresent()) {
             throw new Exception("未找到该变电站");
         }
+        List<Jg> list = repository.findByBdzidAndMcAndIdIsNot(item.getBdzid(), item.getMc(), item.getId());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new Exception("该名称已被使用");
+        }
         repository.save(item);
     }
 
diff --git a/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java
index 496c170..58bd4d8 100644
--- a/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java
@@ -87,6 +87,10 @@ public class ZsbServiceImpl implements ZsbService {
         if (!optionalLx.isPresent()) {
             throw new Exception("未找到该设备类型");
         }
+        List<Zsb> list = repository.findByJgidAndMc(item.getJgid(), item.getMc());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new Exception("该名称已被使用");
+        }
         return repository.save(item);
     }
 
@@ -98,6 +102,10 @@ public class ZsbServiceImpl implements ZsbService {
         if (!optionalLx.isPresent()) {
             throw new Exception("未找到该设备类型");
         }
+        List<Zsb> list = repository.findByJgidAndMcAndIdIsNot(item.getJgid(), item.getMc(), item.getId());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new Exception("该名称已被使用");
+        }
         repository.save(item);
     }