diff --git a/db/upgrade20250616.sql b/db/upgrade20250616.sql new file mode 100644 index 0000000..da8301f --- /dev/null +++ b/db/upgrade20250616.sql @@ -0,0 +1,9 @@ +CREATE TABLE `iec_104_point` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `eqmid` int(11) DEFAULT NULL, + `field` varchar(45) DEFAULT NULL, + `stype` varchar(45) DEFAULT NULL COMMENT '类型 1:遥信 2:遥测', + `sadr` int(11) DEFAULT NULL COMMENT '点位', + `create_time` datetime DEFAULT NULL, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/src/main/java/com/xydl/cac/controller/Iec104PointController.java b/src/main/java/com/xydl/cac/controller/Iec104PointController.java index 1ac1395..349ad62 100644 --- a/src/main/java/com/xydl/cac/controller/Iec104PointController.java +++ b/src/main/java/com/xydl/cac/controller/Iec104PointController.java @@ -24,7 +24,7 @@ public class Iec104PointController extends BasicController { Iec104PointService iec104PointService; @GetMapping("list") - @ApiOperation("查询iec104列表") + @ApiOperation("查询104点表") public Response> list() { List result = iec104PointService.findAll(); return Response.success(result); @@ -32,24 +32,14 @@ public class Iec104PointController extends BasicController { @PostMapping("add") @ApiOperation("新增") - public Response add(@Validated @RequestBody Iec104Point iec104Point) { + public Response add(@Validated @RequestBody Iec104Point iec104Point) throws Exception { Iec104Point add = iec104PointService.add(iec104Point); return Response.success(add); } - @PostMapping("update") - @ApiOperation("更新") - public Response update(@Validated @RequestBody Iec104Point iec104Point) throws Exception { - if (iec104Point.getId() == null) { - throw new BusinessException("id不能为空!"); - } - iec104PointService.update(iec104Point); - return Response.success("OK"); - } - @PostMapping("del") @ApiOperation("删除") - public Response del(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception { + public Response del(@Validated @NotNull(message = "id不能为空!") Integer id) throws Exception { if (id == null) { throw new BusinessException("id不能为空!"); } diff --git a/src/main/java/com/xydl/cac/entity/Iec104Point.java b/src/main/java/com/xydl/cac/entity/Iec104Point.java index 28ecdd4..e6b930f 100644 --- a/src/main/java/com/xydl/cac/entity/Iec104Point.java +++ b/src/main/java/com/xydl/cac/entity/Iec104Point.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import javax.persistence.*; +import javax.validation.constraints.NotNull; import java.util.Date; @JsonInclude(JsonInclude.Include.NON_NULL) @@ -38,6 +39,7 @@ public class Iec104Point { @Column(name = "stype") private String stype; + @NotNull(message = "点位不能为空") @ApiModelProperty("点位") @Column(name = "sadr") private Integer sadr; diff --git a/src/main/java/com/xydl/cac/repository/Iec104PointRepository.java b/src/main/java/com/xydl/cac/repository/Iec104PointRepository.java index 883c55d..9b956c0 100644 --- a/src/main/java/com/xydl/cac/repository/Iec104PointRepository.java +++ b/src/main/java/com/xydl/cac/repository/Iec104PointRepository.java @@ -5,6 +5,9 @@ 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 Iec104PointRepository extends JpaRepository, JpaSpecificationExecutor { + List findBySadr(Integer sadr); } diff --git a/src/main/java/com/xydl/cac/service/Iec104PointService.java b/src/main/java/com/xydl/cac/service/Iec104PointService.java index df3faaa..10e41f2 100644 --- a/src/main/java/com/xydl/cac/service/Iec104PointService.java +++ b/src/main/java/com/xydl/cac/service/Iec104PointService.java @@ -1,6 +1,7 @@ package com.xydl.cac.service; import com.xydl.cac.entity.Iec104Point; +import com.xydl.cac.exception.BusinessException; import java.util.List; @@ -8,9 +9,7 @@ public interface Iec104PointService { List findAll(); - Iec104Point add(Iec104Point point); - - void update(Iec104Point point); + Iec104Point add(Iec104Point point) throws BusinessException; void delete(Integer id); diff --git a/src/main/java/com/xydl/cac/service/impl/Iec104PointServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/Iec104PointServiceImpl.java index 6ed78cc..2b29b12 100644 --- a/src/main/java/com/xydl/cac/service/impl/Iec104PointServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/Iec104PointServiceImpl.java @@ -1,14 +1,15 @@ package com.xydl.cac.service.impl; import com.xydl.cac.entity.Iec104Point; +import com.xydl.cac.exception.BusinessException; import com.xydl.cac.repository.Iec104PointRepository; import com.xydl.cac.service.Iec104PointService; 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.Collections; import java.util.Date; import java.util.List; @@ -26,15 +27,15 @@ public class Iec104PointServiceImpl implements Iec104PointService { } @Override - public Iec104Point add(Iec104Point point) { - point.setId(null); - point.setCreateTime(new Date()); - return iec104PointRepository.save(point); - } - - @Override - public void update(Iec104Point point) { - iec104PointRepository.save(point); + public Iec104Point add(Iec104Point point) throws BusinessException { + List list = iec104PointRepository.findBySadr(point.getSadr()); + if (CollectionUtils.isEmpty(list)) { + point.setId(null); + point.setCreateTime(new Date()); + return iec104PointRepository.save(point); + } else { + throw new BusinessException("该点位已存在"); + } } @Override