diff --git a/src/main/java/com/xydl/cac/controller/IecServerController.java b/src/main/java/com/xydl/cac/controller/IecServerController.java index ccac68e..7997a2a 100644 --- a/src/main/java/com/xydl/cac/controller/IecServerController.java +++ b/src/main/java/com/xydl/cac/controller/IecServerController.java @@ -49,6 +49,16 @@ public class IecServerController extends BasicController { } } + @PostMapping("delete") + @ApiOperation("删除") + public Response delete(Integer fileId) throws Exception { + if (fileId == null) { + throw new BusinessException("fileId不能为空!"); + } + configService.deleteSrv(fileId); + return Response.success("OK"); + } + @GetMapping("listFile") @ApiOperation("查询服务端icd文件列表") public Response> listFile() throws Exception { diff --git a/src/main/java/com/xydl/cac/entity/IcdFile.java b/src/main/java/com/xydl/cac/entity/IcdFile.java index 7e7d004..606138a 100644 --- a/src/main/java/com/xydl/cac/entity/IcdFile.java +++ b/src/main/java/com/xydl/cac/entity/IcdFile.java @@ -1,6 +1,5 @@ package com.xydl.cac.entity; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -11,7 +10,6 @@ import lombok.NoArgsConstructor; import javax.persistence.*; import java.util.List; -@JsonInclude(JsonInclude.Include.NON_NULL) @Data @Builder @AllArgsConstructor diff --git a/src/main/java/com/xydl/cac/entity/IcdIed.java b/src/main/java/com/xydl/cac/entity/IcdIed.java index 9afdd78..818be12 100644 --- a/src/main/java/com/xydl/cac/entity/IcdIed.java +++ b/src/main/java/com/xydl/cac/entity/IcdIed.java @@ -1,6 +1,5 @@ package com.xydl.cac.entity; -import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -10,7 +9,6 @@ import lombok.NoArgsConstructor; import javax.persistence.*; -@JsonInclude(JsonInclude.Include.NON_NULL) @Data @Builder @AllArgsConstructor diff --git a/src/main/java/com/xydl/cac/service/IcdFileConfigService.java b/src/main/java/com/xydl/cac/service/IcdFileConfigService.java index a384b2e..80a0d55 100644 --- a/src/main/java/com/xydl/cac/service/IcdFileConfigService.java +++ b/src/main/java/com/xydl/cac/service/IcdFileConfigService.java @@ -4,6 +4,7 @@ import com.xydl.cac.entity.IcdConfigType; import com.xydl.cac.entity.IcdConfigTypeInst; import com.xydl.cac.entity.IcdFile; import com.xydl.cac.entity.IcdIed; +import com.xydl.cac.exception.BusinessException; import com.xydl.cac.model.IcdAttUpdateModel; import java.util.List; @@ -26,6 +27,8 @@ public interface IcdFileConfigService { void delete(Integer id); + void deleteSrv(Integer fileId) throws BusinessException; + void deleteAtt(Integer attid); void clearAll(); diff --git a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java index 004d22e..1a02435 100644 --- a/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/IcdFileConfigServiceImpl.java @@ -194,6 +194,19 @@ public class IcdFileConfigServiceImpl implements IcdFileConfigService { configRepository.deleteById(id); } + @Override + public void deleteSrv(Integer fileId) throws BusinessException { + Optional optional = fileRepository.findById(fileId); + if (!optional.isPresent()) { + throw new BusinessException("未找到该文件"); + } + IcdFile icdFile = optional.get(); + if (icdFile.getStart().intValue() == Constants.TRUE) { + throw new BusinessException("请先去控制台停止该服务端"); + } + fileRepository.deleteById(fileId); + } + @Override public void deleteAtt(Integer attid) { attRepository.deleteById(attid);