diff --git a/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java b/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java index abc0d206703be8851a81fc004820ca3db59547dd..a4fdfb9538b423af877795909fd3535fd090fc4b 100644 --- a/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java @@ -9,6 +9,7 @@ import com.pms.ocp.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -38,6 +39,9 @@ public class PmsApiDetailsController { @Autowired private PmsApiManagementService pmsApiManagementService; + @Autowired + private OcpApiTreeService service; + @ApiOperation("服务订阅记录-查询") @PostMapping("/getocpapisublist") @@ -102,8 +106,13 @@ public class PmsApiDetailsController { @ApiOperation("服务分类——添加服务") @PostMapping("/add") - public ResponseResult add(@RequestBody PmsApiMangageApi pmsApiMangageApi) { - return pmsApiManagementService.add(pmsApiMangageApi); + public ResponseVO add(@RequestBody PmsApiMangageApi pmsApiMangageApi) { + PmsApiMangageApi pmsApiMangageApi1 = pmsApiManagementService.add(pmsApiMangageApi); + if (StringUtils.isBlank(pmsApiMangageApi1.getObjId())){ + return ResponseVO.error("id已存在"); + }else { + return ResponseVO.ok(pmsApiMangageApi1); + } } diff --git a/src/main/java/com/pms/ocp/model/CommonCode.java b/src/main/java/com/pms/ocp/model/CommonCode.java index 2ec9da77c97a1d5bcf0c8ddc486f6750e83aa506..64931c02f3b44116fcfb3aebd14f16313dc080e1 100644 --- a/src/main/java/com/pms/ocp/model/CommonCode.java +++ b/src/main/java/com/pms/ocp/model/CommonCode.java @@ -6,6 +6,7 @@ import lombok.ToString; public enum CommonCode implements ResultCode { SUCCESS(true,0,"操作成功!"), + NOSUCCESS(true,999,"操作失败!"), UNAUTHENTICATED(false,10001,"此操作需要登陆系统!"), UNAUTHORISE(false,10002,"权限不足,无权操作!"), INVALID_PARAM(false,10003,"非法参数!"), diff --git a/src/main/java/com/pms/ocp/model/vo/ResponseVO.java b/src/main/java/com/pms/ocp/model/vo/ResponseVO.java index ac92f9968600588a9c69a06a802e11041ab602e1..facf277e3a4ffff2888e0171aa88609386e28164 100644 --- a/src/main/java/com/pms/ocp/model/vo/ResponseVO.java +++ b/src/main/java/com/pms/ocp/model/vo/ResponseVO.java @@ -58,4 +58,8 @@ public class ResponseVO extends BaseResponse { return tResponseVO; } + public static ResponseVO errorr(CodeEnum codeEnum) { + return new ResponseVO(codeEnum); + } + } \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/service/PmsApiManagementService.java b/src/main/java/com/pms/ocp/service/PmsApiManagementService.java index 63827c68e0bf2fda6149de3ae38d56c8b341bf5c..0595f74a5668f7bde543b9212fe7e49efddbd180 100644 --- a/src/main/java/com/pms/ocp/service/PmsApiManagementService.java +++ b/src/main/java/com/pms/ocp/service/PmsApiManagementService.java @@ -4,8 +4,6 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; import com.github.pagehelper.PageInfo; import com.pms.ocp.model.ResponseResult; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.entity.OcpApiGroup; import com.pms.ocp.model.entity.PmsApiManagement; import com.pms.ocp.model.entity.PmsApiMangageApi; import com.pms.ocp.model.vo.ResponseVO; @@ -23,7 +21,7 @@ public interface PmsApiManagementService extends IService { - ResponseResult add(PmsApiMangageApi pmsApiMangageApi); + PmsApiMangageApi add(PmsApiMangageApi pmsApiMangageApi); ResponseResult deleteApi(PmsApiMangageApi pmsApiMangageApi); diff --git a/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java index 02c5289af74f2f4c6a3bdb6048af5e64f77558e2..28bd1cf5ee43329417cbe81f81b74c9bfdb0dba9 100644 --- a/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.pms.ocp.common.constants.Constant; +import com.pms.ocp.common.utils.GUIDGenerator; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiGroupMapper; import com.pms.ocp.mapper.PmsApiManagementMapper; @@ -57,11 +59,12 @@ public class PmsApiManagementServiceImpl extends ServiceImpl - - AND api_mtime >= DATE_FORMAT(#{apiMtime},'%Y-%m-%d ') - + + + + + + + + + + AND api_mtime <= DATE_FORMAT(#{apiMtime},'%Y-%m-%d ') @@ -184,7 +191,6 @@ api_group_name = #{apiGroupName}, - where 1 = 1