diff --git a/src/main/java/com/xydl/cac/entity/Bdz.java b/src/main/java/com/xydl/cac/entity/Bdz.java index e891928..707a776 100644 --- a/src/main/java/com/xydl/cac/entity/Bdz.java +++ b/src/main/java/com/xydl/cac/entity/Bdz.java @@ -1,6 +1,7 @@ package com.xydl.cac.entity; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -25,6 +26,7 @@ public class Bdz { private Integer id; @NotEmpty(message = "名称不能为空") + @ApiModelProperty("名称") @Column(name = "mc") private String mc; @@ -58,15 +60,19 @@ public class Bdz { @Column(name = "hascac") private Boolean hascac; + @ApiModelProperty("坐标") @Column(name = "coordinate") private String coordinate; + @ApiModelProperty("电压等级,单位kV") @Column(name = "voltagegrade") private Integer voltagegrade; + @ApiModelProperty("规模,单位MW") @Column(name = "scale") private Float scale; + @ApiModelProperty("说明") @Column(name = "note") private String note; diff --git a/src/main/java/com/xydl/cac/entity/Jg.java b/src/main/java/com/xydl/cac/entity/Jg.java index 1d14736..7e807f9 100644 --- a/src/main/java/com/xydl/cac/entity/Jg.java +++ b/src/main/java/com/xydl/cac/entity/Jg.java @@ -1,6 +1,7 @@ package com.xydl.cac.entity; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,10 +27,12 @@ public class Jg { private Integer id; @NotEmpty(message = "名称不能为空") + @ApiModelProperty("名称") @Column(name = "mc") private String mc; @NotNull(message = "变电站id不能为空") + @ApiModelProperty("变电站id") @Column(name = "bdzid") private Integer bdzid; diff --git a/src/main/java/com/xydl/cac/entity/Lx.java b/src/main/java/com/xydl/cac/entity/Lx.java index 52e1e50..32ab6e4 100644 --- a/src/main/java/com/xydl/cac/entity/Lx.java +++ b/src/main/java/com/xydl/cac/entity/Lx.java @@ -1,6 +1,7 @@ package com.xydl.cac.entity; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -25,6 +26,7 @@ public class Lx { private Integer id; @NotEmpty(message = "名称不能为空") + @ApiModelProperty("名称") @Column(name = "mc") private String mc; diff --git a/src/main/java/com/xydl/cac/entity/Zsb.java b/src/main/java/com/xydl/cac/entity/Zsb.java index 501e0c7..a45feeb 100644 --- a/src/main/java/com/xydl/cac/entity/Zsb.java +++ b/src/main/java/com/xydl/cac/entity/Zsb.java @@ -1,6 +1,7 @@ package com.xydl.cac.entity; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -26,14 +27,17 @@ public class Zsb { private Integer id; @NotEmpty(message = "名称不能为空") + @ApiModelProperty("名称") @Column(name = "mc") private String mc; @NotNull(message = "区域id不能为空") + @ApiModelProperty("区域id") @Column(name = "jgid") private Integer jgid; @NotNull(message = "类型id不能为空") + @ApiModelProperty("类型id") @Column(name = "lxid") private Integer lxid; @@ -49,6 +53,7 @@ public class Zsb { @Column(name = "devicepasswd") private String devicepasswd; + @ApiModelProperty("变电站id") @Column(name = "bdzid") private Integer bdzid; 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 ea5f020..6026a07 100644 --- a/src/main/java/com/xydl/cac/service/impl/ZsbServiceImpl.java +++ b/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.Lx; import com.xydl.cac.entity.Zsb; +import com.xydl.cac.repository.LxRepository; import com.xydl.cac.repository.ZsbRepository; import com.xydl.cac.service.JgService; import com.xydl.cac.service.ZsbService; @@ -11,6 +13,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.Optional; @Service @Slf4j @@ -21,6 +24,8 @@ public class ZsbServiceImpl implements ZsbService { ZsbRepository repository; @Resource JgService jgService; + @Resource + LxRepository lxRepository; @Override public List listAll(Integer jgid) { @@ -36,6 +41,10 @@ public class ZsbServiceImpl implements ZsbService { item.setId(null); Jg jg = jgService.detail(item.getJgid()); item.setBdzid(jg.getBdzid()); + Optional optional = lxRepository.findById(item.getLxid()); + if (!optional.isPresent()) { + throw new Exception("未找到该设备类型"); + } return repository.save(item); } @@ -43,6 +52,10 @@ public class ZsbServiceImpl implements ZsbService { public void update(Zsb item) throws Exception { Jg jg = jgService.detail(item.getJgid()); item.setBdzid(jg.getBdzid()); + Optional optional = lxRepository.findById(item.getLxid()); + if (!optional.isPresent()) { + throw new Exception("未找到该设备类型"); + } repository.save(item); }