diff --git a/src/main/java/com/pms/ocp/common/constants/Code.java b/src/main/java/com/pms/ocp/common/constants/Code.java new file mode 100644 index 0000000000000000000000000000000000000000..31ebd51ed1b5eb29dc67c279682615f4ffe92e13 --- /dev/null +++ b/src/main/java/com/pms/ocp/common/constants/Code.java @@ -0,0 +1,14 @@ +package com.pms.ocp.common.constants; + +public interface Code { + + //操作是否成功,true为成功，false操作失败 + boolean success(); + + //操作代码 + int code(); + + //提示信息 + String message(); + +} \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/common/constants/CommonCode.java b/src/main/java/com/pms/ocp/common/constants/CommonCode.java new file mode 100644 index 0000000000000000000000000000000000000000..602803b418b9795cf530aadc32c2077ab2e77422 --- /dev/null +++ b/src/main/java/com/pms/ocp/common/constants/CommonCode.java @@ -0,0 +1,49 @@ +package com.pms.ocp.common.constants; + +import lombok.ToString; + +@ToString +public enum CommonCode implements Code { + + SUCCESS(true,0,"操作成功!"), + UNAUTHENTICATED(false,10001,"此操作需要登陆系统!"), + UNAUTHORISE(false,10002,"权限不足，无权操作!"), + INVALID_PARAM(false,10003,"非法参数!"), + PAGE_PARAMS_MISS(false,10004, "分页参数缺失!"), + RECORD_IS_NULL(false,10005, "数据不存在!"), + FAIL(false,11111,"操作失败!"), + CHECK_SUCCESS(true,10006,"校验成功!"), + SERVER_ERROR(false,99999,"抱歉，系统繁忙，请稍后重试!"); + // private static ImmutableMap codes; + + //操作是否成功 + boolean success; + + //操作代码 + int code; + + //提示信息 + String message; + + CommonCode(boolean success, int code, String message){ + this.success = success; + this.code = code; + this.message = message; + } + + @Override + public boolean success() { + return success; + } + + @Override + public int code() { + return code; + } + + @Override + public String message() { + return message; + } + +} diff --git a/src/main/java/com/pms/ocp/common/constants/Constant.java b/src/main/java/com/pms/ocp/common/constants/Constant.java index bb7e04629bede871d1d8b321ff6c01818750f737..cb9931191d62aba848eef9eac5b438f1a42e5f86 100644 --- a/src/main/java/com/pms/ocp/common/constants/Constant.java +++ b/src/main/java/com/pms/ocp/common/constants/Constant.java @@ -2,6 +2,11 @@ package com.pms.ocp.common.constants; import java.math.BigDecimal; +/** + * 常量接口类 + * + * @author luoY + */ public interface Constant { /** @@ -725,6 +730,4 @@ public interface Constant { */ String SENDEMAIL = "qkjfdzyxt@isc.com"; } - - } diff --git a/src/main/java/com/pms/ocp/common/constants/Response.java b/src/main/java/com/pms/ocp/common/constants/Response.java new file mode 100644 index 0000000000000000000000000000000000000000..5342c1d5a071d05a8c1a9238ea14a7630b493dc1 --- /dev/null +++ b/src/main/java/com/pms/ocp/common/constants/Response.java @@ -0,0 +1,8 @@ +package com.pms.ocp.common.constants; + +public interface Response { + + public static final boolean SUCCESS = true; + public static final int SUCCESS_CODE = 0; + +} diff --git a/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java b/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java index 4a594ee0ac702f03d5eb191854d2a00be45c5e13..ce4ed56ad06cad6282b6692b6295add3704759eb 100644 --- a/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java @@ -2,6 +2,7 @@ package com.pms.ocp.controller; import com.github.pagehelper.PageInfo; +import com.pms.ocp.model.ResponseResult; import com.pms.ocp.model.entity.*; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.*; @@ -100,4 +101,12 @@ public class PmsApiDetailsController { + + @ApiOperation("服务分类——编辑服务") + @PostMapping("/updatePammByCode") + public ResponseResult UpdatePammByCode(@RequestBody OcpApiBase ocpApiBase) { + return pmsApiManagementService.UpdatePammByCode(ocpApiBase); + } + + } diff --git a/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java b/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java index 42512f9d645e671c7fcedb794d253fdc77f456d2..9c603e48e99d2712c83f703221d489825746651c 100644 --- a/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java +++ b/src/main/java/com/pms/ocp/mapper/PmsApiManagementMapper.java @@ -2,6 +2,7 @@ package com.pms.ocp.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pms.ocp.model.entity.PmsApiManagement; +import com.pms.ocp.model.entity.PmsApiMangageApi; import java.util.List; @@ -9,5 +10,12 @@ public interface PmsApiManagementMapper extends BaseMapper { List getPammList(PmsApiManagement pmsApiManagement); + List getPammByCode(PmsApiManagement pmsApiManagement); + + + + + + } diff --git a/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java b/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java new file mode 100644 index 0000000000000000000000000000000000000000..c4ddd6b04000182311164b05cb864377b4c4828d --- /dev/null +++ b/src/main/java/com/pms/ocp/model/entity/PmsApiMangageApi.java @@ -0,0 +1,192 @@ +package com.pms.ocp.model.entity; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; + +import java.sql.Timestamp; + +public class PmsApiMangageApi { + + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty("主键ID") + private String objId; + + @ApiModelProperty("服务代码") + private String apiCode; + + @ApiModelProperty("服务接口中文名称") + private String apiName; + + @ApiModelProperty("服务分类代码") + private String apiGroupCode; + + @ApiModelProperty("推广类型0:统建；1:自建") + private long apiPromotion; + + @ApiModelProperty("服务请求体") + private String apiReq; + + @ApiModelProperty("服务返回体") + private String apiResp; + + @ApiModelProperty("服务地址") + private String apiUrl; + + @ApiModelProperty("服务创建时间") + private Timestamp apiCtime; + + @ApiModelProperty("服务修改时间") + private Timestamp apiMtime; + + @ApiModelProperty("创建者用户ID") + private String apiUserId; + + @ApiModelProperty("建设单位") + private String apiUnit; + + @ApiModelProperty("服务所属公司") + private String ownerCompanyCode; + + @ApiModelProperty("是否删除0-否1-是") + private long isDelete; + + @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") + private long apiZone; + + @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") + private long apiLayer; + + @ApiModelProperty("服务版本（最新版本）") + private String apiVersion; + + @ApiModelProperty("服务所属中心编码所属中心") + private String apiCenterCode; + + @ApiModelProperty("服务简述") + private String apiDescription; + + @ApiModelProperty("创建者姓名") + private String apiUserName; + + // + + @ApiModelProperty("分类名称") + private String apiGroupName; + + @ApiModelProperty("推广类型0统推，1自建") + private long apiGroupPromotionType; + + @ApiModelProperty("分类所属公司") + private String apiGroupCompanyCode; + + @ApiModelProperty("分类版本") + private String apiGroupVersion; + + @ApiModelProperty("显示顺序") + private long apiGroupOrderNo; + + @ApiModelProperty("提交人id") + private String apiGroupUserId; + + @ApiModelProperty("提交人姓名") + private String apiGroupUserName; + + @ApiModelProperty("创建时间") + private Timestamp apiGroupCtime; + + @ApiModelProperty("修改时间") + private Timestamp apiGroupMtime; + + @ApiModelProperty("上级code") + private String apiGroupPcode; + + @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") + private String apiGroupLevel; + + + // + @ApiModelProperty("图标种类tenant:应用图标api:服务图标") + private String iocnType; + + @ApiModelProperty("编码值") + private String codeNo; + + @ApiModelProperty("应用调用的服务数量图标数据") + private Object iocn; + + @ApiModelProperty("所属公司可能会根据公司分区") + private String companyCode; + + + + + + @ApiModelProperty("模型编码") + private String modelCode; + + @ApiModelProperty("模型部署公司") + private String modelDepCompanyCode; + + + @ApiModelProperty("服务部署公司") + private String apiDepCompanyCode; + + @ApiModelProperty("关系添加时间") + private Timestamp relationCtime; + + + + + @ApiModelProperty("应用编码") + private String tenantCode; + + + + @ApiModelProperty("应用所属公司") + private String tenantDepCompanyCode; + + @ApiModelProperty("关系创建时间") + private Timestamp apiTenantRelCtime; + + @ApiModelProperty("关系创建时间") + private Timestamp apiTenantRelMtime; + + @ApiModelProperty("关系创建用户ID") + private String apiTenantRelUserId; + + @ApiModelProperty("关系创建用户") + private String apiTenantRelUserName; + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + public String getApiCode() { + return apiCode; + } + + public void setApiCode(String apiCode) { + this.apiCode = apiCode; + } + + public String getApiVersion() { + return apiVersion; + } + + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + public String getApiGroupName() { + return apiGroupName; + } + + public void setApiGroupName(String apiGroupName) { + this.apiGroupName = apiGroupName; + } +} diff --git a/src/main/java/com/pms/ocp/service/PmsApiManagementService.java b/src/main/java/com/pms/ocp/service/PmsApiManagementService.java index 70db8fa1c0adf8643b2aa2982e682ed831ae58b9..f65041b9442d3254a917b6862d68bb7ef90528c3 100644 --- a/src/main/java/com/pms/ocp/service/PmsApiManagementService.java +++ b/src/main/java/com/pms/ocp/service/PmsApiManagementService.java @@ -3,7 +3,10 @@ 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.PmsApiManagement; +import com.pms.ocp.model.entity.PmsApiMangageApi; import com.pms.ocp.model.vo.ResponseVO; @@ -14,4 +17,10 @@ public interface PmsApiManagementService extends IService { ResponseVO> getPammList(PmsApiManagement pmsApiManagement); ResponseVO getPammByCode(PmsApiManagement pmsApiManagement); + +// ResponseVO updatePamm(PmsApiManagement pmsApiManagement); + +// ResponseVO getDeletePammByCode(PmsApiMangageApi pmsApiMangageApi); + + ResponseResult UpdatePammByCode(OcpApiBase ocpApiBase); } 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 b165b63ccdf32bd01a4afcba8e1f3da6f3c00639..3fcd438fd5b7268cef8cdf1367115e2563164ac8 100644 --- a/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/PmsApiManagementServiceImpl.java @@ -1,13 +1,19 @@ package com.pms.ocp.service.impl; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +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.mapper.OcpApiBaseMapper; +import com.pms.ocp.mapper.OcpApiGroupMapper; import com.pms.ocp.mapper.PmsApiManagementMapper; -import com.pms.ocp.model.entity.PmsApiManagement; +import com.pms.ocp.mapper.PmsApiModelRelMapper; +import com.pms.ocp.model.CommonCode; +import com.pms.ocp.model.ResponseResult; +import com.pms.ocp.model.entity.*; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.PmsApiManagementService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,6 +26,15 @@ public class PmsApiManagementServiceImpl extends ServiceImpl pammByCode = pmsApiManagementMapper.getPammByCode(pmsApiManagement); return ResponseVO.ok(pammByCode); } + + + @Override + public ResponseResult UpdatePammByCode(OcpApiBase ocpApiBase) { + if(ocpApiBase == null){ + ocpApiBase = new OcpApiBase(); + } + QueryWrapper oab = getCondition(ocpApiBase.getApiCode()); + OcpApiBase one = ocpApiBaseMapper.selectOne(oab); + if(one != null) { + ocpApiBase.setObjId(null); + int update = ocpApiBaseMapper.update(ocpApiBase, oab); + if (update < 0) { + return new ResponseResult(CommonCode.FAIL); + } + return new ResponseResult(CommonCode.SUCCESS); + } + return new ResponseResult(CommonCode.FAIL); + } + private QueryWrapper getCondition(String apiCode){ + QueryWrapper qw = new QueryWrapper<>(); + + if(StringUtils.isNotBlank(apiCode)){ + qw.eq("api_code",apiCode); + } + return qw; + } + } diff --git a/src/main/resources/mapper/PmsApiManagementMapper.xml b/src/main/resources/mapper/PmsApiManagementMapper.xml index ea8d39e5cb7da09f8f5d7e940eccd4ffc0d54397..14b81083c0a432c4030938432d76276873387619 100644 --- a/src/main/resources/mapper/PmsApiManagementMapper.xml +++ b/src/main/resources/mapper/PmsApiManagementMapper.xml @@ -13,7 +13,7 @@ oab.api_resp, oab.api_url, oab.api_ctime, - DATE_FORMAT( api_mtime, '%Y','%m','%d') api_mtime_string, + api_mtime, oab.api_user_id, oab.api_unit, oab.owner_company_code, @@ -52,6 +52,10 @@ AND api_mtime <= DATE_FORMAT(#{apiMtime},'%Y-%m-%d ') + + + and oab.is_delete = #{isDelete} + + + + \ No newline at end of file