From 242e63b82eba239b1063861248a1543d4abbaee8 Mon Sep 17 00:00:00 2001 From: liukai <35074062@qq.com> Date: Thu, 10 Mar 2022 09:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8B=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocp/controller/OcpDetailsController.java | 35 ++- .../com/pms/ocp/mapper/OcpApiAuditMapper.java | 2 +- .../com/pms/ocp/model/entity/OcpApiAudit.java | 230 ------------------ .../com/pms/ocp/model/entity/OcpApiSubs.java | 12 - .../pms/ocp/service/OcpApiAuditService.java | 5 +- .../service/impl/OcpApiAuditServiceImpl.java | 28 ++- .../service/impl/OcpApiSubsServiceImpl.java | 3 + .../resources/mapper/OcpApiAuditMapper.xml | 4 +- 8 files changed, 41 insertions(+), 278 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/OcpDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpDetailsController.java index 903208d..49caf2a 100644 --- a/src/main/java/com/pms/ocp/controller/OcpDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpDetailsController.java @@ -15,16 +15,18 @@ 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 javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; + @Slf4j @RequestMapping("/tenant") @RestController -@Api(tags = "应用接口") +@Api(tags = "服务接口") public class OcpDetailsController { @Autowired @@ -42,55 +44,50 @@ public class OcpDetailsController { @ApiOperation("服务订阅记录-查询") @PostMapping("/getocpapisublist") - public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { + public ResponseVO getOcpApiSubsList(@RequestBody OcpApiSubs ocpApiSubs) { return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs); } @ApiOperation("服务大事记-查询") @PostMapping("/getocpapiauditlist") - public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) { + public ResponseVO getOcpApiAuditList(@RequestBody OcpApiAudit ocpApiAudit) { return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit); } @ApiOperation("服务大事记-查询详情") @PostMapping("/getocpapidetails") - public ResponseVO getOcpApiDetails(OcpApiAudit ocpApiAudit){ + public ResponseVO getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){ return ocpApiAuditService.sById(ocpApiAudit); } @ApiOperation("服务大事记-查询详情") @PostMapping("/getocpapi") - public ResponseVO getOcpApi(OcpApiAudit ocpApiAudit){ + public ResponseVO getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){ return ocpApiAuditService.OaaById(ocpApiAudit); } @ApiOperation("服务与应用拓扑图-查询") @PostMapping("/getoatrlist") - public ResponseVO getOatrList(OcpApiTenantRel ocpApiTenantRel) { + public ResponseVO getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { return ocpApiTenantRelService.getOatrList(ocpApiTenantRel); } @ApiOperation("服务与模型拓扑图-查询") @PostMapping("/getoamrlist") - public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) { + public ResponseVO getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) { return ocpApiModelRelService.getOamrList(ocpApiModelRel); } @ApiOperation("服务与模型拓扑图-关联查询详情") @PostMapping("/getoaabyid") - public ResponseVO OaaById(OcpApiAudit ocpApiAudit) { + public ResponseVO OaaById(@RequestBody OcpApiAudit ocpApiAudit) { return ocpApiAuditService.OaaById(ocpApiAudit); } -// @ApiOperation("服务大事记-导出") -// @RequestMapping("/export") -// public void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { -// ocpApiAuditService.exportExcel(ocpApiAudit,request,response); -// } - -// @ApiOperation("服务大事记-导出") -// @RequestMapping("/export") -// public void exportExcel(Oaa oaa, HttpServletRequest request, HttpServletResponse response) { -// oaaService.exportExcel(oaa, request, response); -// } + @ApiOperation("服务大事记-导出") + @RequestMapping("/export") + public void exportExcel(@RequestBody(required = false) OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { + ocpApiAuditService.exportExcel(ocpApiAudit,request,response); + } + } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java index 34ace9a..e9a61f2 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java @@ -14,7 +14,7 @@ import java.util.List; @Mapper public interface OcpApiAuditMapper extends BaseMapper { - List OaaById(OcpApiAudit ocpApiAudit); + List OaaById(OcpApiAudit ocpApiAudit); List getOcpApiSubsList(OcpApiAudit ocpApiAudit); diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java index e5e4a20..0b36e82 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java @@ -115,235 +115,5 @@ public class OcpApiAudit { @ApiModelProperty("服务版本（最新版本）") private long apiVersion; - public String getObjId() { - return objId; - } - public void setObjId(String objId) { - this.objId = objId; - } - - public String getApiCode() { - return apiCode; - } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - - public long getOperStatus() { - return operStatus; - } - - public void setOperStatus(long operStatus) { - this.operStatus = operStatus; - } - - public long getOperTarget() { - return operTarget; - } - - public void setOperTarget(long operTarget) { - this.operTarget = operTarget; - } - - public long getAuditType() { - return auditType; - } - - public void setAuditType(long auditType) { - this.auditType = auditType; - } - - public String getAuditMessage() { - return auditMessage; - } - - public void setAuditMessage(String auditMessage) { - this.auditMessage = auditMessage; - } - - public String getAuditJson() { - return auditJson; - } - - public void setAuditJson(String auditJson) { - this.auditJson = auditJson; - } - - public String getAuditUserId() { - return auditUserId; - } - - public void setAuditUserId(String auditUserId) { - this.auditUserId = auditUserId; - } - - public String getAuditUserName() { - return auditUserName; - } - - public void setAuditUserName(String auditUserName) { - this.auditUserName = auditUserName; - } - - public Timestamp getAuditCtime() { - return auditCtime; - } - - public void setAuditCtime(Timestamp auditCtime) { - this.auditCtime = auditCtime; - } - - public Timestamp getAuditMtime() { - return auditMtime; - } - - public void setAuditMtime(Timestamp auditMtime) { - this.auditMtime = auditMtime; - } - - public long getIsDelete() { - return isDelete; - } - - public void setIsDelete(long isDelete) { - this.isDelete = isDelete; - } - - public long getApplyVersion() { - return applyVersion; - } - - public void setApplyVersion(long applyVersion) { - this.applyVersion = applyVersion; - } - - public long getPreApiVersion() { - return preApiVersion; - } - - public void setPreApiVersion(long preApiVersion) { - this.preApiVersion = preApiVersion; - } - - 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; - } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java index 252932f..0685a19 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java @@ -40,7 +40,6 @@ public class OcpApiSubs { @ApiModelProperty("是否删除0-否，1-是") private long isDelete; - public String getObjId() { return objId; } @@ -49,7 +48,6 @@ public class OcpApiSubs { this.objId = objId; } - public String getApiCode() { return apiCode; } @@ -58,7 +56,6 @@ public class OcpApiSubs { this.apiCode = apiCode; } - public Timestamp getSubsLogApiCtime() { return subsLogApiCtime; } @@ -67,7 +64,6 @@ public class OcpApiSubs { this.subsLogApiCtime = subsLogApiCtime; } - public Timestamp getSubsLogApiMtime() { return subsLogApiMtime; } @@ -76,7 +72,6 @@ public class OcpApiSubs { this.subsLogApiMtime = subsLogApiMtime; } - public String getSubsLogApiUserId() { return subsLogApiUserId; } @@ -85,7 +80,6 @@ public class OcpApiSubs { this.subsLogApiUserId = subsLogApiUserId; } - public Timestamp getSubsLogApiAtime() { return subsLogApiAtime; } @@ -94,7 +88,6 @@ public class OcpApiSubs { this.subsLogApiAtime = subsLogApiAtime; } - public String getSubsCompanyCode() { return subsCompanyCode; } @@ -103,11 +96,6 @@ public class OcpApiSubs { this.subsCompanyCode = subsCompanyCode; } - - public long getIsDelete() { - return isDelete; - } - public void setIsDelete(long isDelete) { this.isDelete = isDelete; } diff --git a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java index 4ac0596..8983669 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java @@ -3,6 +3,9 @@ package com.pms.ocp.service; import com.pms.ocp.model.entity.OcpApiAudit; import com.pms.ocp.model.vo.ResponseVO; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + public interface OcpApiAuditService { ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit); @@ -15,5 +18,5 @@ public interface OcpApiAuditService { ResponseVO sById(OcpApiAudit ocpApiAudit); -// void exportExcel(Oaa oaa, HttpServletRequest request, HttpServletResponse response); + void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response); } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java index c0e2548..a070965 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java @@ -1,14 +1,21 @@ package com.pms.ocp.service.impl; +import cn.afterturn.easypoi.excel.ExcelExportUtil; +import cn.afterturn.easypoi.excel.entity.ExportParams; +import com.pms.ocp.common.constants.AnalysisConstant; +import com.pms.ocp.common.constants.ExportUtils; import com.pms.ocp.mapper.OcpApiAuditMapper; import com.pms.ocp.model.entity.OcpApiAudit; import com.pms.ocp.model.vo.ResponseVO; import com.pms.ocp.service.OcpApiAuditService; +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 @@ -27,11 +34,6 @@ public class OcpApiAuditServiceImpl implements OcpApiAuditService { } } -// @Override -// public ResponseVO getOcpApiList(Oaa oaa) { -// List list = ocpApiAuditMapper.getOcpApiSubsList(oaa); -// return ResponseVO.ok(list); -// } @Override public ResponseVO getOcpApiDetails(String objId) { @@ -41,7 +43,7 @@ public class OcpApiAuditServiceImpl implements OcpApiAuditService { @Override public ResponseVO OaaById(OcpApiAudit ocpApiAudit) { - List oaaById = ocpApiAuditMapper.OaaById(ocpApiAudit); + List oaaById = ocpApiAuditMapper.OaaById(ocpApiAudit); return ResponseVO.ok(oaaById); } @@ -51,13 +53,13 @@ public class OcpApiAuditServiceImpl implements OcpApiAuditService { return ResponseVO.ok(oaaById); } -// @Override -// public void exportExcel(Oaa oaa, HttpServletRequest request, HttpServletResponse response) { -// List list = ocpApiAuditMapper.selectList(oaa); -// ExportParams param = new ExportParams(AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT); -// Workbook workbook = ExcelExportUtil.exportExcel(param,OcpApiAudit.class,list); -// ExportUtils.exportExcel(response, AnalysisConstant.exportOcpApiAuditName.OCP_API_AUDIT,workbook); -// } + @Override + public void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { + List 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); + } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java index baab60b..8b37950 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java @@ -1,10 +1,12 @@ 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; @@ -19,6 +21,7 @@ public class OcpApiSubsServiceImpl implements OcpApiSubsService { @Override public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { List ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs); + QueryWrapper qw = new QueryWrapper(); if(CollectionUtils.isEmpty(ocpApiSubsList)){ return ResponseVO.error("查询列表为空"); }else{ diff --git a/src/main/resources/mapper/OcpApiAuditMapper.xml b/src/main/resources/mapper/OcpApiAuditMapper.xml index 115806b..2685ce3 100644 --- a/src/main/resources/mapper/OcpApiAuditMapper.xml +++ b/src/main/resources/mapper/OcpApiAuditMapper.xml @@ -2,11 +2,11 @@ - 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.obj_id = '1'