Merge branch 'main' of http://dev.xinyingpower.com:8080/git/cac/backend

src/main/java/com/xydl/cac/controller/ParamBindController.java

@@ -0,0 +1,30 @@
+package com.xydl.cac.controller;
+
+import com.xydl.cac.entity.Bdz;
+import com.xydl.cac.model.Response;
+import com.xydl.cac.service.ParamBindService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@Api(tags = {"参数绑定相关接口"})
+@RequestMapping("parambind")
+@Slf4j
+public class ParamBindController extends BasicController {
+
+    @Resource
+    ParamBindService bindService;
+
+    @GetMapping("getTree")
+    @ApiOperation("查询树")
+    public Response<List<Bdz>> getTree() throws Exception {
+        List<Bdz> result = bindService.getTree();
+        return Response.success(result);
+    }
+
+}

src/main/java/com/xydl/cac/entity/Bdz.java

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 import javax.persistence.*;
 import javax.validation.constraints.NotEmpty;
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 @Builder
@@ -91,4 +92,7 @@ public class Bdz {
     @Column(name = "svgurl")
     private String svgurl;
 
+    @Transient
+    private List<Jg> children;
+
 }

src/main/java/com/xydl/cac/entity/Jg.java

@@ -11,6 +11,7 @@ import javax.persistence.*;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 @Builder
@@ -49,4 +50,6 @@ public class Jg {
     @Transient
     private String bdzName;
 
+    @Transient
+    private List<Zsb> children;
 }

src/main/java/com/xydl/cac/entity/Zsb.java

@@ -11,6 +11,7 @@ import javax.persistence.*;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
+import java.util.List;
 
 @Data
 @Builder
@@ -216,4 +217,7 @@ public class Zsb {
     @Transient
     private String lxName;
 
+    @Transient
+    private List<Modev> children;
+
 }

src/main/java/com/xydl/cac/repository/BdzRepository.java

@@ -5,8 +5,13 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 
 @Repository
 public interface BdzRepository extends JpaRepository<Bdz, Integer>, JpaSpecificationExecutor<Bdz> {
 
+    List<Bdz> findByMc(String mc);
+
+    List<Bdz> findByMcAndIdIsNot(String mc, Integer id);
 }

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);
 }

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);
 }

src/main/java/com/xydl/cac/service/BdzService.java

@@ -8,9 +8,9 @@ public interface BdzService {
 
     List<Bdz> listAll();
 
-    Bdz add(Bdz item);
+    Bdz add(Bdz item) throws Exception;
 
-    void update(Bdz item);
+    void update(Bdz item) throws Exception;
 
     void delete(Integer id) throws Exception;
 }

src/main/java/com/xydl/cac/service/ParamBindService.java

@@ -0,0 +1,10 @@
+package com.xydl.cac.service;
+
+import com.xydl.cac.entity.Bdz;
+
+import java.util.List;
+
+public interface ParamBindService {
+
+    List<Bdz> getTree() throws Exception;
+}

src/main/java/com/xydl/cac/service/impl/BdzServiceImpl.java

@@ -29,13 +29,21 @@ public class BdzServiceImpl implements BdzService {
     }
 
     @Override
-    public Bdz add(Bdz item) {
+    public Bdz add(Bdz item) throws Exception {
         item.setId(null);
+        List<Bdz> list = repository.findByMc(item.getMc());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new Exception("该名称已被使用");
+        }
         return repository.save(item);
     }
 
     @Override
-    public void update(Bdz item) {
+    public void update(Bdz item) throws Exception {
+        List<Bdz> list = repository.findByMcAndIdIsNot(item.getMc(), item.getId());
+        if (!CollectionUtils.isEmpty(list)) {
+            throw new Exception("该名称已被使用");
+        }
         repository.save(item);
     }
 

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);
     }
 

src/main/java/com/xydl/cac/service/impl/ParamBindServiceImpl.java

@@ -0,0 +1,54 @@
+package com.xydl.cac.service.impl;
+
+import com.xydl.cac.entity.Bdz;
+import com.xydl.cac.entity.Jg;
+import com.xydl.cac.entity.Modev;
+import com.xydl.cac.entity.Zsb;
+import com.xydl.cac.repository.BdzRepository;
+import com.xydl.cac.repository.JgRepository;
+import com.xydl.cac.repository.ModevRepository;
+import com.xydl.cac.repository.ZsbRepository;
+import com.xydl.cac.service.ParamBindService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@Slf4j
+@Transactional(rollbackFor = Exception.class)
+public class ParamBindServiceImpl implements ParamBindService {
+
+    @Resource
+    BdzRepository bdzRepository;
+    @Resource
+    JgRepository jgRepository;
+    @Resource
+    ZsbRepository zsbRepository;
+    @Resource
+    ModevRepository modevRepository;
+
+    @Override
+    public List<Bdz> getTree() throws Exception {
+        List<Bdz> bdzList = bdzRepository.findAll();
+        for (Bdz bdz : bdzList) {
+            List<Jg> jgList = jgRepository.findByBdzid(bdz.getId());
+            bdz.setChildren(jgList);
+            for (Jg jg : jgList) {
+                jg.setBdzName(bdz.getMc());
+                List<Zsb> zsbList = zsbRepository.findByJgid(jg.getId());
+                jg.setChildren(zsbList);
+                for (Zsb zsb : zsbList) {
+                    zsb.setBdzName(bdz.getMc());
+                    zsb.setJgName(jg.getMc());
+                    List<Modev> modevList = modevRepository.findByZsbid(zsb.getId());
+                    zsb.setChildren(modevList);
+                }
+            }
+        }
+        return bdzList;
+    }
+}

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);
     }