From 915e038219cb98b78745e40b7fa4f54dd2a1ceeb Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 23 Jul 2024 11:31:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=9F=BA=E7=A1=80=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=EF=BC=9A=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/enums/ErrorCodeConstants.java | 20 +++++++++---------- .../bean/OrderSummaryBeanDatasource.java | 8 +++++--- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/enums/ErrorCodeConstants.java b/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/enums/ErrorCodeConstants.java index 540412f57..8179c7e81 100644 --- a/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/enums/ErrorCodeConstants.java +++ b/cf-module-report/cf-module-report-api/src/main/java/com/cf/imes/module/report/enums/ErrorCodeConstants.java @@ -8,20 +8,20 @@ import com.cf.imes.framework.common.exception.ErrorCode; *

* report 系统，使用 1-003-000-000 段 */ -public interface ErrorCodeConstants { +public final class ErrorCodeConstants { // ========== UREPORT template模块 1-003-001-000 ========== - ErrorCode TEMPLATE_NOT_EXISTS = new ErrorCode(1_003_001_001, "报表模板信息不存在"); - ErrorCode TEMPLATE_GENERATE_EXCEL_ERROR = new ErrorCode(1_003_001_002, "模板excel生成异常"); + public static ErrorCode TEMPLATE_NOT_EXISTS = new ErrorCode(1_003_001_001, "报表模板信息不存在"); + public static ErrorCode TEMPLATE_GENERATE_EXCEL_ERROR = new ErrorCode(1_003_001_002, "模板excel生成异常"); // ========== UREPORT datasource模块 1-003-002-000 ========== - ErrorCode DATASOURCE_NOT_EXISTS = new ErrorCode(1_003_002_001, "报表数据源不存在"); - ErrorCode DATASOURCE_CONNECT_FAIL = new ErrorCode(1_003_002_001, "报表数据源连接失败"); + public static ErrorCode DATASOURCE_NOT_EXISTS = new ErrorCode(1_003_002_001, "报表数据源不存在"); + public static ErrorCode DATASOURCE_CONNECT_FAIL = new ErrorCode(1_003_002_001, "报表数据源连接失败"); // ========== UREPORT dataset模块 1-003-003-000 ========== - ErrorCode DATASET_NOT_EXISTS = new ErrorCode(1_003_003_001, "报表数据集不存在"); - ErrorCode DATASET_SQL_INJECTION_RISK = new ErrorCode(1_003_003_002, "存在SQL注入风险"); - ErrorCode DATASET_SQL_REQUIRED = new ErrorCode(1_003_003_003, "SQL语句不能为空"); - ErrorCode DATASET_SQL_ILLEGAL = new ErrorCode(1_003_003_004, "SQL语句非法"); - ErrorCode DATASET_GET_FIELDS_ERROR = new ErrorCode(1_003_003_005, "获取表字段"); + public static ErrorCode DATASET_NOT_EXISTS = new ErrorCode(1_003_003_001, "报表数据集不存在"); + public static ErrorCode DATASET_SQL_INJECTION_RISK = new ErrorCode(1_003_003_002, "存在SQL注入风险"); + public static ErrorCode DATASET_SQL_REQUIRED = new ErrorCode(1_003_003_003, "SQL语句不能为空"); + public static ErrorCode DATASET_SQL_ILLEGAL = new ErrorCode(1_003_003_004, "SQL语句非法"); + public static ErrorCode DATASET_GET_FIELDS_ERROR = new ErrorCode(1_003_003_005, "获取表字段"); } diff --git a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/framework/ureport/bean/OrderSummaryBeanDatasource.java b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/framework/ureport/bean/OrderSummaryBeanDatasource.java index 005f58364..f9f3f6c3e 100644 --- a/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/framework/ureport/bean/OrderSummaryBeanDatasource.java +++ b/cf-module-report/cf-module-report-biz/src/main/java/com/cf/imes/module/report/framework/ureport/bean/OrderSummaryBeanDatasource.java @@ -33,6 +33,8 @@ public class OrderSummaryBeanDatasource { @Resource private OrderDatasourceApi orderDatasourceApi; + private static final String ORDER_ID_FIELD_NAME = "orderId"; + /** * 生产单信息 * @@ -44,7 +46,7 @@ public class OrderSummaryBeanDatasource { public List> orderInfo(String dsName, String datasetName, Map parameters) { List> resultList = new ArrayList<>(); - Object orderId = parameters.get("orderId"); + Object orderId = parameters.get(ORDER_ID_FIELD_NAME); if (ObjectUtil.isNull(orderId)) { return resultList; @@ -58,7 +60,7 @@ public class OrderSummaryBeanDatasource { // 把orderInfo转map并put到resultList中 resultList.add(new HashMap<>() {{ // 构造报表所需结构 - put("orderId", orderDTO.getId()); + put(ORDER_ID_FIELD_NAME, orderDTO.getId()); put("customOrderNo", orderDTO.getCustomOrderNo()); put("dealer", orderDTO.getDealer()); LocalDateTime orderDate = orderDTO.getOrderDate(); @@ -83,7 +85,7 @@ public class OrderSummaryBeanDatasource { public List> orderPlateSummaryByPlate(String dsName, String datasetName, Map parameters) { List> resultList = new ArrayList<>(); - Object orderId = parameters.get("orderId"); + Object orderId = parameters.get(ORDER_ID_FIELD_NAME); // 查询统计信息 CommonResult> commonResult = orderPlateDatasourceApi.selectPlateGoodsListSummary(Long.parseLong(orderId.toString())); List plateGoodsRespDTOS = commonResult.getData();