diff --git a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql index 07bd60c80..722c6a55a 100644 --- a/jero-boot/db/蔚来标准sql/dev_2nd_period.sql +++ b/jero-boot/db/蔚来标准sql/dev_2nd_period.sql @@ -146,3 +146,7 @@ CREATE TABLE `laws_weilai`.`params_collect_manifest_log` ( `params_collect_manifest_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '参数收集清单id', PRIMARY KEY (`id`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '参数收集清单-操作记录(历史日志)' ROW_FORMAT = Dynamic; + +-- 参数清单-增加参考列配置id 2022-12-29 未同步生产环境 +ALTER TABLE `laws_weilai`.`params_manifest` + ADD COLUMN `references_col_id` varchar(255) NULL COMMENT '参数项清单的参考列配置id(对应上报库参数配置表中的id)' AFTER `references_col_name`; diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java index be60202e5..5294f973c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/entity/ParamsManifestEO.java @@ -123,4 +123,6 @@ public class ParamsManifestEO implements Serializable { @ApiModelProperty(value = "参数项清单的参考列名称") private String referencesColName; + // 参数项清单的参考列配置id(对应上报库参数配置表(params_report_config)中的id) + private String referencesColId; } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 02d078e02..2e243e104 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -1144,7 +1144,8 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl queryParamsReportConfigById(@RequestParam(name="id",required=true) String id) { + ParamsReportConfigEO paramsReportConfigEO = this.paramsReportConfigEOService.getById(id); + if(paramsReportConfigEO==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(paramsReportConfigEO); + } }