From be3b4f5ca3634358ca1b9e40642788243294f186 Mon Sep 17 00:00:00 2001 From: dongyukun <1208714201@qq.com> Date: 星期五, 27 六月 2025 14:15:00 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ansteel-biz/db/mysql.sql | 108 +++++++++++++++------ ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingTraceDeviationDTO.java | 135 +++++++++++++++++++++++++++ 2 files changed, 211 insertions(+), 32 deletions(-) diff --git a/ansteel-biz/db/mysql.sql b/ansteel-biz/db/mysql.sql index 5816c90..a5e3e70 100644 --- a/ansteel-biz/db/mysql.sql +++ b/ansteel-biz/db/mysql.sql @@ -560,38 +560,82 @@ -- 焦化工序-影响因数偏差值 -- ---------------------------- DROP TABLE IF EXISTS `t_coking_trace_deviation`; -CREATE TABLE `t_coking_trace_deviation` -( - `id` varchar(36) NOT NULL COMMENT 'id', - `rel_id` varchar(36) NULL DEFAULT NULL COMMENT '关联ID', - `process` varchar(20) NULL DEFAULT NULL COMMENT '工序名称', - `sug_obj` varchar(20) NULL DEFAULT NULL COMMENT '建议对象', - `clock` varchar(20) NULL DEFAULT NULL COMMENT '查询时间', - `ind1_name` varchar(20) NULL DEFAULT NULL COMMENT '一级指标-偏差值-名称', - `ind1_value` varchar(20) NULL DEFAULT NULL COMMENT '一级指标-偏差值-值', - `ind1_unit` varchar(20) NULL DEFAULT NULL COMMENT '一级指标-偏差值-单位', - `ind2_name` varchar(20) NULL DEFAULT NULL COMMENT '二级指标-偏差值-名称', - `ind2_value` varchar(20) NULL DEFAULT NULL COMMENT '二级指标-偏差值-值', - `ind2_unit` varchar(20) NULL DEFAULT NULL COMMENT '二级指标-偏差值-单位', - `fac1_name` varchar(20) NULL DEFAULT NULL COMMENT '影响因素1-偏差值-名称', - `fac1_value` varchar(20) NULL DEFAULT NULL COMMENT '影响因素1-偏差值-值', - `fac1_unit` varchar(20) NULL DEFAULT NULL COMMENT '影响因素1-偏差值-单位', - `fac2_name` varchar(20) NULL DEFAULT NULL COMMENT '影响因素2-偏差值-名称', - `fac2_value` varchar(20) NULL DEFAULT NULL COMMENT '影响因素2-偏差值-值', - `fac2_unit` varchar(20) NULL DEFAULT NULL COMMENT '影响因素2-偏差值-单位', - `fac3_name` varchar(20) NULL DEFAULT NULL COMMENT '影响因素3-偏差值-名称', - `fac3_value` varchar(20) NULL DEFAULT NULL COMMENT '影响因素3-偏差值-值', - `fac3_unit` varchar(20) NULL DEFAULT NULL COMMENT '影响因素4-偏差值-单位', - `fac4_name` varchar(20) NULL DEFAULT NULL COMMENT '影响因素4-偏差值-名称', - `fac4_value` varchar(20) NULL DEFAULT NULL COMMENT '影响因素4-偏差值-值', - `fac4_unit` varchar(20) NULL DEFAULT NULL COMMENT '影响因素4-偏差值-单位', - `fac5_name` varchar(20) NULL DEFAULT NULL COMMENT '影响因素5-偏差值-名称', - `fac5_value` varchar(20) NULL DEFAULT NULL COMMENT '影响因素5-偏差值-值', - `fac5_unit` varchar(20) NULL DEFAULT NULL COMMENT '影响因素5-偏差值-单位', - `create_date` datetime COMMENT '创建时间', - PRIMARY KEY (`id`) USING BTREE, - key idx_clock (clock) -) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = DYNAMIC COMMENT '焦化工序影响因数偏差值'; +CREATE TABLE `t_coking_trace_deviation` ( + `id` varchar(36) COLLATE utf8mb4_general_ci NOT NULL COMMENT 'id', + `rel_id` varchar(36) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '关联ID', + `process` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '工序名称', + `sug_obj` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '建议对象', + `clock` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '查询时间', + `ind1_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '一级指标-偏差值-名称', + `ind1_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '一级指标-偏差值-值', + `ind1_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '一级指标-偏差值-单位', + `ind2_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '二级指标-偏差值-名称', + `ind2_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '二级指标-偏差值-值', + `ind2_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '二级指标-偏差值-单位', + `fac1_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素1-偏差值-名称', + `fac1_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素1-偏差值-值', + `fac1_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素1-偏差值-单位', + `fac2_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素2-偏差值-名称', + `fac2_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素2-偏差值-值', + `fac2_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素2-偏差值-单位', + `fac3_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素3-偏差值-名称', + `fac3_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素3-偏差值-值', + `fac3_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素4-偏差值-单位', + `fac4_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素4-偏差值-名称', + `fac4_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素4-偏差值-值', + `fac4_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素4-偏差值-单位', + `fac5_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素5-偏差值-名称', + `fac5_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素5-偏差值-值', + `fac5_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素5-偏差值-单位', + `fac6_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素6-偏差值-名称', + `fac6_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素6-偏差值-值', + `fac6_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素6-偏差值-单位', + `fac7_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素7-偏差值-名称', + `fac7_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素7-偏差值-值', + `fac7_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素7-偏差值-单位', + `fac8_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素8-偏差值-名称', + `fac8_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素8-偏差值-值', + `fac8_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素8-偏差值-单位', + `fac9_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素9-偏差值-名称', + `fac9_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素9-偏差值-值', + `fac9_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素9-偏差值-单位', + `fac10_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素10-偏差值-名称', + `fac10_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素10-偏差值-值', + `fac10_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素10-偏差值-单位', + `fac11_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素11-偏差值-名称', + `fac11_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素11-偏差值-值', + `fac11_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素11-偏差值-单位', + `fac12_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素12-偏差值-名称', + `fac12_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素12-偏差值-值', + `fac12_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素12-偏差值-单位', + `fac13_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素13-偏差值-名称', + `fac13_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素13-偏差值-值', + `fac13_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素13-偏差值-单位', + `fac14_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素14-偏差值-名称', + `fac14_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素14-偏差值-值', + `fac14_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素14-偏差值-单位', + `fac15_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素15-偏差值-名称', + `fac15_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素15-偏差值-值', + `fac15_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素15-偏差值-单位', + `fac16_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素16-偏差值-名称', + `fac16_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素16-偏差值-值', + `fac16_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素16-偏差值-单位', + `fac17_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素17-偏差值-名称', + `fac17_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素17-偏差值-值', + `fac17_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素17-偏差值-单位', + `fac18_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素18-偏差值-名称', + `fac18_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素18-偏差值-值', + `fac18_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素18-偏差值-单位', + `fac19_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素19-偏差值-名称', + `fac19_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素19-偏差值-值', + `fac19_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素19-偏差值-单位', + `fac20_name` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素20-偏差值-名称', + `fac20_value` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素20-偏差值-值', + `fac20_unit` varchar(20) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '影响因素20-偏差值-单位', + `create_date` datetime DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`id`) USING BTREE, + KEY `idx_clock` (`clock`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci ROW_FORMAT=DYNAMIC COMMENT='焦化工序影响因数偏差值'; -- ---------------------------- diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingTraceDeviationDTO.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingTraceDeviationDTO.java index 33f807f..a6c8b4c 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingTraceDeviationDTO.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/coking/dto/CokingTraceDeviationDTO.java @@ -96,6 +96,141 @@ @Schema(description = "影响因素5-偏差值-单位") private String fac5Unit; + @Schema(description = "影响因素6-偏差值-名称") + private String fac6Name; + + @Schema(description = "影响因素6-偏差值-值") + private String fac6Value; + + @Schema(description = "影响因素6-偏差值-单位") + private String fac6Unit; + + @Schema(description = "影响因素7-偏差值-名称") + private String fac7Name; + + @Schema(description = "影响因素7-偏差值-值") + private String fac7Value; + + @Schema(description = "影响因素7-偏差值-单位") + private String fac7Unit; + + @Schema(description = "影响因素8-偏差值-名称") + private String fac8Name; + + @Schema(description = "影响因素8-偏差值-值") + private String fac8Value; + + @Schema(description = "影响因素8-偏差值-单位") + private String fac8Unit; + + @Schema(description = "影响因素9-偏差值-名称") + private String fac9Name; + + @Schema(description = "影响因素9-偏差值-值") + private String fac9Value; + + @Schema(description = "影响因素9-偏差值-单位") + private String fac9Unit; + + @Schema(description = "影响因素10-偏差值-名称") + private String fac10Name; + + @Schema(description = "影响因素10-偏差值-值") + private String fac10Value; + + @Schema(description = "影响因素10-偏差值-单位") + private String fac10Unit; + + @Schema(description = "影响因素11-偏差值-名称") + private String fac11Name; + + @Schema(description = "影响因素11-偏差值-值") + private String fac11Value; + + @Schema(description = "影响因素11-偏差值-单位") + private String fac11Unit; + + @Schema(description = "影响因素12-偏差值-名称") + private String fac12Name; + + @Schema(description = "影响因素12-偏差值-值") + private String fac12Value; + + @Schema(description = "影响因素12-偏差值-单位") + private String fac12Unit; + + @Schema(description = "影响因素13-偏差值-名称") + private String fac13Name; + + @Schema(description = "影响因素13-偏差值-值") + private String fac13Value; + + @Schema(description = "影响因素13-偏差值-单位") + private String fac13Unit; + + @Schema(description = "影响因素14-偏差值-名称") + private String fac14Name; + + @Schema(description = "影响因素14-偏差值-值") + private String fac14Value; + + @Schema(description = "影响因素14-偏差值-单位") + private String fac14Unit; + + @Schema(description = "影响因素15-偏差值-名称") + private String fac15Name; + + @Schema(description = "影响因素15-偏差值-值") + private String fac15Value; + + @Schema(description = "影响因素15-偏差值-单位") + private String fac15Unit; + + @Schema(description = "影响因素16-偏差值-名称") + private String fac16Name; + + @Schema(description = "影响因素16-偏差值-值") + private String fac16Value; + + @Schema(description = "影响因素16-偏差值-单位") + private String fac16Unit; + + @Schema(description = "影响因素17-偏差值-名称") + private String fac17Name; + + @Schema(description = "影响因素17-偏差值-值") + private String fac17Value; + + @Schema(description = "影响因素17-偏差值-单位") + private String fac17Unit; + + @Schema(description = "影响因素18-偏差值-名称") + private String fac18Name; + + @Schema(description = "影响因素18-偏差值-值") + private String fac18Value; + + @Schema(description = "影响因素18-偏差值-单位") + private String fac18Unit; + + @Schema(description = "影响因素19-偏差值-名称") + private String fac19Name; + + @Schema(description = "影响因素19-偏差值-值") + private String fac19Value; + + @Schema(description = "影响因素19-偏差值-单位") + private String fac19Unit; + + @Schema(description = "影响因素20-偏差值-名称") + private String fac20Name; + + @Schema(description = "影响因素20-偏差值-值") + private String fac20Value; + + @Schema(description = "影响因素20-偏差值-单位") + private String fac20Unit; + @Schema(description = "创建时间") private Date createDate; -- Gitblit v1.9.3