问题修复

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

@@ -46,11 +46,11 @@ public class OcpApiDetailsController {
         return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit);
     }
 
-    @ApiOperation("服务大事记-查询详情")
-    @PostMapping("/getocpapidetails")
-    public ResponseVO<List<OcpApiAudit>> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){
-        return ocpApiAuditService.sById(ocpApiAudit);
-    }
+//    @ApiOperation("服务大事记-查询详情")
+//    @PostMapping("/getocpapidetails")
+//    public ResponseVO<List<OcpApiAudit>> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){
+//        return ocpApiAuditService.sById(ocpApiAudit);
+//    }
 
     @ApiOperation("服务大事记-查询详情-变更内容")
     @PostMapping("/getocpapi")
@@ -58,6 +58,12 @@ public class OcpApiDetailsController {
         return ocpApiAuditService.OaaById(ocpApiAudit);
     }
 
+    @ApiOperation("服务大事记-历史版本")
+    @PostMapping("/versionid")
+    public ResponseVO<List<OcpApiAudit>> versionId(@RequestBody OcpApiAudit ocpApiAudit){
+        return ocpApiAuditService.versionId(ocpApiAudit);
+    }
+
     @ApiOperation("服务与应用拓扑图-查询")
     @PostMapping("/getoatrlist")
     public ResponseVO<List<OcpApiTenantRel>> getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) {

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

@@ -10,13 +10,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.xml.transform.Result;
 import java.util.List;
 
 @Slf4j
@@ -50,11 +49,6 @@ public class OcpTenantDetailsController {
         return ocpTenantAuditService.getOtaList(ocpTenantAudit);
     }
 
-    @ApiOperation("应用大事记-查询详情")
-    @PostMapping("/getotaListById")
-    public ResponseVO<List<OcpApiAudit>> getOtaListById(@RequestBody OcpTenantAudit ocpTenantAudit) {
-        return ocpTenantAuditService.getOtaListById(ocpTenantAudit);
-    }
 
     @ApiOperation("应用订阅记录-查询")
     @PostMapping("/getOcpTenantList")
@@ -78,4 +72,12 @@ public class OcpTenantDetailsController {
     public ResponseVO<List<OcpTenantAudit>> getOcpTenant(@RequestBody OcpTenantAudit ocpTenantAudit){
         return ocpTenantAuditService.OtaById(ocpTenantAudit);
     }
+
+    @ApiOperation("应用大事记-查询详情-历史版本")
+    @PostMapping("/versionId")
+    public ResponseVO<List<OcpTenantAudit>> versionId(@RequestBody OcpTenantAudit ocpTenantAudit){
+        return ocpTenantAuditService.versionId(ocpTenantAudit);
+    }
+
+
 }

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

@@ -20,4 +20,6 @@ public interface OcpApiAuditMapper extends BaseMapper<OcpApiAudit> {
 
     List<OcpApiAudit> sById(OcpApiAudit ocpApiAudit);
 
+    List<OcpApiAudit> versionId (OcpApiAudit ocpApiAudit);
+
 }

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

@@ -11,4 +11,6 @@ public interface OcpTenantAuditMapper extends BaseMapper<OcpTenantAudit> {
     List<OcpTenantAudit> getOtaListById(OcpTenantAudit ocpTenantAudit);
 
     List<OcpTenantAudit> OtaById(OcpTenantAudit ocpTenantAudit);
+
+    List<OcpTenantAudit> versionId(OcpTenantAudit ocpTenantAudit);
 }

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

@@ -18,4 +18,6 @@ public interface OcpApiAuditService extends IService<OcpApiAudit> {
     ResponseVO sById(OcpApiAudit ocpApiAudit);
 
     void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response);
+
+    ResponseVO versionId(OcpApiAudit ocpApiAudit);
 }

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

@@ -16,4 +16,6 @@ public interface OcpTenantAuditService extends IService<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

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

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

@@ -58,5 +58,11 @@ public class OcpApiAuditServiceImpl extends ServiceImpl<OcpApiAuditMapper,OcpApi
         ExportUtils.exportExcel(response, AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,workbook);
     }
 
+    @Override
+    public ResponseVO versionId(OcpApiAudit ocpApiAudit) {
+        List<OcpApiAudit> ocpApiAuditList = ocpApiAuditMapper.versionId(ocpApiAudit);
+        return ResponseVO.ok(ocpApiAuditList);
+    }
+
 
 }

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

@@ -41,7 +41,7 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,
 
     @Override
     public void exportExcel(OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response) {
-        List<OcpTenantAudit> otaListById = ocpTenantAuditMapper.getOtaListById(ocpTenantAudit);
+        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);
@@ -52,4 +52,12 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,
         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

 package com.pms.ocp.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.common.constants.*;
+import com.pms.ocp.common.exception.ServiceException;
 import com.pms.ocp.mapper.OcpTenantBaseMapper;
 import com.pms.ocp.model.entity.OcpTenantBase;
 import com.pms.ocp.model.vo.ResponseVO;
@@ -8,10 +10,16 @@ import com.pms.ocp.service.OcpTenantBaseService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+
+import java.util.LinkedList;
 import java.util.List;
 
+
 @Service
 public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper,OcpTenantBase> implements OcpTenantBaseService {
+
+
+
     @Autowired
     private OcpTenantBaseMapper ocpTenantBaseMapper;
     @Override
@@ -19,4 +27,9 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl<OcpTenantBaseMapper,Oc
         List<OcpTenantBase> otbList = ocpTenantBaseMapper.getOtbList(ocpTenantBase);
         return ResponseVO.ok(otbList);
     }
+
+
+
+
+
 }

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 = #{objId}
+           where oaa.api_code = #{apiCode}
     </select>
 
     <select id="getOcpApiSubsList" resultType="com.pms.ocp.model.entity.OcpApiAudit">
@@ -16,4 +16,12 @@
     <select id="sById" resultType="com.pms.ocp.model.entity.OcpApiAudit">
         select * from ocp_api_audit where obj_id = #{objId}
     </select>
+
+    <select id="versionId" resultType="com.pms.ocp.model.entity.OcpApiAudit">
+        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>
 </mapper>
\ No newline at end of file

src/main/resources/mapper/OcpTenantAuditMapper.xml

@@ -13,6 +13,13 @@
         select * from ocp_tenant_audit ota
          LEFT JOIN ocp_tenant_base otb
           on ota.tenant_code = otb.tenant_code
-           where ota.obj_id = #{objId}
+           where ota.tenant_code = #{tenantCode}
+    </select>
+
+    <select id="versionId" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
+        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>
 </mapper>
\ No newline at end of file