Merge remote-tracking branch 'origin/master'

src/main/java/com/pms/ocp/common/constants/AnalysisConstant.java

@@ -2,10 +2,13 @@ package com.pms.ocp.common.constants;
 
 public interface AnalysisConstant {
     interface exportOcpApiAuditName{
-    final String OCP_API_AUDIT= "服务大事记导出数据";
+        String OCPAPIAUDIT = "服务大事记.xls";
+        String OCPAPIAUDITNAME = "服务大事记导出数据";
+
     }
 
     interface exportOcpTenantApiName{
-        final String OCP_TENANT_API = "应用大事记导出数据";
+        String OCPTENANTAPI = "应用大事记.xls";
+        String OCPTENANTAPINAME = "应用大事记导出数据";
     }
 }

src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java → src/main/java/com/pms/ocp/controller/PmsApiDetailsController.java

@@ -19,31 +19,31 @@ import java.util.List;
 @RequestMapping("/api")
 @RestController
 @Api(tags = "服务接口")
-public class OcpApiDetailsController {
+public class PmsApiDetailsController {
 
     @Autowired
-    private OcpApiSubsService ocpApiSubsService;
+    private PmsApiSubsService pmsApiSubsService;
 
     @Autowired
-    private OcpApiAuditService ocpApiAuditService;
+    private PmsApiAuditService pmsApiAuditService;
 
     @Autowired
-    private OcpApiTenantRelService ocpApiTenantRelService;
+    private PmsApiTenantRelService pmsApiTenantRelService;
 
     @Autowired
-    private OcpApiModelRelService ocpApiModelRelService;
+    private PmsApiModelRelService pmsApiModelRelService;
 
 
     @ApiOperation("服务订阅记录-查询")
     @PostMapping("/getocpapisublist")
-    public ResponseVO<List<OcpApiSubs>> getOcpApiSubsList(OcpApiSubs ocpApiSubs) {
-        return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs);
+    public ResponseVO<List<PmsApiSubs>> getOcpApiSubsList(PmsApiSubs pmsApiSubs) {
+        return pmsApiSubsService.getPmsApiSubsList(pmsApiSubs);
     }
 
     @ApiOperation("服务大事记-查询")
     @PostMapping("/getocpapiauditlist")
-    public ResponseVO<List<OcpApiAudit>> getOcpApiAuditList(OcpApiAudit ocpApiAudit) {
-        return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit);
+    public ResponseVO<List<PmsApiAudit>> getPmsApiAuditList(PmsApiAudit pmsApiAudit) {
+        return pmsApiAuditService.getOcpApiAuditList(pmsApiAudit);
     }
 
 //    @ApiOperation("服务大事记-查询详情")
@@ -54,32 +54,32 @@ public class OcpApiDetailsController {
 
     @ApiOperation("服务大事记-查询详情-变更内容")
     @PostMapping("/getocpapi")
-    public ResponseVO<List<OcpApiAudit>> getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){
-        return ocpApiAuditService.OaaById(ocpApiAudit);
+    public ResponseVO<List<PmsApiAudit>> getOcpApi(@RequestBody PmsApiAudit pmsApiAudit){
+        return pmsApiAuditService.OaaById(pmsApiAudit);
     }
 
     @ApiOperation("服务大事记-历史版本")
     @PostMapping("/versionid")
-    public ResponseVO<List<OcpApiAudit>> versionId(@RequestBody OcpApiAudit ocpApiAudit){
-        return ocpApiAuditService.versionId(ocpApiAudit);
+    public ResponseVO<List<PmsApiAudit>> versionId(@RequestBody PmsApiAudit pmsApiAudit){
+        return pmsApiAuditService.versionId(pmsApiAudit);
     }
 
     @ApiOperation("服务与应用拓扑图-查询")
     @PostMapping("/getoatrlist")
-    public ResponseVO<List<OcpApiTenantRel>> getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) {
-        return ocpApiTenantRelService.getOatrList(ocpApiTenantRel);
+    public ResponseVO<List<PmsApiTenantRel>> getOatrList(@RequestBody PmsApiTenantRel pmsApiTenantRel) {
+        return pmsApiTenantRelService.getOatrList(pmsApiTenantRel);
     }
 
     @ApiOperation("服务与模型拓扑图-查询")
     @PostMapping("/getoamrlist")
-    public ResponseVO<List<OcpApiModelRel>> getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) {
-        return ocpApiModelRelService.getOamrList(ocpApiModelRel);
+    public ResponseVO<List<PmsApiModelRel>> getOamrList(@RequestBody PmsApiModelRel pmsApiModelRel) {
+        return pmsApiModelRelService.getOamrList(pmsApiModelRel);
     }
 
     @ApiOperation("服务大事记-导出")
-    @RequestMapping("/export")
-    public void exportExcel(@RequestBody(required = false) OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) {
-        ocpApiAuditService.exportExcel(ocpApiAudit,request,response);
+    @PostMapping("/export")
+    public void exportExcel(@RequestBody PmsApiAudit pmsApiAudit, HttpServletRequest request, HttpServletResponse response) {
+        pmsApiAuditService.exportExcel(pmsApiAudit,request,response);
     }
 
 

src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java → src/main/java/com/pms/ocp/controller/PmsTenantDetailsController.java

@@ -2,10 +2,7 @@ package com.pms.ocp.controller;
 
 import com.pms.ocp.model.entity.*;
 import com.pms.ocp.model.vo.ResponseVO;
-import com.pms.ocp.service.OcpApiTenantRelService;
-import com.pms.ocp.service.OcpTenantAuditService;
-import com.pms.ocp.service.OcpTenantBaseService;
-import com.pms.ocp.service.OcpTenantSubsService;
+import com.pms.ocp.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -22,61 +19,62 @@ import java.util.List;
 @RequestMapping("/tenant")
 @RestController
 @Api(tags = "应用接口")
-public class OcpTenantDetailsController {
+public class PmsTenantDetailsController {
 
     @Autowired
-    private OcpTenantBaseService ocpTenantBaseService;
+    private PmsTenantBaseService pmsTenantBaseService;
 
     @Autowired
-    private OcpTenantAuditService ocpTenantAuditService;
+    private PmsTenantAuditService pmsTenantAuditService;
 
     @Autowired
-    private OcpTenantSubsService ocpTenantSubsService;
+    private PmsTenantSubsService pmsTenantSubsService;
 
     @Autowired
-    private OcpApiTenantRelService ocpApiTenantRelService;
+    private PmsApiTenantRelService pmsApiTenantRelService;
 
 
     @ApiOperation("应用基础信息-查询")
     @PostMapping("/getotbList")
-    public ResponseVO<List<OcpTenantBase>> getOtbList(@RequestBody OcpTenantBase ocpTenantBase){
-        return ocpTenantBaseService.getOtbList(ocpTenantBase);
+    public ResponseVO<List<PmsTenantBase>> getOtbList(@RequestBody PmsTenantBase pmsTenantBase){
+        return pmsTenantBaseService.getOtbList(pmsTenantBase);
     }
 
     @ApiOperation("应用大事记-查询")
     @PostMapping("/getotaList")
-    public ResponseVO<List<OcpApiAudit>> getOtaList(OcpTenantAudit ocpTenantAudit) {
-        return ocpTenantAuditService.getOtaList(ocpTenantAudit);
+    public ResponseVO<List<PmsTenantAudit>> getOtaList(PmsTenantAudit pmsTenantAudit) {
+        return pmsTenantAuditService.getOtaList(pmsTenantAudit);
     }
 
 
     @ApiOperation("应用订阅记录-查询")
     @PostMapping("/getOcpTenantList")
-    public ResponseVO<List<OcpTenantSubs>> getOcpTenantList(OcpTenantSubs ocpTenantSubs) {
-        return ocpTenantSubsService.getOcpTenantList(ocpTenantSubs);
+    public ResponseVO<List<PmsTenantSubs>> getOcpTenantList(PmsTenantSubs pmsTenantSubs) {
+        return pmsTenantSubsService.getOcpTenantList(pmsTenantSubs);
     }
 
     @ApiOperation("应用与服务拓扑图-查询")
     @PostMapping("/getOcpTenantApiList")
-    public ResponseVO<List<OcpApiTenantRel>> getOcpTenantApiList(@RequestBody OcpApiTenantRel ocpApiTenantRel) {
-        return ocpApiTenantRelService.getTenantApiList(ocpApiTenantRel);
+    public ResponseVO<List<PmsApiTenantRel>> getOcpTenantApiList(@RequestBody PmsApiTenantRel pmsApiTenantRel) {
+        return pmsApiTenantRelService.getTenantApiList(pmsApiTenantRel);
     }
 
     @ApiOperation("应用大事记-导出")
-    @RequestMapping("/export")
-    public void exportExcel(@RequestBody(required = false)OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response) {
-        ocpTenantAuditService.exportExcel(ocpTenantAudit,request,response);
+    @PostMapping("/export")
+    public void exportExcel(@RequestBody PmsTenantAudit pmsTenantAudit, HttpServletRequest request, HttpServletResponse response) {
+        pmsTenantAuditService.exportExcel(pmsTenantAudit,request,response);
     }
+
     @ApiOperation("应用大事记-查询详情-变更内容")
     @PostMapping("/getocpTent")
-    public ResponseVO<List<OcpTenantAudit>> getOcpTenant(@RequestBody OcpTenantAudit ocpTenantAudit){
-        return ocpTenantAuditService.OtaById(ocpTenantAudit);
+    public ResponseVO<List<PmsTenantAudit>> getOcpTenant(@RequestBody PmsTenantAudit pmsTenantAudit){
+        return pmsTenantAuditService.OtaById(pmsTenantAudit);
     }
 
     @ApiOperation("应用大事记-查询详情-历史版本")
     @PostMapping("/versionId")
-    public ResponseVO<List<OcpTenantAudit>> versionId(@RequestBody OcpTenantAudit ocpTenantAudit){
-        return ocpTenantAuditService.versionId(ocpTenantAudit);
+    public ResponseVO<List<PmsTenantAudit>> versionId(@RequestBody PmsTenantAudit pmsTenantAudit){
+        return pmsTenantAuditService.versionId(pmsTenantAudit);
     }
 
 

src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java

@@ -6,20 +6,10 @@ import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
 
-/**
- * @Auther: liukai
- * @Date: 2022/3/7
- * @Description:服务大事记接口
- */
+
 @Mapper
 public interface OcpApiAuditMapper extends BaseMapper<OcpApiAudit> {
 
-    List<OcpApiAudit> OaaById(OcpApiAudit ocpApiAudit);
-
-    List<OcpApiAudit> getOcpApiSubsList(OcpApiAudit ocpApiAudit);
-
-    List<OcpApiAudit> sById(OcpApiAudit ocpApiAudit);
 
-    List<OcpApiAudit> versionId (OcpApiAudit ocpApiAudit);
 
 }

src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 @Mapper
 public interface OcpApiModelRelMapper extends BaseMapper<OcpApiModelRel> {
-    List<OcpApiModelRel> getOamrList(OcpApiModelRel ocpApiModelRel);
+
 
 
 }

src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java

@@ -2,11 +2,12 @@ package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.pms.ocp.model.entity.OcpApiSubs;
+import com.pms.ocp.model.entity.PmsApiSubs;
 import org.apache.ibatis.annotations.Mapper;
 
-import java.util.List;
+
 
 @Mapper
 public interface OcpApiSubsMapper extends BaseMapper<OcpApiSubs> {
-    List<OcpApiSubs> getOcpApisList(OcpApiSubs ocpApiSubs);
+
 }

src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java

@@ -9,7 +9,5 @@ import java.util.List;
 @Mapper
 public interface OcpApiTenantRelMapper extends BaseMapper<OcpApiTenantRel> {
 
-    List<OcpApiTenantRel> getOatrList(OcpApiTenantRel ocpApiTenantRel);
 
-    List<OcpApiTenantRel> getTenantApiList(OcpApiTenantRel ocpApiTenantRel);
 }

src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java

@@ -6,11 +6,5 @@ import com.pms.ocp.model.entity.OcpTenantAudit;
 import java.util.List;
 
 public interface OcpTenantAuditMapper extends BaseMapper<OcpTenantAudit> {
-    List<OcpTenantAudit> getOtaList(OcpTenantAudit ocpTenantAudit);
 
-    List<OcpTenantAudit> getOtaListById(OcpTenantAudit ocpTenantAudit);
-
-    List<OcpTenantAudit> OtaById(OcpTenantAudit ocpTenantAudit);
-
-    List<OcpTenantAudit> versionId(OcpTenantAudit ocpTenantAudit);
 }

src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java

@@ -6,5 +6,5 @@ import com.pms.ocp.model.entity.OcpTenantBase;
 import java.util.List;
 
 public interface OcpTenantBaseMapper extends BaseMapper<OcpTenantBase> {
-    List<OcpTenantBase> getOtbList(OcpTenantBase ocpTenantBase);
+
 }

src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java

@@ -8,5 +8,5 @@ import java.util.List;
 
 @Mapper
 public interface OcpTenantSubsMapper extends BaseMapper<OcpTenantSubs> {
-    List<OcpTenantSubs> getOcpTenantList(OcpTenantSubs ocpTenantSubs);
+
 }

src/main/java/com/pms/ocp/mapper/PmsApiAuditMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiAudit;
+import com.pms.ocp.model.entity.PmsApiAudit;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * @Auther: liukai
+ * @Date: 2022/3/7
+ * @Description:服务大事记接口
+ */
+@Mapper
+public interface PmsApiAuditMapper extends BaseMapper<PmsApiAudit> {
+
+    List<PmsApiAudit> OaaById(PmsApiAudit pmsApiAudit);
+
+    List<PmsApiAudit> getOcpApiSubsList(PmsApiAudit pmsApiAudit);
+
+    List<PmsApiAudit> sById(PmsApiAudit pmsApiAudit);
+
+    List<PmsApiAudit> versionId (PmsApiAudit pmsApiAudit);
+
+}

src/main/java/com/pms/ocp/mapper/PmsApiModelRelMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.PmsApiModelRel;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface PmsApiModelRelMapper extends BaseMapper<PmsApiModelRel> {
+    List<PmsApiModelRel> getOamrList(PmsApiModelRel pmsApiModelRel);
+
+
+}

src/main/java/com/pms/ocp/mapper/PmsApiSubsMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiSubs;
+import com.pms.ocp.model.entity.PmsApiSubs;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface PmsApiSubsMapper extends BaseMapper<PmsApiSubs> {
+    List<PmsApiSubs> getOcpApisList(PmsApiSubs pmsApiSubs);
+}

src/main/java/com/pms/ocp/mapper/PmsApiTenantRelMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpApiTenantRel;
+import com.pms.ocp.model.entity.PmsApiTenantRel;
+
+import java.util.List;
+
+public interface PmsApiTenantRelMapper extends BaseMapper<PmsApiTenantRel> {
+    List<PmsApiTenantRel> getOatrList(PmsApiTenantRel pmsApiTenantRel);
+
+    List<PmsApiTenantRel> getTenantApiList(PmsApiTenantRel pmsApiTenantRel);
+}

src/main/java/com/pms/ocp/mapper/PmsTenantAuditMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpTenantAudit;
+import com.pms.ocp.model.entity.PmsTenantAudit;
+
+import java.util.List;
+
+public interface PmsTenantAuditMapper extends BaseMapper<PmsTenantAudit> {
+    List<PmsTenantAudit> getOtaList(PmsTenantAudit pmsTenantAudit);
+
+    List<PmsTenantAudit> getOtaListById(PmsTenantAudit pmsTenantAudit);
+
+    List<PmsTenantAudit> OtaById(PmsTenantAudit pmsTenantAudit);
+
+    List<PmsTenantAudit> versionId(PmsTenantAudit pmsTenantAudit);
+}

src/main/java/com/pms/ocp/mapper/PmsTenantBaseMapper.java

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.PmsTenantBase;
+import com.pms.ocp.model.entity.PmsTenantSubs;
+
+import java.util.List;
+
+public interface PmsTenantBaseMapper extends BaseMapper<PmsTenantBase> {
+    List<PmsTenantBase> getOtbList(PmsTenantBase pmsTenantBase);
+}

src/main/java/com/pms/ocp/mapper/PmsTenantSubsMapper.java

+package com.pms.ocp.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.PmsTenantSubs;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface PmsTenantSubsMapper extends BaseMapper<PmsTenantSubs> {
+    List<PmsTenantSubs> getOcpTenantList(PmsTenantSubs pmsTenantSubs);
+}

src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java

@@ -21,52 +21,36 @@ import java.util.Date;
 @TableName("ocp_tenant_subs")
 @ApiModel("应用订阅记录表1")
 public class OcpTenantSubs implements Serializable {
-    /**
-     * 关系ID
-     */
+
     @TableId(type = IdType.ASSIGN_ID)
     @ApiModelProperty("关系ID")
     private String objId;
 
-    /**
-     * 服务编码
-     */
+
     @ApiModelProperty("服务编码")
     private String tenantCode;
 
-    /**
-     * 订阅公司编码
-     */
+
     @ApiModelProperty("订阅公司编码")
     private String subsCompanyCode;
 
-    /**
-     * 服务订阅创建时间
-     */
+
     @ApiModelProperty("服务订阅创建时间")
     private Timestamp subsLogTenantCtime;
 
-    /**
-     * 服务订阅修改时间
-     */
+
     @ApiModelProperty("服务订阅修改时间")
     private Timestamp subsLogTenantMtime;
 
-    /**
-     * 服务订阅创建用户ID
-     */
+
     @ApiModelProperty("服务订阅创建用户ID")
     private String subsLogTenantUserId;
 
-    /**
-     * 服务订阅添加时间
-     */
+
     @ApiModelProperty("服务订阅添加时间")
     private Timestamp subsLogTenantAtime;
 
-    /**
-     * 是否删除0-否，1-是
-     */
+
     @ApiModelProperty("是否删除0-否，1-是")
     private Short isDelete;
 

src/main/java/com/pms/ocp/model/entity/PmsApiAudit.java

+package com.pms.ocp.model.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.sql.Timestamp;
+@Data
+@Accessors(chain = true)
+@ApiModel("服务事记表")
+public class PmsApiAudit {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    @Excel(name = "编号",orderNum = "1")
+    private String objId;
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+    @ApiModelProperty("操作状态0:新增,1:迭代；2，下线")
+    @Excel(name = "类型",orderNum = "3")
+    private long operStatus;
+
+    @ApiModelProperty("操作对象0:服务，1:入参，2:出参")
+    private long operTarget;
+
+    @ApiModelProperty("类型0:人工操作,1:流程管控,3:总部下发")
+    private long auditType;
+
+    @ApiModelProperty("备注简述")
+    private String auditMessage;
+
+    @ApiModelProperty("事记内容")
+    @Excel(name = "变更内容",orderNum = "4")
+    private String auditJson;
+
+    @ApiModelProperty("提交人id")
+    private String auditUserId;
+
+    @ApiModelProperty("提交人姓名")
+    @Excel(name = "变更人",orderNum = "5")
+    private String auditUserName;
+
+    @ApiModelProperty("创建时间")
+    @Excel(name = "创建时间",orderNum = "6")
+    private Timestamp auditCtime;
+
+    @ApiModelProperty("修改时间")
+    private Timestamp auditMtime;
+
+    @ApiModelProperty("是否删除0-否1-是")
+    private long isDelete;
+    @ApiModelProperty("当前版本")
+    private long applyVersion;
+
+    @ApiModelProperty("上一版本")
+    @Excel(name = "上一版本",orderNum = "7")
+    private long preApiVersion;
+
+
+
+
+    @ApiModelProperty("服务接口中文名称")
+    @Excel(name = "服务名称",orderNum = "2")
+    private String apiName;
+
+    @ApiModelProperty("服务分类代码")
+    private String apiGroupCode;
+
+    @ApiModelProperty("推广类型0:统建；1:自建")
+    private long apiPromotion;
+
+    @ApiModelProperty("服务请求体")
+    @Excel(name = "请求参数",orderNum = "8")
+    private String apiReq;
+
+    @ApiModelProperty("服务返回体")
+    @Excel(name = "返回参数",orderNum = "9")
+    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("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private long apiZone;
+
+    @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private long apiLayer;
+
+    @ApiModelProperty("服务版本（最新版本）")
+    @Excel(name = "当前版本",orderNum = "6")
+    private String apiVersion;
+
+    @ApiModelProperty("服务所属中心编码所属中心")
+    private long apiCenterCode;
+
+    @ApiModelProperty("创建者姓名")
+    private long apiUserName;
+
+}

src/main/java/com/pms/ocp/model/entity/PmsApiBase.java

+package com.pms.ocp.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.sql.Date;
+import java.sql.Timestamp;
+
+@Data
+@Accessors(chain = true)
+@TableName("ocp_api_base")
+@ApiModel("服务基础信息表")
+public class PmsApiBase {
+
+
+    @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("服务所属公司")
+    private String ownerCompanyName;
+
+    @ApiModelProperty("是否删除0-否1-是")
+    private long isDelete;
+
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private long apiZone;
+
+    @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private long apiLayer;
+
+    @ApiModelProperty("服务版本（最新版本）")
+    private long apiVersion;
+
+
+
+}

src/main/java/com/pms/ocp/model/entity/PmsApiModelRel.java

+package com.pms.ocp.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
+@Data
+@Accessors(chain = true)
+@TableName("ocp_api_model_rel")
+@ApiModel("服务模型关系")
+public class PmsApiModelRel {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("模型编码")
+    private String modelCode;
+
+    @ApiModelProperty("模型部署公司")
+    private String modelDepCompanyCode;
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+    @ApiModelProperty("服务部署公司")
+    private String apiDepCompanyCode;
+
+    @ApiModelProperty("关系添加时间")
+    private Timestamp relationCtime;
+
+    @ApiModelProperty("是否已删除 0-否1-是")
+    private long isDelete;
+
+
+
+
+
+    @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("服务所属公司")
+    private String ownerCompanyName;
+
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private long apiZone;
+
+    @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private long apiLayer;
+
+    @ApiModelProperty("服务版本（最新版本）")
+    private String apiVersion;
+
+    @ApiModelProperty("服务所属中心编码所属中心")
+    private long apiCenterCode;
+
+    @ApiModelProperty("服务简述")
+    private String apiDescription;
+
+    @ApiModelProperty("创建者姓名")
+    private long apiUserName;
+
+
+    @ApiModelProperty("模型名称")
+    private String modelName;
+
+
+    @ApiModelProperty("设备类型")
+    private String equipType;
+
+
+    @ApiModelProperty("所属专业ts:输电,t:变电, dc:直流，ds配电，tc:技术，pl计划 im综合")
+    private String professionalKind;
+
+    @ApiModelProperty("模型分类编码")
+    private String modelGroupCode;
+
+
+    @ApiModelProperty("模型表名称")
+    private String modelTable;
+
+
+    @ApiModelProperty("是否启用 0:未启用,1：启用")
+    @TableField(value = "is_use")
+    private Integer boolUse;
+
+
+    @ApiModelProperty("模型推广类型 0:统推,1：自建")
+    private Integer modelPromotion;
+
+
+    @ApiModelProperty("排列顺序")
+    private Integer modelOrderNo;
+
+
+    @ApiModelProperty("提交人id")
+    private String modelUserId;
+
+
+    @ApiModelProperty("提交人姓名")
+    private String modelUserName;
+
+
+    @ApiModelProperty("模型创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime modelCtime;
+
+
+    @ApiModelProperty("模型修改时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime modelMtime;
+
+
+
+    @ApiModelProperty("是否已删除0:未删除 1:已删除")
+    @TableField(value = "is_delete")
+    private Integer boolDelete;
+
+
+    @ApiModelProperty("所属区域1:生成控制大区 2:信息关联大区3:互联网大区")
+    private Integer modelZone;
+
+
+    @ApiModelProperty("所属层级1:应用层 2:平台层3:网络层 4:感知层")
+    private Integer modelLayer;
+
+
+    @ApiModelProperty("模型版本模型版本（最新版本）")
+    private String modelVersion;
+
+}

src/main/java/com/pms/ocp/model/entity/PmsApiSubs.java

+package com.pms.ocp.model.entity;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.sql.Timestamp;
+
+@Data
+@Accessors(chain = true)
+@ApiModel("服务订阅记录表")
+public class PmsApiSubs {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+    @ApiModelProperty("服务订阅创建时间")
+    private Timestamp subsLogApiCtime;
+
+    @ApiModelProperty("服务订阅修改时间")
+    private Timestamp subsLogApiMtime;
+
+    @ApiModelProperty("服务订阅创建用户ID")
+    private String subsLogApiUserId;
+
+    @ApiModelProperty("服务订阅添加时间")
+    private Timestamp subsLogApiAtime;
+
+    @ApiModelProperty("公司编码")
+    private String subsCompanyCode;
+
+    @ApiModelProperty("是否删除0-否，1-是")
+    private long isDelete;
+
+
+
+
+    @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("服务所属公司")
+    private String ownerCompanyName;
+
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private long apiZone;
+
+    @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private long apiLayer;
+
+    @ApiModelProperty("服务版本（最新版本）")
+    private String apiVersion;
+
+    @ApiModelProperty("服务所属中心编码所属中心")
+    private long apiCenterCode;
+
+
+    @ApiModelProperty("创建者姓名")
+    private long apiUserName;
+
+
+
+
+
+
+}

src/main/java/com/pms/ocp/model/entity/PmsApiTenantRel.java

+package com.pms.ocp.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+import java.sql.Timestamp;
+
+@Data
+@Accessors(chain = true)
+
+@ApiModel("服务应用关系表")
+public class PmsApiTenantRel {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("应用编码")
+    private String tenantCode;
+
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+    @ApiModelProperty("服务部署公司")
+    private String apiDepCompanyCode;
+
+    @ApiModelProperty("应用所属公司")
+    private String tenantDepCompanyCode;
+
+    @ApiModelProperty("关系创建时间")
+    private Timestamp apiTenantRelCtime;
+
+    @ApiModelProperty("关系创建时间")
+    private Timestamp apiTenantRelMtime;
+
+    @ApiModelProperty("关系创建用户ID")
+    private String apiTenantRelUserId;
+
+    @ApiModelProperty("关系创建用户")
+    private String apiTenantRelUserName;
+
+    @ApiModelProperty("是否已删除0未删除，1已删除")
+    private long isDelete;
+
+
+
+
+
+
+    @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("服务所属公司")
+    private String ownerCompanyName;
+
+
+
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private long apiZone;
+
+    @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private long apiLayer;
+
+    @ApiModelProperty("服务版本（最新版本）")
+    private String apiVersion;
+
+    @ApiModelProperty("服务所属中心编码所属中心")
+    private long apiCenterCode;
+
+    @ApiModelProperty("服务简述")
+    private String apiDescription;
+
+    @ApiModelProperty("创建者姓名")
+    private long apiUserName;
+
+
+    @ApiModelProperty("应用名称")
+    private String tenantName;
+
+
+
+    @ApiModelProperty("应用分类代码")
+    private String tenantGroupCode;
+
+
+    @ApiModelProperty("应用ip")
+    private String tenantIp;
+
+
+    @ApiModelProperty("应用url")
+    private String tenantUrl;
+
+
+    @ApiModelProperty("所属专业")
+    private String professionalKind;
+
+
+    @ApiModelProperty("创建者用户ID")
+    private String tenantUserId;
+
+
+    @ApiModelProperty("排序")
+    private Integer tenantOrderNo;
+
+
+    @ApiModelProperty("创建时间")
+    private Timestamp tenantCtime;
+
+
+    @ApiModelProperty("最后更新时间")
+    private Timestamp tenantMtime;
+
+
+    @ApiModelProperty("建设单位")
+    private String tenantUnit;
+
+
+
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private Short tenantZone;
+
+
+    @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private Short tenantLayer;
+
+
+    @ApiModelProperty("应用版本（当前版本）")
+    private String tenantVersion;
+
+
+
+    @ApiModelProperty("部署名称")
+    private String deploymentName;
+
+    @ApiModelProperty("描述")
+    private String tenantDescription;
+
+    @ApiModelProperty("应用状态0设计 1运行态")
+    private String tenantState;
+
+
+    @ApiModelProperty("推广类型0:统建；1:自建")
+    private long tenantPromotion;
+
+
+    @ApiModelProperty("应用路径")
+    private String tenantFullPath;
+
+
+
+
+}

src/main/java/com/pms/ocp/model/entity/PmsTenantBase.java

+package com.pms.ocp.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * 应用信息表
+ * @TableName ocp_tenant_base
+ */
+@Data
+@Accessors(chain = true)
+@TableName("ocp_tenant_base")
+@ApiModel("应用信息表1")
+public class PmsTenantBase implements Serializable {
+
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+
+    @ApiModelProperty("应用名称")
+    private String tenantName;
+
+
+    @ApiModelProperty("应用代码")
+    private String tenantCode;
+
+
+    @ApiModelProperty("应用分类代码")
+    private String tenantGroupCode;
+
+
+    @ApiModelProperty("应用ip")
+    private String tenantIp;
+
+
+    @ApiModelProperty("应用url")
+    private String tenantUrl;
+
+
+
+    @ApiModelProperty("所属专业")
+    private String professionalKind;
+
+
+    @ApiModelProperty("创建者用户ID")
+    private String tenantUserId;
+
+
+    @ApiModelProperty("排序")
+    private Integer tenantOrderNo;
+
+
+    @ApiModelProperty("创建时间")
+    private Timestamp tenantCtime;
+
+
+    @ApiModelProperty("最后更新时间")
+    private Timestamp tenantMtime;
+
+
+
+    @ApiModelProperty("部署名称")
+    private String deploymentName;
+
+
+    @ApiModelProperty("描述")
+    private String tenantDescription;
+
+
+    @ApiModelProperty("应用状态0:设计态；1:运行态")
+    private Short tenantState;
+
+    @ApiModelProperty("推广类型0:统建；1:自建")
+    private long tenantPromotion;
+
+    @ApiModelProperty("建设单位")
+    private String tenantUnit;
+
+
+    @ApiModelProperty("所属公司编码")
+    private String ownerCompanyCode;
+
+
+    @ApiModelProperty("所属公司名称")
+    private String ownerCompanyName;
+
+
+    @ApiModelProperty("应用路径")
+    private String tenantFullPath;
+
+
+    @ApiModelProperty("是否删除0:否;1:是")
+    private Short isDelete;
+
+
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private Short tenantZone;
+
+
+    @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private Short tenantLayer;
+
+
+    @ApiModelProperty("应用版本（当前版本）")
+    private String tenantVersion;
+
+    private static final long serialVersionUID = 1L;
+
+
+//
+//    @Override
+//    public boolean equals(Object that) {
+//        if (this == that) {
+//            return true;
+//        }
+//        if (that == null) {
+//            return false;
+//        }
+//        if (getClass() != that.getClass()) {
+//            return false;
+//        }
+//        OcpTenantBase other = (OcpTenantBase) that;
+//        return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId()))
+//            && (this.getTenantName() == null ? other.getTenantName() == null : this.getTenantName().equals(other.getTenantName()))
+//            && (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode()))
+//            && (this.getTenantGroupCode() == null ? other.getTenantGroupCode() == null : this.getTenantGroupCode().equals(other.getTenantGroupCode()))
+//            && (this.getTenantIp() == null ? other.getTenantIp() == null : this.getTenantIp().equals(other.getTenantIp()))
+//            && (this.getTenantUrl() == null ? other.getTenantUrl() == null : this.getTenantUrl().equals(other.getTenantUrl()))
+//            && (this.getProfessionalKind() == null ? other.getProfessionalKind() == null : this.getProfessionalKind().equals(other.getProfessionalKind()))
+//            && (this.getTenantUserId() == null ? other.getTenantUserId() == null : this.getTenantUserId().equals(other.getTenantUserId()))
+//            && (this.getTenantOrderNo() == null ? other.getTenantOrderNo() == null : this.getTenantOrderNo().equals(other.getTenantOrderNo()))
+//            && (this.getTenantCtime() == null ? other.getTenantCtime() == null : this.getTenantCtime().equals(other.getTenantCtime()))
+//            && (this.getTenantMtime() == null ? other.getTenantMtime() == null : this.getTenantMtime().equals(other.getTenantMtime()))
+//            && (this.getDeploymentName() == null ? other.getDeploymentName() == null : this.getDeploymentName().equals(other.getDeploymentName()))
+//            && (this.getTenantDescription() == null ? other.getTenantDescription() == null : this.getTenantDescription().equals(other.getTenantDescription()))
+//            && (this.getTenantState() == null ? other.getTenantState() == null : this.getTenantState().equals(other.getTenantState()))
+//            && (this.getTenantUnit() == null ? other.getTenantUnit() == null : this.getTenantUnit().equals(other.getTenantUnit()))
+//            && (this.getOwnerCompanyCode() == null ? other.getOwnerCompanyCode() == null : this.getOwnerCompanyCode().equals(other.getOwnerCompanyCode()))
+//            && (this.getOwnerCompanyName() == null ? other.getOwnerCompanyName() == null : this.getOwnerCompanyName().equals(other.getOwnerCompanyName()))
+//            && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()))
+//            && (this.getTenantZone() == null ? other.getTenantZone() == null : this.getTenantZone().equals(other.getTenantZone()))
+//            && (this.getTenantLayer() == null ? other.getTenantLayer() == null : this.getTenantLayer().equals(other.getTenantLayer()))
+//            && (this.getTenantVersion() == null ? other.getTenantVersion() == null : this.getTenantVersion().equals(other.getTenantVersion()));
+//    }
+//
+//    @Override
+//    public int hashCode() {
+//        final int prime = 31;
+//        int result = 1;
+//        result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode());
+//        result = prime * result + ((getTenantName() == null) ? 0 : getTenantName().hashCode());
+//        result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode());
+//        result = prime * result + ((getTenantGroupCode() == null) ? 0 : getTenantGroupCode().hashCode());
+//        result = prime * result + ((getTenantIp() == null) ? 0 : getTenantIp().hashCode());
+//        result = prime * result + ((getTenantUrl() == null) ? 0 : getTenantUrl().hashCode());
+//        result = prime * result + ((getProfessionalKind() == null) ? 0 : getProfessionalKind().hashCode());
+//        result = prime * result + ((getTenantUserId() == null) ? 0 : getTenantUserId().hashCode());
+//        result = prime * result + ((getTenantOrderNo() == null) ? 0 : getTenantOrderNo().hashCode());
+//        result = prime * result + ((getTenantCtime() == null) ? 0 : getTenantCtime().hashCode());
+//        result = prime * result + ((getTenantMtime() == null) ? 0 : getTenantMtime().hashCode());
+//        result = prime * result + ((getDeploymentName() == null) ? 0 : getDeploymentName().hashCode());
+//        result = prime * result + ((getTenantDescription() == null) ? 0 : getTenantDescription().hashCode());
+//        result = prime * result + ((getTenantState() == null) ? 0 : getTenantState().hashCode());
+//        result = prime * result + ((getTenantUnit() == null) ? 0 : getTenantUnit().hashCode());
+//        result = prime * result + ((getOwnerCompanyCode() == null) ? 0 : getOwnerCompanyCode().hashCode());
+//        result = prime * result + ((getOwnerCompanyName() == null) ? 0 : getOwnerCompanyName().hashCode());
+//        result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode());
+//        result = prime * result + ((getTenantZone() == null) ? 0 : getTenantZone().hashCode());
+//        result = prime * result + ((getTenantLayer() == null) ? 0 : getTenantLayer().hashCode());
+//        result = prime * result + ((getTenantVersion() == null) ? 0 : getTenantVersion().hashCode());
+//        return result;
+//    }
+//
+//    @Override
+//    public String toString() {
+//        StringBuilder sb = new StringBuilder();
+//        sb.append(getClass().getSimpleName());
+//        sb.append(" [");
+//        sb.append("Hash = ").append(hashCode());
+//        sb.append(", objId=").append(objId);
+//        sb.append(", tenantName=").append(tenantName);
+//        sb.append(", tenantCode=").append(tenantCode);
+//        sb.append(", tenantGroupCode=").append(tenantGroupCode);
+//        sb.append(", tenantIp=").append(tenantIp);
+//        sb.append(", tenantUrl=").append(tenantUrl);
+//        sb.append(", professionalKind=").append(professionalKind);
+//        sb.append(", tenantUserId=").append(tenantUserId);
+//        sb.append(", tenantOrderNo=").append(tenantOrderNo);
+//        sb.append(", tenantCtime=").append(tenantCtime);
+//        sb.append(", tenantMtime=").append(tenantMtime);
+//        sb.append(", deploymentName=").append(deploymentName);
+//        sb.append(", tenantDescription=").append(tenantDescription);
+//        sb.append(", tenantState=").append(tenantState);
+//        sb.append(", tenantUnit=").append(tenantUnit);
+//        sb.append(", ownerCompanyCode=").append(ownerCompanyCode);
+//        sb.append(", ownerCompanyName=").append(ownerCompanyName);
+//        sb.append(", isDelete=").append(isDelete);
+//        sb.append(", tenantZone=").append(tenantZone);
+//        sb.append(", tenantLayer=").append(tenantLayer);
+//        sb.append(", tenantVersion=").append(tenantVersion);
+//        sb.append(", serialVersionUID=").append(serialVersionUID);
+//        sb.append("]");
+//        return sb.toString();
+//    }
+}
\ No newline at end of file

src/main/java/com/pms/ocp/model/entity/PmsTenantSubs.java

+package com.pms.ocp.model.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+import java.util.Date;
+
+/**
+ * 应用订阅记录表
+ * @TableName ocp_tenant_subs
+ */
+@Data
+@Accessors(chain = true)
+@TableName("ocp_tenant_subs")
+@ApiModel("应用订阅记录表1")
+public class PmsTenantSubs implements Serializable {
+    /**
+     * 关系ID
+     */
+    @TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty("关系ID")
+    private String objId;
+
+    /**
+     * 服务编码
+     */
+    @ApiModelProperty("应用编码")
+    private String tenantCode;
+
+    /**
+     * 订阅公司编码
+     */
+    @ApiModelProperty("订阅公司编码")
+    private String subsCompanyCode;
+
+    /**
+     * 服务订阅创建时间
+     */
+    @ApiModelProperty("应用订阅创建时间")
+    private Timestamp subsLogTenantCtime;
+
+    /**
+     * 服务订阅修改时间
+     */
+    @ApiModelProperty("应用订阅修改时间")
+    private Timestamp subsLogTenantMtime;
+
+    /**
+     * 服务订阅创建用户ID
+     */
+    @ApiModelProperty("应用订阅创建用户ID")
+    private String subsLogTenantUserId;
+
+    /**
+     * 服务订阅添加时间
+     */
+    @ApiModelProperty("应用订阅添加时间")
+    private Timestamp subsLogTenantAtime;
+
+    /**
+     * 是否删除0-否，1-是
+     */
+    @ApiModelProperty("是否删除0-否，1-是")
+    private Short isDelete;
+
+
+
+    /**
+     * 应用名称
+     */
+    @ApiModelProperty("应用名称")
+    private String tenantName;
+
+
+    /**
+     * 应用分类代码
+     */
+    @ApiModelProperty("应用分类代码")
+    private String tenantGroupCode;
+
+    /**
+     * 应用ip
+     */
+    @ApiModelProperty("应用ip")
+    private String tenantIp;
+
+    /**
+     * 应用url
+     */
+    @ApiModelProperty("应用url")
+    private String tenantUrl;
+
+    /**
+     * 所属专业
+     */
+    @ApiModelProperty("所属专业")
+    private String professionalKind;
+
+    /**
+     * 创建者用户ID
+     */
+    @ApiModelProperty("创建者用户ID")
+    private String tenantUserId;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer tenantOrderNo;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Timestamp tenantCtime;
+
+    /**
+     * 最后更新时间
+     */
+    @ApiModelProperty("最后更新时间")
+    private Timestamp tenantMtime;
+
+//    /**
+//     * 部署名称
+//     */
+//    @ApiModelProperty("部署名称")
+//    private String deploymentName;
+
+//    /**
+//     * 描述
+//     */
+//    @ApiModelProperty("描述")
+//    private String tenantDescription;
+
+    /**
+     * 应用状态0:设计态；1:运行态
+     */
+    @ApiModelProperty("应用状态0:设计态；1:运行态")
+    private Short tenantState;
+
+    /**
+     * 推广类型0:统建；1:自建
+     */
+    @ApiModelProperty("推广类型0:统建；1:自建")
+    private long tenantPromotion;
+    /**
+     * 建设单位
+     */
+    @ApiModelProperty("建设单位")
+    private String tenantUnit;
+
+    /**
+     * 所属公司编码
+     */
+    @ApiModelProperty("所属公司编码")
+    private String ownerCompanyCode;
+
+//    /**
+//     * 所属公司名称
+//     */
+//    @ApiModelProperty("所属公司名称")
+//    private String ownerCompanyName;
+
+    /**
+     * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区
+     */
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private Short tenantZone;
+
+    /**
+     * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层;
+     */
+    @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private Short tenantLayer;
+
+    /**
+     * 应用版本（当前版本）
+     */
+    @ApiModelProperty("应用版本（当前版本）")
+    private String tenantVersion;
+
+
+    /**
+     * 应用路径
+     */
+    @ApiModelProperty("应用路径")
+    private String tenantFullPath;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 关系ID
+     */
+    public String getObjId() {
+        return objId;
+    }
+
+    /**
+     * 关系ID
+     */
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    /**
+     * 服务编码
+     */
+    public String getTenantCode() {
+        return tenantCode;
+    }
+
+    /**
+     * 服务编码
+     */
+    public void setTenantCode(String tenantCode) {
+        this.tenantCode = tenantCode;
+    }
+
+    /**
+     * 订阅公司编码
+     */
+    public String getSubsCompanyCode() {
+        return subsCompanyCode;
+    }
+
+    /**
+     * 订阅公司编码
+     */
+    public void setSubsCompanyCode(String subsCompanyCode) {
+        this.subsCompanyCode = subsCompanyCode;
+    }
+
+    /**
+     * 服务订阅创建时间
+     */
+    public Date getSubsLogTenantCtime() {
+        return subsLogTenantCtime;
+    }
+
+    /**
+     * 服务订阅创建时间
+     */
+    public void setSubsLogTenantCtime(Timestamp subsLogTenantCtime) {
+        this.subsLogTenantCtime = subsLogTenantCtime;
+    }
+
+    /**
+     * 服务订阅修改时间
+     */
+    public Date getSubsLogTenantMtime() {
+        return subsLogTenantMtime;
+    }
+
+    /**
+     * 服务订阅修改时间
+     */
+    public void setSubsLogTenantMtime(Timestamp subsLogTenantMtime) {
+        this.subsLogTenantMtime = subsLogTenantMtime;
+    }
+
+    /**
+     * 服务订阅创建用户ID
+     */
+    public String getSubsLogTenantUserId() {
+        return subsLogTenantUserId;
+    }
+
+    /**
+     * 服务订阅创建用户ID
+     */
+    public void setSubsLogTenantUserId(String subsLogTenantUserId) {
+        this.subsLogTenantUserId = subsLogTenantUserId;
+    }
+
+    /**
+     * 服务订阅添加时间
+     */
+    public Date getSubsLogTenantAtime() {
+        return subsLogTenantAtime;
+    }
+
+    /**
+     * 服务订阅添加时间
+     */
+    public void setSubsLogTenantAtime(Timestamp subsLogTenantAtime) {
+        this.subsLogTenantAtime = subsLogTenantAtime;
+    }
+
+
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        OcpTenantSubs other = (OcpTenantSubs) that;
+        return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId()))
+            && (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode()))
+            && (this.getSubsCompanyCode() == null ? other.getSubsCompanyCode() == null : this.getSubsCompanyCode().equals(other.getSubsCompanyCode()))
+            && (this.getSubsLogTenantCtime() == null ? other.getSubsLogTenantCtime() == null : this.getSubsLogTenantCtime().equals(other.getSubsLogTenantCtime()))
+            && (this.getSubsLogTenantMtime() == null ? other.getSubsLogTenantMtime() == null : this.getSubsLogTenantMtime().equals(other.getSubsLogTenantMtime()))
+            && (this.getSubsLogTenantUserId() == null ? other.getSubsLogTenantUserId() == null : this.getSubsLogTenantUserId().equals(other.getSubsLogTenantUserId()))
+            && (this.getSubsLogTenantAtime() == null ? other.getSubsLogTenantAtime() == null : this.getSubsLogTenantAtime().equals(other.getSubsLogTenantAtime()))
+            && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode());
+        result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode());
+        result = prime * result + ((getSubsCompanyCode() == null) ? 0 : getSubsCompanyCode().hashCode());
+        result = prime * result + ((getSubsLogTenantCtime() == null) ? 0 : getSubsLogTenantCtime().hashCode());
+        result = prime * result + ((getSubsLogTenantMtime() == null) ? 0 : getSubsLogTenantMtime().hashCode());
+        result = prime * result + ((getSubsLogTenantUserId() == null) ? 0 : getSubsLogTenantUserId().hashCode());
+        result = prime * result + ((getSubsLogTenantAtime() == null) ? 0 : getSubsLogTenantAtime().hashCode());
+        result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", objId=").append(objId);
+        sb.append(", tenantCode=").append(tenantCode);
+        sb.append(", subsCompanyCode=").append(subsCompanyCode);
+        sb.append(", subsLogTenantCtime=").append(subsLogTenantCtime);
+        sb.append(", subsLogTenantMtime=").append(subsLogTenantMtime);
+        sb.append(", subsLogTenantUserId=").append(subsLogTenantUserId);
+        sb.append(", subsLogTenantAtime=").append(subsLogTenantAtime);
+        sb.append(", isDelete=").append(isDelete);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

src/main/java/com/pms/ocp/service/OcpApiSubsService.java

@@ -2,8 +2,7 @@ package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pms.ocp.model.entity.OcpApiSubs;
-import com.pms.ocp.model.vo.ResponseVO;
+
 
 public interface OcpApiSubsService extends IService<OcpApiSubs> {
-    ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs);
 }

src/main/java/com/pms/ocp/service/OcpApiTenantRelService.java

@@ -2,11 +2,6 @@ package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pms.ocp.model.entity.OcpApiTenantRel;
-import com.pms.ocp.model.vo.ResponseVO;
-
 
 public interface OcpApiTenantRelService extends IService<OcpApiTenantRel> {
-   ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel);
-
-   ResponseVO getTenantApiList(OcpApiTenantRel ocpApiTenantRel);
 }

src/main/java/com/pms/ocp/service/OcpTenantAuditService.java

@@ -9,13 +9,5 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 public interface OcpTenantAuditService extends IService<OcpTenantAudit> {
-    ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit);
 
-    ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit);
-
-    void exportExcel(OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response);
-
-    ResponseVO OtaById(OcpTenantAudit ocpTenantAudit);
-
-    ResponseVO versionId(OcpTenantAudit ocpTenantAudit);
 }

src/main/java/com/pms/ocp/service/OcpTenantBaseService.java

@@ -5,7 +5,7 @@ import com.pms.ocp.model.entity.OcpTenantBase;
 import com.pms.ocp.model.vo.ResponseVO;
 
 public interface OcpTenantBaseService extends IService<OcpTenantBase> {
-    ResponseVO getOtbList(OcpTenantBase ocpTenantBase);
+
 
 
 

src/main/java/com/pms/ocp/service/OcpTenantSubsService.java

@@ -5,5 +5,5 @@ import com.pms.ocp.model.entity.OcpTenantSubs;
 import com.pms.ocp.model.vo.ResponseVO;
 
 public interface OcpTenantSubsService extends IService<OcpTenantSubs> {
-    ResponseVO getOcpTenantList(OcpTenantSubs ocpTenantSubs);
+
 }

src/main/java/com/pms/ocp/service/OcpApiAuditService.java → src/main/java/com/pms/ocp/service/PmsApiAuditService.java

@@ -2,22 +2,23 @@ package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pms.ocp.model.entity.OcpApiAudit;
+import com.pms.ocp.model.entity.PmsApiAudit;
 import com.pms.ocp.model.vo.ResponseVO;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 
-public interface OcpApiAuditService extends IService<OcpApiAudit> {
-    ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit);
+public interface PmsApiAuditService extends IService<PmsApiAudit> {
+    ResponseVO getOcpApiAuditList(PmsApiAudit pmsApiAudit);
 
     ResponseVO getOcpApiDetails(String objId);
 
-    ResponseVO OaaById(OcpApiAudit ocpApiAudit);
+    ResponseVO OaaById(PmsApiAudit pmsApiAudit);
 
-    ResponseVO sById(OcpApiAudit ocpApiAudit);
+    ResponseVO sById(PmsApiAudit pmsApiAudit);
 
-    void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response);
+    void exportExcel(PmsApiAudit pmsApiAudit, HttpServletRequest request, HttpServletResponse response);
 
-    ResponseVO versionId(OcpApiAudit ocpApiAudit);
+    ResponseVO versionId(PmsApiAudit pmsApiAudit);
 }

src/main/java/com/pms/ocp/service/OcpApiBaseService.java → src/main/java/com/pms/ocp/service/PmsApiBaseService.java

@@ -6,5 +6,5 @@ import com.pms.ocp.model.entity.OcpApiBase;
 import org.springframework.stereotype.Service;
 
 @Service
-public interface OcpApiBaseService extends IService<OcpApiBase> {
+public interface PmsApiBaseService extends IService<OcpApiBase> {
 }

src/main/java/com/pms/ocp/service/OcpApiModelRelService.java → src/main/java/com/pms/ocp/service/PmsApiModelRelService.java

@@ -3,8 +3,9 @@ package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pms.ocp.model.entity.OcpApiModelRel;
+import com.pms.ocp.model.entity.PmsApiModelRel;
 import com.pms.ocp.model.vo.ResponseVO;
 
-public interface OcpApiModelRelService extends IService<OcpApiModelRel> {
-    ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel);
+public interface PmsApiModelRelService extends IService<PmsApiModelRel> {
+    ResponseVO getOamrList(PmsApiModelRel pmsApiModelRel);
 }

src/main/java/com/pms/ocp/service/PmsApiSubsService.java

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.OcpApiSubs;
+import com.pms.ocp.model.entity.PmsApiSubs;
+import com.pms.ocp.model.vo.ResponseVO;
+
+public interface PmsApiSubsService extends IService<PmsApiSubs> {
+    ResponseVO getPmsApiSubsList(PmsApiSubs pmsApiSubs);
+}

src/main/java/com/pms/ocp/service/PmsApiTenantRelService.java

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.OcpApiTenantRel;
+import com.pms.ocp.model.entity.PmsApiTenantRel;
+import com.pms.ocp.model.vo.ResponseVO;
+
+
+public interface PmsApiTenantRelService extends IService<PmsApiTenantRel> {
+   ResponseVO getOatrList(PmsApiTenantRel pmsApiTenantRel);
+
+   ResponseVO getTenantApiList(PmsApiTenantRel pmsApiTenantRel);
+}

src/main/java/com/pms/ocp/service/PmsTenantAuditService.java

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.OcpApiTenantRel;
+import com.pms.ocp.model.entity.OcpTenantAudit;
+import com.pms.ocp.model.entity.PmsTenantAudit;
+import com.pms.ocp.model.vo.ResponseVO;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+public interface PmsTenantAuditService extends IService<PmsTenantAudit> {
+    ResponseVO getOtaList(PmsTenantAudit pmsTenantAudit);
+
+    ResponseVO getOtaListById(PmsTenantAudit pmsTenantAudit);
+
+    void exportExcel(PmsTenantAudit pmsTenantAudit, HttpServletRequest request, HttpServletResponse response);
+
+    ResponseVO OtaById(PmsTenantAudit pmsTenantAudit);
+
+    ResponseVO versionId(PmsTenantAudit pmsTenantAudit);
+}

src/main/java/com/pms/ocp/service/PmsTenantBaseService.java

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.entity.PmsTenantBase;
+import com.pms.ocp.model.vo.ResponseVO;
+
+public interface PmsTenantBaseService extends IService<PmsTenantBase> {
+    ResponseVO getOtbList(PmsTenantBase pmsTenantBase);
+
+
+
+}

src/main/java/com/pms/ocp/service/PmsTenantSubsService.java

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.PmsTenantSubs;
+import com.pms.ocp.model.vo.ResponseVO;
+
+
+
+public interface PmsTenantSubsService extends IService<PmsTenantSubs> {
+    ResponseVO getOcpTenantList(PmsTenantSubs pmsTenantSubs);
+}

src/main/java/com/pms/ocp/service/impl/ModelServiceImpl.java

@@ -228,7 +228,7 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
     private ResponseVO getModelInfoList(String modelCode, Integer currentPage, Integer pageSize, String searchCondition) {
         QueryWrapper<Model> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("model_group_code", modelCode)
-        .like(StringUtils.isNotEmpty(searchCondition), "ocp_model_prop", searchCondition)
+        .like(StringUtils.isNotEmpty(searchCondition), "model_name", searchCondition)
         .orderByDesc("model_ctime");
         List<Model> modelList = modelMapper.selectList(queryWrapper);
         PageUtil<Model> pageUtil = new PageUtil<>();
@@ -252,11 +252,11 @@ public class ModelServiceImpl extends ServiceImpl<ModelMapper, Model> implements
         modelWrapper.eq("model_code",modelCode);
         List<Model> modelList = modelMapper.selectList(modelWrapper);
         proWrapper.eq("model_code", modelCode)
-        .like(StringUtils.isNotEmpty(searchCondition), "column_name", searchCondition)
+        .like(StringUtils.isNotEmpty(searchCondition), "column_comments", searchCondition)
         .orderByDesc("prop_ctime");
         List<ModelProperty> modelPropertiesList = modelPropertyMapper.selectList(proWrapper);
         modelPropertiesList.forEach(pro ->
-            pro.setModelTable(modelList.get(0) == null ?"":modelList.get(0).getModelTable())
+            pro.setModelTable(modelList.get(0) == null ? "":modelList.get(0).getModelTable())
         );
         PageUtil<ModelProperty> pageUtil = new PageUtil<>();
         pageUtil.startPage(currentPage, pageSize, modelPropertiesList);

src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java

 package com.pms.ocp.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.mapper.OcpApiSubsMapper;
 import com.pms.ocp.model.entity.OcpApiSubs;
-import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.OcpApiSubsService;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.List;
 
 @Service
-public class OcpApiSubsServiceImpl extends ServiceImpl<OcpApiSubsMapper,OcpApiSubs> implements OcpApiSubsService {
-
-    @Autowired
-    private OcpApiSubsMapper ocpApiSubsMapper;
-    @Override
-    public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) {
-        List<OcpApiSubs> ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs);
-        return ResponseVO.ok(ocpApiSubsList);
-    }
+public class OcpApiSubsServiceImpl extends ServiceImpl<OcpApiSubsMapper, OcpApiSubs> implements OcpApiSubsService {
 }

src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java

 package com.pms.ocp.service.impl;
 
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.mapper.OcpApiTenantRelMapper;
 import com.pms.ocp.model.entity.OcpApiTenantRel;
-import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.OcpApiTenantRelService;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
-
 @Service
-public class OcpApiTenantRelServiceImpl extends ServiceImpl<OcpApiTenantRelMapper,OcpApiTenantRel> implements OcpApiTenantRelService {
-    @Autowired
-    private OcpApiTenantRelMapper ocpApiTenantRelMapper;
-
-
-    @Override
-    public ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel) {
-        List<OcpApiTenantRel> oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel);
-        return ResponseVO.ok(oatrList);
-    }
-
-    @Override
-    public ResponseVO getTenantApiList(OcpApiTenantRel ocpApiTenantRel) {
-        List<OcpApiTenantRel> oatrList = ocpApiTenantRelMapper.getTenantApiList(ocpApiTenantRel);
-        return ResponseVO.ok(oatrList);
-    }
+public class OcpApiTenantRelServiceImpl extends ServiceImpl<OcpApiTenantRelMapper, OcpApiTenantRel> implements OcpApiTenantRelService {
 }

src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java

@@ -21,43 +21,7 @@ import java.util.List;
 
 @Service
 public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,OcpTenantAudit> implements OcpTenantAuditService {
-    @Autowired
-    private OcpTenantAuditMapper ocpTenantAuditMapper;
 
-    @Autowired
-    private OcpApiTenantRelMapper ocpApiTenantRelMapper;
-
-    @Override
-    public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) {
-        List<OcpTenantAudit> otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit);
-        return ResponseVO.ok(otaList);
-    }
-
-    @Override
-    public ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit) {
-        List<OcpTenantAudit> otaListById = ocpTenantAuditMapper.getOtaListById(ocpTenantAudit);
-        return ResponseVO.ok(otaListById);
-    }
-
-    @Override
-    public void exportExcel(OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response) {
-        List<OcpTenantAudit> otaListById = ocpTenantAuditMapper.versionId(ocpTenantAudit);
-        ExportParams param = new ExportParams(AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API,AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API);
-        Workbook workbook = ExcelExportUtil.exportExcel(param, OcpTenantAudit.class,otaListById);
-        ExportUtils.exportExcel(response, AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API,workbook);
-    }
-
-    @Override
-    public ResponseVO OtaById(OcpTenantAudit ocpTenantAudit) {
-        List<OcpTenantAudit> oatrList = ocpTenantAuditMapper.OtaById(ocpTenantAudit);
-        return ResponseVO.ok(oatrList);
-    }
-
-    @Override
-    public ResponseVO versionId(OcpTenantAudit ocpTenantAudit) {
-        List<OcpTenantAudit> ocpTenantAudits = ocpTenantAuditMapper.versionId(ocpTenantAudit);
-        return ResponseVO.ok(ocpTenantAudits);
-    }
 
 
 }

src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java

@@ -20,13 +20,7 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper,Oc
 
 
 
-    @Autowired
-    private OcpTenantBaseMapper ocpTenantBaseMapper;
-    @Override
-    public ResponseVO getOtbList(OcpTenantBase ocpTenantBase) {
-        List<OcpTenantBase> otbList = ocpTenantBaseMapper.getOtbList(ocpTenantBase);
-        return ResponseVO.ok(otbList);
-    }
+
 
 
 

src/main/java/com/pms/ocp/service/impl/OcpTenantSubsServiceImpl.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.mapper.OcpTenantSubsMapper;
 import com.pms.ocp.model.entity.OcpTenantSubs;
 import com.pms.ocp.model.vo.ResponseVO;
-import com.pms.ocp.service.OcpTenantExtentService;
 import com.pms.ocp.service.OcpTenantSubsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,12 +12,5 @@ import java.util.List;
 
 @Service
 public class OcpTenantSubsServiceImpl extends ServiceImpl<OcpTenantSubsMapper, OcpTenantSubs> implements OcpTenantSubsService {
-    @Autowired
-    private OcpTenantSubsMapper ocpTenantSubsMapper;
 
-    @Override
-    public ResponseVO getOcpTenantList(OcpTenantSubs ocpTenantSubs) {
-        List<OcpTenantSubs> ocpTenantList = ocpTenantSubsMapper.getOcpTenantList(ocpTenantSubs);
-        return ResponseVO.ok(ocpTenantList);
-    }
 }
\ No newline at end of file

src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java → src/main/java/com/pms/ocp/service/impl/PmsApiAuditServiceImpl.java

@@ -7,61 +7,62 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.common.constants.AnalysisConstant;
 import com.pms.ocp.common.constants.ExportUtils;
 import com.pms.ocp.mapper.OcpApiAuditMapper;
+import com.pms.ocp.mapper.PmsApiAuditMapper;
 import com.pms.ocp.model.entity.OcpApiAudit;
+import com.pms.ocp.model.entity.PmsApiAudit;
 import com.pms.ocp.model.vo.ResponseVO;
-import com.pms.ocp.service.OcpApiAuditService;
+import com.pms.ocp.service.PmsApiAuditService;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @Service
-public class OcpApiAuditServiceImpl extends ServiceImpl<OcpApiAuditMapper,OcpApiAudit> implements OcpApiAuditService {
+public class PmsApiAuditServiceImpl extends ServiceImpl<PmsApiAuditMapper,PmsApiAudit> implements PmsApiAuditService {
 
     @Autowired
-    private OcpApiAuditMapper ocpApiAuditMapper;
+    private PmsApiAuditMapper pmsApiAuditMapper;
 
     @Override
-    public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) {
-        List<OcpApiAudit> ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit);
-        return ResponseVO.ok(ocpApiAuditList);
+    public ResponseVO getOcpApiAuditList(PmsApiAudit pmsApiAudit) {
+        List<PmsApiAudit> pmsApiAuditList = pmsApiAuditMapper.getOcpApiSubsList(pmsApiAudit);
+        return ResponseVO.ok(pmsApiAuditList);
     }
 
 
     @Override
     public ResponseVO getOcpApiDetails(String objId) {
-        OcpApiAudit ocpApiAudit = ocpApiAuditMapper.selectById(objId);
-        return ResponseVO.ok(ocpApiAudit);
+        PmsApiAudit pmsApiAudit = pmsApiAuditMapper.selectById(objId);
+        return ResponseVO.ok(pmsApiAudit);
     }
 
     @Override
-    public ResponseVO OaaById(OcpApiAudit ocpApiAudit) {
-        List<OcpApiAudit> oaaById = ocpApiAuditMapper.OaaById(ocpApiAudit);
-        return ResponseVO.ok(oaaById);
+    public ResponseVO OaaById(PmsApiAudit pmsApiAudit) {
+        List<PmsApiAudit> paam = pmsApiAuditMapper.OaaById(pmsApiAudit);
+        return ResponseVO.ok(paam);
     }
 
     @Override
-    public ResponseVO sById(OcpApiAudit ocpApiAudit) {
-        List<OcpApiAudit> oaaById = ocpApiAuditMapper.sById(ocpApiAudit);
+    public ResponseVO sById(PmsApiAudit pmsApiAudit) {
+        List<PmsApiAudit> oaaById = pmsApiAuditMapper.sById(pmsApiAudit);
         return ResponseVO.ok(oaaById);
     }
 
     @Override
-    public void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) {
-        List<OcpApiAudit> oaaById = ocpApiAuditMapper.OaaById(ocpApiAudit);
-        ExportParams param = new ExportParams(AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT);
-        Workbook workbook = ExcelExportUtil.exportExcel(param,OcpApiAudit.class,oaaById);
-        ExportUtils.exportExcel(response, AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,workbook);
+    public void exportExcel(PmsApiAudit pmsApiAudit, HttpServletRequest request, HttpServletResponse response) {
+        List<PmsApiAudit> oaaById = pmsApiAuditMapper.OaaById(pmsApiAudit);
+        ExportParams param = new ExportParams(AnalysisConstant.exportOcpApiAuditName.OCPAPIAUDITNAME,AnalysisConstant.exportOcpApiAuditName.OCPAPIAUDITNAME);
+        Workbook workbook = ExcelExportUtil.exportExcel(param,PmsApiAudit.class,oaaById);
+        ExportUtils.exportExcel(response, AnalysisConstant.exportOcpApiAuditName.OCPAPIAUDIT,workbook);
     }
 
     @Override
-    public ResponseVO versionId(OcpApiAudit ocpApiAudit) {
-        List<OcpApiAudit> ocpApiAuditList = ocpApiAuditMapper.versionId(ocpApiAudit);
-        return ResponseVO.ok(ocpApiAuditList);
+    public ResponseVO versionId(PmsApiAudit pmsApiAudit) {
+        List<PmsApiAudit> pmsApiAuditList = pmsApiAuditMapper.versionId(pmsApiAudit);
+        return ResponseVO.ok(pmsApiAuditList);
     }
 
 

src/main/java/com/pms/ocp/service/impl/OcpApiBaseServiceImpl.java → src/main/java/com/pms/ocp/service/impl/PmsApiBaseServiceImpl.java

@@ -3,11 +3,10 @@ package com.pms.ocp.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.mapper.OcpApiBaseMapper;
 import com.pms.ocp.model.entity.OcpApiBase;
-import com.pms.ocp.service.OcpApiBaseService;
-import com.pms.ocp.service.OcpApiTreeService;
+import com.pms.ocp.service.PmsApiBaseService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class OcpApiBaseServiceImpl extends ServiceImpl<OcpApiBaseMapper,OcpApiBase> implements OcpApiBaseService {
+public class PmsApiBaseServiceImpl extends ServiceImpl<OcpApiBaseMapper,OcpApiBase> implements PmsApiBaseService {
 
 }

src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java → src/main/java/com/pms/ocp/service/impl/PmsApiModelRelServiceImpl.java

 package com.pms.ocp.service.impl;
 
+
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.pms.ocp.mapper.OcpApiModelRelMapper;
-import com.pms.ocp.model.entity.OcpApiModelRel;
+import com.pms.ocp.mapper.PmsApiModelRelMapper;
+import com.pms.ocp.model.entity.PmsApiModelRel;
 import com.pms.ocp.model.vo.ResponseVO;
-import com.pms.ocp.service.OcpApiModelRelService;
+import com.pms.ocp.service.PmsApiModelRelService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 
 @Service
-public class OcpApiModelRelServiceImpl extends ServiceImpl<OcpApiModelRelMapper,OcpApiModelRel> implements OcpApiModelRelService {
+public class PmsApiModelRelServiceImpl extends ServiceImpl<PmsApiModelRelMapper,PmsApiModelRel> implements PmsApiModelRelService {
     @Autowired
-    private OcpApiModelRelMapper ocpApiModelRelMapper;
+    private PmsApiModelRelMapper pmsApiModelRelMapper;
     @Override
-    public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) {
-        List<OcpApiModelRel> ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel);
-        return ResponseVO.ok(ocpApiModelRelList);
+    public ResponseVO getOamrList(PmsApiModelRel pmsApiModelRel) {
+        List<PmsApiModelRel> pmsApiModelRelList = pmsApiModelRelMapper.getOamrList(pmsApiModelRel);
+        return ResponseVO.ok(pmsApiModelRelList);
     }
 }

src/main/java/com/pms/ocp/service/impl/PmsApiSubsServiceImpl.java

+package com.pms.ocp.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.mapper.OcpApiSubsMapper;
+import com.pms.ocp.mapper.PmsApiSubsMapper;
+import com.pms.ocp.model.entity.OcpApiSubs;
+import com.pms.ocp.model.entity.PmsApiSubs;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.PmsApiSubsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PmsApiSubsServiceImpl extends ServiceImpl<PmsApiSubsMapper,PmsApiSubs> implements PmsApiSubsService {
+
+    @Autowired
+    private PmsApiSubsMapper pmsApiSubsMapper;
+    @Override
+    public ResponseVO getPmsApiSubsList(PmsApiSubs pmsApiSubs) {
+        List<PmsApiSubs> pmsApiSubsList = pmsApiSubsMapper.getOcpApisList(pmsApiSubs);
+        return ResponseVO.ok(pmsApiSubsList);
+    }
+}

src/main/java/com/pms/ocp/service/impl/PmsApiTenantRelServiceImpl.java

+package com.pms.ocp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.mapper.OcpApiTenantRelMapper;
+import com.pms.ocp.mapper.PmsApiTenantRelMapper;
+import com.pms.ocp.model.entity.OcpApiTenantRel;
+import com.pms.ocp.model.entity.PmsApiTenantRel;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.PmsApiTenantRelService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+@Service
+public class PmsApiTenantRelServiceImpl extends ServiceImpl<PmsApiTenantRelMapper, PmsApiTenantRel> implements PmsApiTenantRelService {
+    @Autowired
+    private PmsApiTenantRelMapper pmsApiTenantRelMapper;
+
+
+    @Override
+    public ResponseVO getOatrList(PmsApiTenantRel pmsApiTenantRel) {
+        List<PmsApiTenantRel> oatrList = pmsApiTenantRelMapper.getOatrList(pmsApiTenantRel);
+        return ResponseVO.ok(oatrList);
+    }
+
+    @Override
+    public ResponseVO getTenantApiList(PmsApiTenantRel pmsApiTenantRel) {
+        List<PmsApiTenantRel> oatrList = pmsApiTenantRelMapper.getTenantApiList(pmsApiTenantRel);
+        return ResponseVO.ok(oatrList);
+    }
+}

src/main/java/com/pms/ocp/service/impl/PmsTenantAuditServiceImpl.java

+package com.pms.ocp.service.impl;
+
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.common.constants.AnalysisConstant;
+import com.pms.ocp.common.constants.ExportUtils;
+import com.pms.ocp.mapper.OcpApiTenantRelMapper;
+import com.pms.ocp.mapper.OcpTenantAuditMapper;
+import com.pms.ocp.mapper.PmsApiTenantRelMapper;
+import com.pms.ocp.mapper.PmsTenantAuditMapper;
+import com.pms.ocp.model.entity.OcpApiTenantRel;
+import com.pms.ocp.model.entity.OcpTenantAudit;
+import com.pms.ocp.model.entity.PmsTenantAudit;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpTenantAuditService;
+import com.pms.ocp.service.PmsTenantAuditService;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+@Service
+public class PmsTenantAuditServiceImpl extends ServiceImpl<PmsTenantAuditMapper, PmsTenantAudit> implements PmsTenantAuditService {
+    @Autowired
+    private PmsTenantAuditMapper pmsTenantAuditMapper;
+
+    @Autowired
+    private PmsApiTenantRelMapper pmsApiTenantRelMapper;
+
+    @Override
+    public ResponseVO getOtaList(PmsTenantAudit pmsTenantAudit) {
+        List<PmsTenantAudit> otaList = pmsTenantAuditMapper.getOtaList(pmsTenantAudit);
+        return ResponseVO.ok(otaList);
+    }
+
+    @Override
+    public ResponseVO getOtaListById(PmsTenantAudit pmsTenantAudit) {
+        List<PmsTenantAudit> otaListById = pmsTenantAuditMapper.getOtaListById(pmsTenantAudit);
+        return ResponseVO.ok(otaListById);
+    }
+
+    @Override
+    public void exportExcel(PmsTenantAudit pmsTenantAudit, HttpServletRequest request, HttpServletResponse response) {
+        List<PmsTenantAudit> otaListById = pmsTenantAuditMapper.versionId(pmsTenantAudit);
+        ExportParams param = new ExportParams(AnalysisConstant.exportOcpTenantApiName.OCPTENANTAPINAME,AnalysisConstant.exportOcpTenantApiName.OCPTENANTAPINAME);
+        Workbook workbook = ExcelExportUtil.exportExcel(param, PmsTenantAudit.class,otaListById);
+        ExportUtils.exportExcel(response, AnalysisConstant.exportOcpTenantApiName.OCPTENANTAPINAME,workbook);
+    }
+
+    @Override
+    public ResponseVO OtaById(PmsTenantAudit pmsTenantAudit) {
+        List<PmsTenantAudit> oatrList = pmsTenantAuditMapper.OtaById(pmsTenantAudit);
+        return ResponseVO.ok(oatrList);
+    }
+
+    @Override
+    public ResponseVO versionId(PmsTenantAudit pmsTenantAudit) {
+        List<PmsTenantAudit> ocpTenantAudits = pmsTenantAuditMapper.versionId(pmsTenantAudit);
+        return ResponseVO.ok(ocpTenantAudits);
+    }
+
+
+}

src/main/java/com/pms/ocp/service/impl/PmsTenantBaseServiceImpl.java

+package com.pms.ocp.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.mapper.PmsTenantBaseMapper;
+import com.pms.ocp.model.entity.PmsTenantBase;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.PmsTenantBaseService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+@Service
+public class PmsTenantBaseServiceImpl extends ServiceImpl<PmsTenantBaseMapper,PmsTenantBase> implements PmsTenantBaseService {
+
+    @Autowired
+    private PmsTenantBaseMapper pmsTenantBaseMapper;
+    @Override
+    public ResponseVO getOtbList(PmsTenantBase pmsTenantBase) {
+        List<PmsTenantBase> otbList = pmsTenantBaseMapper.getOtbList(pmsTenantBase);
+        return ResponseVO.ok(otbList);
+    }
+}

src/main/java/com/pms/ocp/service/impl/PmsTenantSubsServiceImpl.java

+package com.pms.ocp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.mapper.OcpTenantSubsMapper;
+import com.pms.ocp.mapper.PmsTenantSubsMapper;
+import com.pms.ocp.model.entity.OcpTenantSubs;
+import com.pms.ocp.model.entity.PmsTenantSubs;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpTenantExtentService;
+import com.pms.ocp.service.OcpTenantSubsService;
+import com.pms.ocp.service.PmsTenantSubsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class PmsTenantSubsServiceImpl extends ServiceImpl<PmsTenantSubsMapper, PmsTenantSubs> implements PmsTenantSubsService {
+    @Autowired
+    private PmsTenantSubsMapper pmsTenantSubsMapper;
+
+    @Override
+    public ResponseVO getOcpTenantList(PmsTenantSubs pmsTenantSubs) {
+        List<PmsTenantSubs> ocpTenantList = pmsTenantSubsMapper.getOcpTenantList(pmsTenantSubs);
+        return ResponseVO.ok(ocpTenantList);
+    }
+}
\ No newline at end of file

src/main/resources/mapper/OcpApiAuditMapper.xml → src/main/resources/mapper/PmsApiAuditMapper.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.pms.ocp.mapper.OcpApiAuditMapper">
+<mapper namespace="com.pms.ocp.mapper.PmsApiAuditMapper">
 
-    <select id="OaaById" resultType="com.pms.ocp.model.entity.OcpApiAudit">
+    <select id="OaaById" resultType="com.pms.ocp.model.entity.PmsApiAudit">
         select * from ocp_api_audit oaa
          LEFT JOIN ocp_api_base oab
           on oaa.api_code = oab.api_code
            where oaa.api_code = #{apiCode}
     </select>
 
-    <select id="getOcpApiSubsList" resultType="com.pms.ocp.model.entity.OcpApiAudit">
-        select * from ocp_api_audit
+    <select id="getOcpApiSubsList" resultType="com.pms.ocp.model.entity.PmsApiAudit">
+        select
+        obj_id,
+        api_code,
+        oper_status,
+        oper_target,
+        audit_type,
+        audit_message,
+        audit_json,
+        audit_user_id,
+        audit_user_name,
+        audit_ctime,
+        audit_mtime,
+        is_delete,
+        apply_version,
+        pre_api_version
+         from ocp_api_audit
     </select>
 
-    <select id="sById" resultType="com.pms.ocp.model.entity.OcpApiAudit">
+    <select id="sById" resultType="com.pms.ocp.model.entity.PmsApiAudit">
         select * from ocp_api_audit where obj_id = #{objId}
     </select>
 
-    <select id="versionId" resultType="com.pms.ocp.model.entity.OcpApiAudit">
+    <select id="versionId" resultType="com.pms.ocp.model.entity.PmsApiAudit">
         select * from ocp_api_audit oaa
         LEFT JOIN ocp_api_base oab
         on oaa.api_code = oab.api_code

src/main/resources/mapper/OcpApiModelRelMapper.xml → src/main/resources/mapper/PmsApiModelRelMapper.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.pms.ocp.mapper.OcpApiModelRelMapper">
+<mapper namespace="com.pms.ocp.mapper.PmsApiModelRelMapper">
 
-    <select id="getOamrList" resultType="com.pms.ocp.model.entity.OcpApiModelRel">
-        select * from ocp_api_model_rel oamr
+    <select id="getOamrList" resultType="com.pms.ocp.model.entity.PmsApiModelRel">
+ select * from ocp_api_model_rel oamr
          LEFT JOIN ocp_model_base omb
          on oamr.model_code = omb.model_code
          INNER JOIN ocp_api_base oab
          on oamr.api_code = oab.api_code
-         where oamr.obj_id = #{objId}
+         where oamr.api_code = #{apiCode}
     </select>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/OcpApiSubsMapper.xml → src/main/resources/mapper/PmsApiSubsMapper.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.pms.ocp.mapper.OcpApiSubsMapper">
+<mapper namespace="com.pms.ocp.mapper.PmsApiSubsMapper">
 
 
 
-    <select id="getOcpApisList" resultType="com.pms.ocp.model.entity.OcpApiSubs">
+    <select id="getOcpApisList" resultType="com.pms.ocp.model.entity.PmsApiSubs">
         SELECT * from ocp_api_subs oas
          left JOIN ocp_api_base oab on
           oas.api_code = oab.api_code

src/main/resources/mapper/PmsApiTenantRelMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.pms.ocp.mapper.PmsApiTenantRelMapper">
+
+    <select id="getOatrList" resultType="com.pms.ocp.model.entity.PmsApiTenantRel">
+        SELECT * from ocp_api_tenant_rel
+         oa LEFT JOIN ocp_api_base  ab on
+         oa.api_code = ab.api_code INNER JOIN
+          ocp_tenant_base ot on ot.tenant_code =
+           oa.tenant_code where oa.api_code = #{apiCode}
+
+    </select>
+
+    <select id="getTenantApiList" resultType="com.pms.ocp.model.entity.PmsApiTenantRel">
+        SELECT * from ocp_api_tenant_rel
+         oa LEFT JOIN ocp_api_base  ab on
+         oa.api_code = ab.api_code INNER JOIN
+          ocp_tenant_base ot on ot.tenant_code =
+           oa.tenant_code where oa.tenant_code = #{tenantCode}
+    </select>
+</mapper>

src/main/resources/mapper/OcpTenantAuditMapper.xml → src/main/resources/mapper/PmsTenantAuditMapper.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.pms.ocp.mapper.OcpTenantAuditMapper">
-    <select id="getOtaList" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
+<mapper namespace="com.pms.ocp.mapper.PmsTenantAuditMapper">
+    <select id="getOtaList" resultType="com.pms.ocp.model.entity.PmsTenantAudit">
         select * from ocp_tenant_audit
     </select>
 
-    <select id="getOtaListById" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
+    <select id="getOtaListById" resultType="com.pms.ocp.model.entity.PmsTenantAudit">
         select * from ocp_tenant_audit where obj_id = #{objId}
     </select>
 
-    <select id="OtaById" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
+    <select id="OtaById" resultType="com.pms.ocp.model.entity.PmsTenantAudit">
         select * from ocp_tenant_audit ota
          LEFT JOIN ocp_tenant_base otb
           on ota.tenant_code = otb.tenant_code
            where ota.tenant_code = #{tenantCode}
     </select>
 
-    <select id="versionId" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
+    <select id="versionId" resultType="com.pms.ocp.model.entity.PmsTenantAudit">
         select * from ocp_tenant_audit ota
         LEFT JOIN ocp_tenant_base otb
         on ota.tenant_code = otb.tenant_code

src/main/resources/mapper/PmsTenantBaseMapper.xml

+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.pms.ocp.mapper.PmsTenantBaseMapper" >
+    <select id="getOtbList" resultType="com.pms.ocp.model.entity.PmsTenantBase">
+        select * from ocp_tenant_base otb
+        LEFT JOIN ocp_tenant_extent ote
+        on otb.tenant_code = ote.tenant_code
+        where otb.obj_id = #{objId}
+    </select>
+</mapper>
\ No newline at end of file

src/main/resources/mapper/OcpTenantSubsMapper.xml → src/main/resources/mapper/PmsTenantSubsMapper.xml

 <?xml version="1.0" encoding="utf-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.pms.ocp.mapper.OcpTenantSubsMapper">
+<mapper namespace="com.pms.ocp.mapper.PmsTenantSubsMapper">
 
-    <select id="getOcpTenantList" resultType="com.pms.ocp.model.entity.OcpTenantSubs">
+    <select id="getOcpTenantList" resultType="com.pms.ocp.model.entity.PmsTenantSubs">
         SELECT * from ocp_tenant_subs ots
          left JOIN ocp_tenant_base otb on
           ots.tenant_code = otb.tenant_code