应用大事记

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

@@ -25,7 +25,7 @@ public class PmsTenantDetailsController {
     private PmsTenantBaseService pmsTenantBaseService;
 
     @Autowired
-    private OcpTenantAuditService ocpTenantAuditService;
+    private PmsTenantAuditService pmsTenantAuditService;
 
     @Autowired
     private PmsTenantSubsService pmsTenantSubsService;
@@ -42,8 +42,8 @@ public class PmsTenantDetailsController {
 
     @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);
     }
 
 
@@ -60,20 +60,21 @@ public class PmsTenantDetailsController {
 //    }
 
     @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/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/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/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/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.OCPTENANTAPINAME,AnalysisConstant.exportOcpTenantApiName.OCPTENANTAPINAME);
-        Workbook workbook = ExcelExportUtil.exportExcel(param, OcpTenantAudit.class,otaListById);
-        ExportUtils.exportExcel(response, AnalysisConstant.exportOcpTenantApiName.OCPTENANTAPINAME,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/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/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.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.PmsTenantAudit">
+        select * from ocp_tenant_audit where obj_id = #{objId}
+    </select>
+
+    <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.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>
+</mapper>
\ No newline at end of file