diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index e1103db6f25a1b217c65064a0e01ffbe36302978..07d322c140f8b31ff056b98257bff20caa9fd941 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -42,8 +42,12 @@ public class OcpApiTreeController { @PostMapping("/instertree") @ApiOperation("服务树分类--新增") public ResponseVO inseter(@RequestBody OcpApiGroupDtos ocpApiGroupDtos){ - service.insertTree(ocpApiGroupDtos); + boolean flag = service.insertTree(ocpApiGroupDtos); + if (flag){ return ResponseVO.ok(); + } + return ResponseVO.error("您的服务编码重复,请重新输入"); + } @PostMapping("/updatatree") @ApiOperation("服务树分类--修改") @@ -56,7 +60,7 @@ public class OcpApiTreeController { public ResponseVO deleteTree(@RequestBody OcpApiGroup ocpApiGroup){ boolean tree = service.deleteOcpTree(ocpApiGroup); if (tree){ - return ResponseVO.ok(); + return ResponseVO.ok("删除成功!"); }else { return ResponseVO.error("请先删除下级目录"); } diff --git a/src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java b/src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java index 9af0c883631a8848aa2bf59d47afdc4eb2c36612..d6b1d081ea7cff694c9f37dfa57d6fa881d40d69 100644 --- a/src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java +++ b/src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java @@ -11,7 +11,7 @@ import java.util.List; public class ApiTreeGroupDto { @ApiModelProperty("一级") - private List oneupList; + private List oneList; @ApiModelProperty("二级") @@ -21,11 +21,11 @@ public class ApiTreeGroupDto { private List ThreeList; public List getOneupList() { - return oneupList; + return oneList; } public void setOneupList(List oneupList) { - this.oneupList = oneupList; + this.oneList = oneupList; } public List getTwoList() { diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java index 297b312009a708d33ae24d6227187c0e2d7fe58d..f8707da37edbe6dbd8ce09440c154e7dedd0401e 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -17,7 +17,7 @@ public interface OcpApiTreeService extends IService { /** * 新增服务分类 */ - void insertTree(OcpApiGroupDtos ocpApiGroupDtos); + boolean insertTree(OcpApiGroupDtos ocpApiGroupDtos); /* diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index 9ddf7611e6799592b3d1d8c396f3871639327ad8..1cc2c93a39f0ce1ad3108587c3ce832993bb9b1c 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -50,8 +50,6 @@ public class OcpApiTreeServiceImpl extends ServiceImpl oneTreeUpLists = new ArrayList<>(); - - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { //判断数据状态 if (!(ocpApiGroup.getIsDelete() == 0)) { @@ -95,12 +93,6 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); + for (OcpApiGroup ocpApiGroup : ocpApiGroups) { + if (ocpApiGroup.getApiGroupCode().equals(ocpApiGroupDtos.getApiGroupCode())){ + flag = false; + break; + } + } + if (flag == true) { + OcpApiBase ocpApiBase = new OcpApiBase(); + ocpApiBase.setApiCode(ocpApiGroupDtos.getApiGroupCode()); + BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiBase); + ocpApiBase.setApiName("新增服务分类"); + Timestamp timestamp = new Timestamp(System.currentTimeMillis()); + ocpApiBase.setApiMtime(timestamp); + ocpApiBase.setApiCtime(ocpApiGroupDtos.getApiGroupCtime()); + ocpApiBase.setApiUserId(ocpApiGroupDtos.getApiGroupUserId()); + ocpApiBase.setObjId(""); + + OcpApiGroup ocpApiGroup1 = new OcpApiGroup(); + ocpApiGroup1.setObjId(""); + BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1); + ocpApiBaseMapper.insert(ocpApiBase); + mapper.insert(ocpApiGroup1); + + } + return flag; }