From 5e8f7755667663a0aba2ed547b7dddc3fbe1593c Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 27 Feb 2025 18:09:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A1=E6=A3=80-?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E9=97=AE=E9=A2=98=E5=AF=BC=E5=87=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1365994327474176]巡检-最新问题导出异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1365994327474176 --- .../inspect/api/newproblem/InspectNewProblemReportExportApi.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java b/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java index d144b59..a8861db 100644 --- a/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java +++ b/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java @@ -121,7 +121,6 @@ public class InspectNewProblemReportExportApi extends PrivateBinaryStreamApiComp if (workbook == null) { List headerList = new ArrayList<>(); List columnList = new ArrayList<>(); -// buildHeaderListAndColumnList(headerList, columnList, isNeedAlertDetail); ExcelBuilder builder = new ExcelBuilder(SXSSFWorkbook.class); SheetBuilder sheetBuilder = builder.withBorderColor(HSSFColor.HSSFColorPredefined.GREY_40_PERCENT) -- Gitee From 44f782a99fff2c3a4ec5785e5cea2be0db8cd32c Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Thu, 27 Feb 2025 19:00:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=B7=A1=E6=A3=80-?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E9=97=AE=E9=A2=98=E5=AF=BC=E5=87=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1365994327474176]巡检-最新问题导出异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1365994327474176 --- .../api/newproblem/InspectNewProblemReportExportApi.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java b/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java index a8861db..f01cadf 100644 --- a/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java +++ b/src/main/java/neatlogic/module/inspect/api/newproblem/InspectNewProblemReportExportApi.java @@ -1,9 +1,9 @@ package neatlogic.module.inspect.api.newproblem; -import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import neatlogic.framework.auth.core.AuthAction; import neatlogic.framework.cmdb.crossover.ICiCrossoverMapper; +import neatlogic.framework.cmdb.crossover.IResourceCenterResourceCrossoverService; import neatlogic.framework.cmdb.crossover.IResourceCrossoverMapper; import neatlogic.framework.cmdb.dto.ci.CiVo; import neatlogic.framework.cmdb.dto.resourcecenter.ResourceSearchVo; @@ -86,7 +86,8 @@ public class InspectNewProblemReportExportApi extends PrivateBinaryStreamApiComp @Description(desc = "导出巡检最报告列表接口") @Override public Object myDoService(JSONObject paramObj, HttpServletRequest request, HttpServletResponse response) throws Exception { - ResourceSearchVo searchVo = JSON.toJavaObject(paramObj, ResourceSearchVo.class); + IResourceCenterResourceCrossoverService resourceCrossoverService = CrossoverServiceFactory.getApi(IResourceCenterResourceCrossoverService.class); + ResourceSearchVo searchVo = resourceCrossoverService.assembleResourceSearchVo(paramObj); Integer isNeedAlertDetail = paramObj.getInteger("isNeedAlertDetail"); if (isNeedAlertDetail == null) { isNeedAlertDetail = 0; -- Gitee