From bdd17d063b3dbd588d033e5ac213b1afd82d62cb Mon Sep 17 00:00:00 2001 From: liuguijing <123456> Date: Fri, 5 Jan 2024 15:33:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=91=E6=B5=8B=E8=A3=85?= =?UTF-8?q?=E7=BD=AE=E8=A1=A8=20=20=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xydl/cac/controller/ModevController.java | 86 ++++++++++++++ .../cac/controller/ModevTypeController.java | 15 ++- src/main/java/com/xydl/cac/entity/Modev.java | 112 ++++++++++++++++++ .../xydl/cac/repository/ModevRepository.java | 15 +++ .../com/xydl/cac/service/ModevService.java | 18 +++ .../xydl/cac/service/ModevTypeService.java | 2 +- .../cac/service/impl/ModevServiceImpl.java | 65 ++++++++++ .../service/impl/ModevTypeServiceImpl.java | 4 +- 8 files changed, 312 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/xydl/cac/controller/ModevController.java create mode 100644 src/main/java/com/xydl/cac/entity/Modev.java create mode 100644 src/main/java/com/xydl/cac/repository/ModevRepository.java create mode 100644 src/main/java/com/xydl/cac/service/ModevService.java create mode 100644 src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java diff --git a/src/main/java/com/xydl/cac/controller/ModevController.java b/src/main/java/com/xydl/cac/controller/ModevController.java new file mode 100644 index 0000000..d5eb737 --- /dev/null +++ b/src/main/java/com/xydl/cac/controller/ModevController.java @@ -0,0 +1,86 @@ +package com.xydl.cac.controller; + +import com.xydl.cac.entity.Modev; +import com.xydl.cac.entity.ModevType; +import com.xydl.cac.model.Response; +import com.xydl.cac.service.ModevService; +import com.xydl.cac.service.ModevTypeService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.repository.query.Param; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import javax.validation.constraints.NotNull; +import java.util.List; + +@RestController +@Api(tags = {"监测设备相关接口"}) +@RequestMapping("modev") +@Slf4j +public class ModevController extends BasicController { + + @Resource + ModevService service; + + @GetMapping("listAll") + @ApiOperation("查询列表") + public Response> listAll(@NotNull(message = "主设备编号不能缺少") @Param("bdzid") Integer bdzid) { + try { + List result = service.listAll(bdzid); + return Response.success(result); + } catch (Exception ex) { + return Response.fail(ex.getMessage()); + } + } + + @PostMapping("add") + @ApiOperation("新增") + public Response add(@Validated @RequestBody Modev item) { + try { + Modev result = service.add(item); + return Response.success(result); + } catch (Exception ex) { + return Response.fail(ex.getMessage()); + } + } + + @PostMapping("update") + @ApiOperation("更新") + public Response update(@Validated @RequestBody Modev item) { + try { + if (item.getId() == null) { + throw new Exception("ID不能为空!"); + } + service.update(item); + return Response.success("OK"); + } catch (Exception ex) { + return Response.fail(ex.getMessage()); + } + } + + @PostMapping("delete") + @ApiOperation("删除") + public Response delete(@Validated @NotNull(message = "ID不能为空!") @Param("id") Integer id) { + try { + service.delete(id); + return Response.success("OK"); + } catch (Exception ex) { + return Response.fail(ex.getMessage()); + } + } + + @PostMapping("detail") + @ApiOperation("详情") + public Response detail(@Validated @NotNull(message = "ID不能为空!") Integer id) { + try { + Modev detail = service.detail(id); + return Response.success(detail); + } catch (Exception ex) { + return Response.fail(ex.getMessage()); + } + } + +} diff --git a/src/main/java/com/xydl/cac/controller/ModevTypeController.java b/src/main/java/com/xydl/cac/controller/ModevTypeController.java index e1ad449..b475b1a 100644 --- a/src/main/java/com/xydl/cac/controller/ModevTypeController.java +++ b/src/main/java/com/xydl/cac/controller/ModevTypeController.java @@ -24,9 +24,9 @@ public class ModevTypeController extends BasicController { @GetMapping("listAll") @ApiOperation("查询列表") - public Response> listAll(Integer bdzid) { + public Response> listAll() { try { - List result = service.listAll(bdzid); + List result = service.listAll(); return Response.success(result); } catch (Exception ex) { return Response.fail(ex.getMessage()); @@ -69,4 +69,15 @@ public class ModevTypeController extends BasicController { } } + @PostMapping("detail") + @ApiOperation("详情") + public Response detail(@Validated @NotNull(message = "ID不能为空!") Integer id) { + try { + ModevType detail = service.detail(id); + return Response.success(detail); + } catch (Exception ex) { + return Response.fail(ex.getMessage()); + } + } + } diff --git a/src/main/java/com/xydl/cac/entity/Modev.java b/src/main/java/com/xydl/cac/entity/Modev.java new file mode 100644 index 0000000..0abdaf2 --- /dev/null +++ b/src/main/java/com/xydl/cac/entity/Modev.java @@ -0,0 +1,112 @@ +package com.xydl.cac.entity; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.persistence.*; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.util.Date; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Entity +@Table(name = "modev") +@ApiModel("监测装置表") +public class Modev { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer id; + + @NotEmpty(message = "名称不能为空") + @Column(name = "name") + @ApiModelProperty("监测设备名称") + private String name; + + @NotNull(message = "监测设备类型不能缺少") + @Column(name = "modevtid") + @ApiModelProperty("监测设备类型编号") + private Integer modevtid; + + @Column(name = "address") + private Integer address; + + @Column(name = "frequency") + private Integer frequency; + + @Column(name = "portname") + private String portname; + + @Column(name = "carelevel") + private Integer carelevel; + + @Column(name = "zsbid") + @NotNull(message = "名称不能为空") + @ApiModelProperty("监测设备类型编号") + private Integer zsbid; + + @Column(name = "iedid") + private Integer iedid; + + @Column(name = "equipmentmodel") + private String equipmentmodel; + + @Column(name = "manufacture") + private String manufacture; + + @Column(name = "factoryint") + private String factoryint; + + @Column(name = "manufacturedate") + private Date manufacturedate; + + @Column(name = "rundate") + private Date rundate; + + @Column(name = "location") + private String location; + + @Column(name = "note") + private String note; + + @Column(name = "znxjdevid") + private String znxjdevid; + + @Column(name = "ip") + private String ip; + + @Column(name = "username") + private String username; + + @Column(name = "pwd") + private String pwd; + + @Column(name = "port") + private String port; + + @Column(name = "npresetid") + private Integer npresetid; + + @Column(name = "nruleid") + private Integer nruleid; + + @Column(name = "nmetertype") + private Integer nmetertype; + + @Column(name = "mainEid") + private Integer mainEid; + + @Column(name = "secondEid") + private Integer secondEid; + + + +} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/repository/ModevRepository.java b/src/main/java/com/xydl/cac/repository/ModevRepository.java new file mode 100644 index 0000000..b75b912 --- /dev/null +++ b/src/main/java/com/xydl/cac/repository/ModevRepository.java @@ -0,0 +1,15 @@ +package com.xydl.cac.repository; + +import com.xydl.cac.entity.Modev; +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 ModevRepository extends JpaRepository, JpaSpecificationExecutor { + List findByZsbid(Integer zsbid); + List findByZsbidAndName(Integer zsbid,String name); +} \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/service/ModevService.java b/src/main/java/com/xydl/cac/service/ModevService.java new file mode 100644 index 0000000..55553ea --- /dev/null +++ b/src/main/java/com/xydl/cac/service/ModevService.java @@ -0,0 +1,18 @@ +package com.xydl.cac.service; + +import com.xydl.cac.entity.Modev; + +import java.util.List; + +public interface ModevService { + + List listAll(Integer modevtypeid); + + Modev add(Modev item) throws Exception; + + void update(Modev item) throws Exception; + + void delete(Integer id); + + Modev detail(Integer id) throws Exception; +} diff --git a/src/main/java/com/xydl/cac/service/ModevTypeService.java b/src/main/java/com/xydl/cac/service/ModevTypeService.java index 1cc9a4e..42a9e9d 100644 --- a/src/main/java/com/xydl/cac/service/ModevTypeService.java +++ b/src/main/java/com/xydl/cac/service/ModevTypeService.java @@ -6,7 +6,7 @@ import java.util.List; public interface ModevTypeService { - List listAll(Integer modevtypeid); + List listAll(); ModevType add(ModevType item) throws Exception; diff --git a/src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java new file mode 100644 index 0000000..da5636e --- /dev/null +++ b/src/main/java/com/xydl/cac/service/impl/ModevServiceImpl.java @@ -0,0 +1,65 @@ +package com.xydl.cac.service.impl; + +import com.xydl.cac.entity.Modev; +import com.xydl.cac.entity.ModevType; +import com.xydl.cac.repository.ModevRepository; +import com.xydl.cac.service.ModevService; +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; +import java.util.Optional; + +@Service +@Slf4j +@Transactional(rollbackFor = Exception.class) +public class ModevServiceImpl implements ModevService { + + @Resource + ModevRepository repository; + + @Override + public List listAll(Integer zsbid) { + return repository.findByZsbid(zsbid); + } + + @Override + public Modev add(Modev item) throws Exception { + item.setId(null); + List byZsbidAndName = repository.findByZsbidAndName(item.getZsbid(), item.getName()); + if (!CollectionUtils.isEmpty(byZsbidAndName)) { + throw new Exception("该监测装置已存在"); + } + return repository.save(item); + } + + @Override + public void update(Modev item) throws Exception { + List byMc = repository.findByZsbidAndName(item.getZsbid(), item.getName()); + if (!CollectionUtils.isEmpty(byMc)) { + for (Modev it : byMc) { + if (it.getId() != item.getId()) { + throw new Exception("该监测装置类型已存在"); + } + } + } + repository.save(item); + } + + @Override + public void delete(Integer id) { + repository.deleteById(id); + } + + @Override + public Modev detail(Integer id) throws Exception { + Optional optional = repository.findById(id); + if (!optional.isPresent()) { + throw new Exception("未找到该类型"); + } + return optional.get(); + } +} diff --git a/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java index 0c09538..1048404 100644 --- a/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/ModevTypeServiceImpl.java @@ -21,7 +21,7 @@ public class ModevTypeServiceImpl implements ModevTypeService { ModevTypeRepository repository; @Override - public List listAll(Integer modevtypeid) { + public List listAll() { return repository.findAll(); } @@ -59,6 +59,6 @@ public class ModevTypeServiceImpl implements ModevTypeService { if (!optional.isPresent()) { throw new Exception("未找到该类型"); } - return null; + return optional.get(); } }