问题修复

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

@@ -51,7 +51,7 @@ public class OcpApiDetailsController {
         return ocpApiAuditService.sById(ocpApiAudit);
     }
 
-    @ApiOperation("服务大事记-查询详情")
+    @ApiOperation("服务大事记-查询详情-变更内容")
     @PostMapping("/getocpapi")
     public ResponseVO getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){
         return ocpApiAuditService.OaaById(ocpApiAudit);
@@ -65,16 +65,10 @@ public class OcpApiDetailsController {
 
     @ApiOperation("服务与模型拓扑图-查询")
     @PostMapping("/getoamrlist")
-    public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) {
+    public ResponseVO getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) {
         return ocpApiModelRelService.getOamrList(ocpApiModelRel);
     }
 
-    @ApiOperation("服务与模型拓扑图-关联查询详情")
-    @PostMapping("/getoaabyid")
-    public ResponseVO OaaById(@RequestBody OcpApiAudit ocpApiAudit) {
-        return ocpApiAuditService.OaaById(ocpApiAudit);
-    }
-
     @ApiOperation("服务大事记-导出")
     @GetMapping("/export")
     public void exportExcel(@RequestBody OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) {

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

 package com.pms.ocp.controller;
 
+import com.pms.ocp.model.entity.OcpTenantAudit;
 import com.pms.ocp.model.entity.OcpTenantBase;
 import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpApiAuditService;
+import com.pms.ocp.service.OcpTenantAuditService;
 import com.pms.ocp.service.OcpTenantBaseService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,9 +23,19 @@ public class OcpTenantDetailsController {
 
     @Autowired
     private OcpTenantBaseService ocpTenantBaseService;
+
+    @Autowired
+    private OcpTenantAuditService ocpTenantAuditService;
+
     @ApiOperation("应用基础信息-查询")
     @PostMapping("/getotbList")
     public ResponseVO getOtbList(@RequestBody OcpTenantBase ocpTenantBase){
         return ocpTenantBaseService.getOtbList(ocpTenantBase);
     }
+
+    @ApiOperation("应用大事记-查询")
+    @PostMapping("/getotaList")
+    public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) {
+        return ocpTenantAuditService.getOtaList(ocpTenantAudit);
+    }
 }

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpTenantAudit;
+
+import java.util.List;
+
+public interface OcpTenantAuditMapper extends BaseMapper<OcpTenantAudit> {
+    List<OcpTenantAudit> getOtaList(OcpTenantAudit ocpTenantAudit);
+}

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

@@ -40,6 +40,51 @@ public class OcpApiSubs {
   @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 long apiVersion;
+
   public String getObjId() {
     return objId;
   }
@@ -96,8 +141,131 @@ public class OcpApiSubs {
     this.subsCompanyCode = subsCompanyCode;
   }
 
+  public long getIsDelete() {
+    return isDelete;
+  }
+
   public void setIsDelete(long isDelete) {
     this.isDelete = isDelete;
   }
 
+  public String getApiName() {
+    return apiName;
+  }
+
+  public void setApiName(String apiName) {
+    this.apiName = apiName;
+  }
+
+  public String getApiGroupCode() {
+    return apiGroupCode;
+  }
+
+  public void setApiGroupCode(String apiGroupCode) {
+    this.apiGroupCode = apiGroupCode;
+  }
+
+  public long getApiPromotion() {
+    return apiPromotion;
+  }
+
+  public void setApiPromotion(long apiPromotion) {
+    this.apiPromotion = apiPromotion;
+  }
+
+  public String getApiReq() {
+    return apiReq;
+  }
+
+  public void setApiReq(String apiReq) {
+    this.apiReq = apiReq;
+  }
+
+  public String getApiResp() {
+    return apiResp;
+  }
+
+  public void setApiResp(String apiResp) {
+    this.apiResp = apiResp;
+  }
+
+  public String getApiUrl() {
+    return apiUrl;
+  }
+
+  public void setApiUrl(String apiUrl) {
+    this.apiUrl = apiUrl;
+  }
+
+  public Timestamp getApiCtime() {
+    return apiCtime;
+  }
+
+  public void setApiCtime(Timestamp apiCtime) {
+    this.apiCtime = apiCtime;
+  }
+
+  public Timestamp getApiMtime() {
+    return apiMtime;
+  }
+
+  public void setApiMtime(Timestamp apiMtime) {
+    this.apiMtime = apiMtime;
+  }
+
+  public String getApiUserId() {
+    return apiUserId;
+  }
+
+  public void setApiUserId(String apiUserId) {
+    this.apiUserId = apiUserId;
+  }
+
+  public String getApiUnit() {
+    return apiUnit;
+  }
+
+  public void setApiUnit(String apiUnit) {
+    this.apiUnit = apiUnit;
+  }
+
+  public String getOwnerCompanyCode() {
+    return ownerCompanyCode;
+  }
+
+  public void setOwnerCompanyCode(String ownerCompanyCode) {
+    this.ownerCompanyCode = ownerCompanyCode;
+  }
+
+  public String getOwnerCompanyName() {
+    return ownerCompanyName;
+  }
+
+  public void setOwnerCompanyName(String ownerCompanyName) {
+    this.ownerCompanyName = ownerCompanyName;
+  }
+
+  public long getApiZone() {
+    return apiZone;
+  }
+
+  public void setApiZone(long apiZone) {
+    this.apiZone = apiZone;
+  }
+
+  public long getApiLayer() {
+    return apiLayer;
+  }
+
+  public void setApiLayer(long apiLayer) {
+    this.apiLayer = apiLayer;
+  }
+
+  public long getApiVersion() {
+    return apiVersion;
+  }
+
+  public void setApiVersion(long apiVersion) {
+    this.apiVersion = apiVersion;
+  }
 }

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

+package com.pms.ocp.service;
+
+import com.pms.ocp.model.entity.OcpTenantAudit;
+import com.pms.ocp.model.vo.ResponseVO;
+
+public interface OcpTenantAuditService {
+    ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit);
+}

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

@@ -3,6 +3,7 @@ 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.OcpApiAuditMapper;
@@ -19,7 +20,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 @Service
-public class OcpApiAuditServiceImpl implements OcpApiAuditService {
+public class OcpApiAuditServiceImpl extends ServiceImpl<OcpApiAuditMapper,OcpApiAudit> implements OcpApiAuditService {
 
     @Autowired
     private OcpApiAuditMapper ocpApiAuditMapper;

src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.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.model.vo.ResponseVO;
@@ -10,7 +11,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 @Service
-public class OcpApiModelRelServiceImpl implements OcpApiModelRelService {
+public class OcpApiModelRelServiceImpl extends ServiceImpl<OcpApiModelRelMapper,OcpApiModelRel> implements OcpApiModelRelService {
     @Autowired
     private OcpApiModelRelMapper ocpApiModelRelMapper;
     @Override

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

@@ -14,14 +14,13 @@ import org.springframework.util.CollectionUtils;
 import java.util.List;
 
 @Service
-public class OcpApiSubsServiceImpl implements OcpApiSubsService {
+public class OcpApiSubsServiceImpl extends ServiceImpl<OcpApiSubsMapper,OcpApiSubs> implements OcpApiSubsService {
 
     @Autowired
     private OcpApiSubsMapper ocpApiSubsMapper;
     @Override
     public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) {
         List<String> ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs);
-        QueryWrapper qw = new QueryWrapper();
         if(CollectionUtils.isEmpty(ocpApiSubsList)){
             return ResponseVO.error("查询列表为空");
         }else{

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;
@@ -11,7 +12,7 @@ import java.util.List;
 
 
 @Service
-public class OcpApiTenantRelServiceImpl implements OcpApiTenantRelService {
+public class OcpApiTenantRelServiceImpl extends ServiceImpl<OcpApiTenantRelMapper,OcpApiTenantRel> implements OcpApiTenantRelService {
     @Autowired
     private OcpApiTenantRelMapper ocpApiTenantRelMapper;
 

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

+package com.pms.ocp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.mapper.OcpTenantAuditMapper;
+import com.pms.ocp.model.entity.OcpTenantAudit;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpTenantAuditService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service
+public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,OcpTenantAudit> implements OcpTenantAuditService {
+    @Autowired
+    private OcpTenantAuditMapper ocpTenantAuditMapper;
+
+    @Override
+    public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) {
+        List<OcpTenantAudit> otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit);
+        return ResponseVO.ok(otaList);
+    }
+}

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

 package com.pms.ocp.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.mapper.OcpTenantBaseMapper;
 import com.pms.ocp.model.entity.OcpTenantBase;
 import com.pms.ocp.model.vo.ResponseVO;
@@ -10,7 +11,7 @@ import org.springframework.stereotype.Service;
 import java.util.List;
 
 @Service
-public class OcpTenantBaseServiceImpl implements OcpTenantBaseService {
+public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper,OcpTenantBase> implements OcpTenantBaseService {
     @Autowired
     private OcpTenantBaseMapper ocpTenantBaseMapper;
     @Override

src/main/resources/mapper/OcpApiAuditMapper.xml

@@ -6,7 +6,7 @@
         select * from ocp_api_audit oaa
          LEFT JOIN ocp_api_base oab
           on oaa.api_code = oab.api_code
-           where oaa.obj_id = '1'
+           where oaa.obj_id = #{objId}
     </select>
 
     <select id="getOcpApiSubsList" resultType="java.lang.String">

src/main/resources/mapper/OcpTenantAuditMapper.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">
+        select * from ocp_tenant_audit
+    </select>
+</mapper>
\ No newline at end of file