fix: 增加校验

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

@@ -35,7 +35,7 @@ public class BdzController extends BasicController {
 
     @PostMapping("add")
     @ApiOperation("新增")
-    public Response<Bdz> add(@RequestBody Bdz item) {
+    public Response<Bdz> add(@Validated @RequestBody Bdz item) {
         try {
             Bdz result = service.add(item);
             return Response.success(result);
@@ -46,7 +46,7 @@ public class BdzController extends BasicController {
 
     @PostMapping("update")
     @ApiOperation("更新")
-    public Response<String> update(@RequestBody Bdz item) {
+    public Response<String> update(@Validated @RequestBody Bdz item) {
         try {
             if (item.getId() == null) {
                 throw new Exception("ID不能为空!");

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

@@ -35,7 +35,7 @@ public class LxController extends BasicController {
 
     @PostMapping("add")
     @ApiOperation("新增")
-    public Response<Lx> add(@RequestBody Lx item) {
+    public Response<Lx> add(@Validated @RequestBody Lx item) {
         try {
             Lx result = service.add(item);
             return Response.success(result);
@@ -46,7 +46,7 @@ public class LxController extends BasicController {
 
     @PostMapping("update")
     @ApiOperation("更新")
-    public Response<String> update(@RequestBody Lx item) {
+    public Response<String> update(@Validated @RequestBody Lx item) {
         try {
             if (item.getId() == null) {
                 throw new Exception("ID不能为空!");

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotEmpty;
 import java.math.BigDecimal;
 
 @Data
@@ -23,6 +24,7 @@ public class Bdz {
     @Column(name = "id")
     private Integer id;
 
+    @NotEmpty(message = "名称不能为空")
     @Column(name = "mc")
     private String mc;
 

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

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotEmpty;
 import java.math.BigDecimal;
 
 @Data
@@ -23,6 +24,7 @@ public class Lx {
     @Column(name = "id")
     private Integer id;
 
+    @NotEmpty(message = "名称不能为空")
     @Column(name = "mc")
     private String mc;
 

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

@@ -33,6 +33,7 @@ public class Zsb {
     @Column(name = "jgid")
     private Integer jgid;
 
+    @NotNull(message = "类型id不能为空")
     @Column(name = "lxid")
     private Integer lxid;
 

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

@@ -8,9 +8,11 @@ public interface JgService {
 
     List<Jg> listAll(Integer bdzid);
 
-    Jg add(Jg item);
+    Jg add(Jg item) throws Exception;
 
     void update(Jg item);
 
     void delete(Integer id);
+
+    Jg detail(Integer id) throws Exception;
 }

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

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

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

@@ -1,6 +1,8 @@
 package com.xydl.cac.service.impl;
 
+import com.xydl.cac.entity.Bdz;
 import com.xydl.cac.entity.Jg;
+import com.xydl.cac.repository.BdzRepository;
 import com.xydl.cac.repository.JgRepository;
 import com.xydl.cac.service.JgService;
 import lombok.extern.slf4j.Slf4j;
@@ -9,6 +11,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Optional;
 
 @Service
 @Slf4j
@@ -17,6 +20,8 @@ public class JgServiceImpl implements JgService {
 
     @Resource
     JgRepository repository;
+    @Resource
+    BdzRepository bdzRepository;
 
     @Override
     public List<Jg> listAll(Integer bdzid) {
@@ -28,8 +33,12 @@ public class JgServiceImpl implements JgService {
     }
 
     @Override
-    public Jg add(Jg item) {
+    public Jg add(Jg item) throws Exception {
         item.setId(null);
+        Optional<Bdz> optional = bdzRepository.findById(item.getBdzid());
+        if (!optional.isPresent()) {
+            throw new Exception("未找到该变电站");
+        }
         return repository.save(item);
     }
 
@@ -42,4 +51,13 @@ public class JgServiceImpl implements JgService {
     public void delete(Integer id) {
         repository.deleteById(id);
     }
+
+    @Override
+    public Jg detail(Integer id) throws Exception {
+        Optional<Jg> optional = repository.findById(id);
+        if (!optional.isPresent()) {
+            throw new Exception("未找到该区域");
+        }
+        return null;
+    }
 }

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

@@ -1,7 +1,9 @@
 package com.xydl.cac.service.impl;
 
+import com.xydl.cac.entity.Jg;
 import com.xydl.cac.entity.Zsb;
 import com.xydl.cac.repository.ZsbRepository;
+import com.xydl.cac.service.JgService;
 import com.xydl.cac.service.ZsbService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -17,6 +19,8 @@ public class ZsbServiceImpl implements ZsbService {
 
     @Resource
     ZsbRepository repository;
+    @Resource
+    JgService jgService;
 
     @Override
     public List<Zsb> listAll(Integer jgid) {
@@ -28,13 +32,17 @@ public class ZsbServiceImpl implements ZsbService {
     }
 
     @Override
-    public Zsb add(Zsb item) {
+    public Zsb add(Zsb item) throws Exception {
         item.setId(null);
+        Jg jg = jgService.detail(item.getJgid());
+        item.setBdzid(jg.getBdzid());
         return repository.save(item);
     }
 
     @Override
-    public void update(Zsb item) {
+    public void update(Zsb item) throws Exception {
+        Jg jg = jgService.detail(item.getJgid());
+        item.setBdzid(jg.getBdzid());
         repository.save(item);
     }