From 5652944761f155a9ac2104545639a34f16e9776a Mon Sep 17 00:00:00 2001 From: "Captain.B" Date: Thu, 7 May 2020 16:11:43 +0800 Subject: [PATCH] bigint -> varchar --- .../base/domain/LoadTestReportLog.java | 2 +- .../base/domain/LoadTestReportLogExample.java | 30 +++++++---- .../base/domain/LoadTestReportResult.java | 2 +- .../domain/LoadTestReportResultExample.java | 30 +++++++---- .../base/mapper/LoadTestReportLogMapper.java | 4 +- .../base/mapper/LoadTestReportLogMapper.xml | 26 +++++----- .../mapper/LoadTestReportResultMapper.java | 4 +- .../mapper/LoadTestReportResultMapper.xml | 26 +++++----- .../service/PerformanceTestService.java | 1 + .../db/migration/V2__metersphere_ddl.sql | 51 +++++++++---------- 10 files changed, 96 insertions(+), 80 deletions(-) diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTestReportLog.java b/backend/src/main/java/io/metersphere/base/domain/LoadTestReportLog.java index 6221094d7..466470aad 100644 --- a/backend/src/main/java/io/metersphere/base/domain/LoadTestReportLog.java +++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestReportLog.java @@ -6,7 +6,7 @@ import java.io.Serializable; @Data public class LoadTestReportLog implements Serializable { - private Long id; + private String id; private String reportId; diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTestReportLogExample.java b/backend/src/main/java/io/metersphere/base/domain/LoadTestReportLogExample.java index 7826fbfbb..2112d515a 100644 --- a/backend/src/main/java/io/metersphere/base/domain/LoadTestReportLogExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestReportLogExample.java @@ -114,52 +114,62 @@ public class LoadTestReportLogExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTestReportResult.java b/backend/src/main/java/io/metersphere/base/domain/LoadTestReportResult.java index f22100b72..87d718b3e 100644 --- a/backend/src/main/java/io/metersphere/base/domain/LoadTestReportResult.java +++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestReportResult.java @@ -6,7 +6,7 @@ import java.io.Serializable; @Data public class LoadTestReportResult implements Serializable { - private Long id; + private String id; private String reportId; diff --git a/backend/src/main/java/io/metersphere/base/domain/LoadTestReportResultExample.java b/backend/src/main/java/io/metersphere/base/domain/LoadTestReportResultExample.java index 8e4b6ae61..93e8598bd 100644 --- a/backend/src/main/java/io/metersphere/base/domain/LoadTestReportResultExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/LoadTestReportResultExample.java @@ -114,52 +114,62 @@ public class LoadTestReportResultExample { return (Criteria) this; } - public Criteria andIdEqualTo(Long value) { + public Criteria andIdEqualTo(String value) { addCriterion("id =", value, "id"); return (Criteria) this; } - public Criteria andIdNotEqualTo(Long value) { + public Criteria andIdNotEqualTo(String value) { addCriterion("id <>", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThan(Long value) { + public Criteria andIdGreaterThan(String value) { addCriterion("id >", value, "id"); return (Criteria) this; } - public Criteria andIdGreaterThanOrEqualTo(Long value) { + public Criteria andIdGreaterThanOrEqualTo(String value) { addCriterion("id >=", value, "id"); return (Criteria) this; } - public Criteria andIdLessThan(Long value) { + public Criteria andIdLessThan(String value) { addCriterion("id <", value, "id"); return (Criteria) this; } - public Criteria andIdLessThanOrEqualTo(Long value) { + public Criteria andIdLessThanOrEqualTo(String value) { addCriterion("id <=", value, "id"); return (Criteria) this; } - public Criteria andIdIn(List values) { + public Criteria andIdLike(String value) { + addCriterion("id like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotLike(String value) { + addCriterion("id not like", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { addCriterion("id in", values, "id"); return (Criteria) this; } - public Criteria andIdNotIn(List values) { + public Criteria andIdNotIn(List values) { addCriterion("id not in", values, "id"); return (Criteria) this; } - public Criteria andIdBetween(Long value1, Long value2) { + public Criteria andIdBetween(String value1, String value2) { addCriterion("id between", value1, value2, "id"); return (Criteria) this; } - public Criteria andIdNotBetween(Long value1, Long value2) { + public Criteria andIdNotBetween(String value1, String value2) { addCriterion("id not between", value1, value2, "id"); return (Criteria) this; } diff --git a/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportLogMapper.java b/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportLogMapper.java index d4cf9a43c..2f8acb3ee 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportLogMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportLogMapper.java @@ -11,7 +11,7 @@ public interface LoadTestReportLogMapper { int deleteByExample(LoadTestReportLogExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(String id); int insert(LoadTestReportLog record); @@ -21,7 +21,7 @@ public interface LoadTestReportLogMapper { List selectByExample(LoadTestReportLogExample example); - LoadTestReportLog selectByPrimaryKey(Long id); + LoadTestReportLog selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") LoadTestReportLog record, @Param("example") LoadTestReportLogExample example); diff --git a/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportLogMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportLogMapper.xml index 8e6566949..42d98045f 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportLogMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportLogMapper.xml @@ -2,7 +2,7 @@ - + @@ -103,17 +103,17 @@ order by ${orderByClause} - select , from load_test_report_log - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from load_test_report_log - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from load_test_report_log @@ -124,7 +124,7 @@ insert into load_test_report_log (id, report_id, resource_id, content) - values (#{id,jdbcType=BIGINT}, #{reportId,jdbcType=VARCHAR}, #{resourceId,jdbcType=VARCHAR}, + values (#{id,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{resourceId,jdbcType=VARCHAR}, #{content,jdbcType=LONGVARCHAR}) @@ -145,7 +145,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, @@ -168,7 +168,7 @@ update load_test_report_log - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, report_id = #{record.reportId,jdbcType=VARCHAR}, @@ -186,7 +186,7 @@ update load_test_report_log - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, report_id = #{record.reportId,jdbcType=VARCHAR}, resource_id = #{record.resourceId,jdbcType=VARCHAR}, content = #{record.content,jdbcType=LONGVARCHAR} @@ -196,7 +196,7 @@ update load_test_report_log - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, report_id = #{record.reportId,jdbcType=VARCHAR}, resource_id = #{record.resourceId,jdbcType=VARCHAR} @@ -216,19 +216,19 @@ content = #{content,jdbcType=LONGVARCHAR}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update load_test_report_log set report_id = #{reportId,jdbcType=VARCHAR}, resource_id = #{resourceId,jdbcType=VARCHAR}, content = #{content,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update load_test_report_log set report_id = #{reportId,jdbcType=VARCHAR}, resource_id = #{resourceId,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportResultMapper.java b/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportResultMapper.java index c950f9e1f..daa090775 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportResultMapper.java +++ b/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportResultMapper.java @@ -11,7 +11,7 @@ public interface LoadTestReportResultMapper { int deleteByExample(LoadTestReportResultExample example); - int deleteByPrimaryKey(Long id); + int deleteByPrimaryKey(String id); int insert(LoadTestReportResult record); @@ -21,7 +21,7 @@ public interface LoadTestReportResultMapper { List selectByExample(LoadTestReportResultExample example); - LoadTestReportResult selectByPrimaryKey(Long id); + LoadTestReportResult selectByPrimaryKey(String id); int updateByExampleSelective(@Param("record") LoadTestReportResult record, @Param("example") LoadTestReportResultExample example); diff --git a/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportResultMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportResultMapper.xml index 2bc955d3c..b7863f65b 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportResultMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/LoadTestReportResultMapper.xml @@ -2,7 +2,7 @@ - + @@ -103,17 +103,17 @@ order by ${orderByClause} - select , from load_test_report_result - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} - + delete from load_test_report_result - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} delete from load_test_report_result @@ -124,7 +124,7 @@ insert into load_test_report_result (id, report_id, report_key, report_value) - values (#{id,jdbcType=BIGINT}, #{reportId,jdbcType=VARCHAR}, #{reportKey,jdbcType=VARCHAR}, + values (#{id,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, #{reportKey,jdbcType=VARCHAR}, #{reportValue,jdbcType=LONGVARCHAR}) @@ -145,7 +145,7 @@ - #{id,jdbcType=BIGINT}, + #{id,jdbcType=VARCHAR}, #{reportId,jdbcType=VARCHAR}, @@ -168,7 +168,7 @@ update load_test_report_result - id = #{record.id,jdbcType=BIGINT}, + id = #{record.id,jdbcType=VARCHAR}, report_id = #{record.reportId,jdbcType=VARCHAR}, @@ -186,7 +186,7 @@ update load_test_report_result - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, report_id = #{record.reportId,jdbcType=VARCHAR}, report_key = #{record.reportKey,jdbcType=VARCHAR}, report_value = #{record.reportValue,jdbcType=LONGVARCHAR} @@ -196,7 +196,7 @@ update load_test_report_result - set id = #{record.id,jdbcType=BIGINT}, + set id = #{record.id,jdbcType=VARCHAR}, report_id = #{record.reportId,jdbcType=VARCHAR}, report_key = #{record.reportKey,jdbcType=VARCHAR} @@ -216,19 +216,19 @@ report_value = #{reportValue,jdbcType=LONGVARCHAR}, - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update load_test_report_result set report_id = #{reportId,jdbcType=VARCHAR}, report_key = #{reportKey,jdbcType=VARCHAR}, report_value = #{reportValue,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} update load_test_report_result set report_id = #{reportId,jdbcType=VARCHAR}, report_key = #{reportKey,jdbcType=VARCHAR} - where id = #{id,jdbcType=BIGINT} + where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/service/PerformanceTestService.java b/backend/src/main/java/io/metersphere/service/PerformanceTestService.java index 408d9d371..8496274ee 100644 --- a/backend/src/main/java/io/metersphere/service/PerformanceTestService.java +++ b/backend/src/main/java/io/metersphere/service/PerformanceTestService.java @@ -228,6 +228,7 @@ public class PerformanceTestService { List testResourceList = testResourceService.getResourcesByPoolId(resourcePoolId); testResourceList.forEach(r -> { LoadTestReportLog record = new LoadTestReportLog(); + record.setId(UUID.randomUUID().toString()); record.setReportId(testReport.getId()); record.setResourceId(r.getId()); record.setContent(StringUtils.EMPTY); diff --git a/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql b/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql index fb5a030e6..c12dcf5c0 100644 --- a/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql +++ b/backend/src/main/resources/db/migration/V2__metersphere_ddl.sql @@ -1,5 +1,5 @@ CREATE TABLE IF NOT EXISTS `file_content` ( - `file_id` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT 'File ID', + `file_id` varchar(64) NOT NULL COMMENT 'File ID', `file` longblob COMMENT 'File content', PRIMARY KEY (`file_id`) ) @@ -70,29 +70,24 @@ CREATE TABLE IF NOT EXISTS `load_test_report_detail` ( DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; +CREATE TABLE IF NOT EXISTS `load_test_report_log` ( + `id` varchar(50) NOT NULL, + `report_id` varchar(50) NOT NULL, + `resource_id` varchar(50) DEFAULT NULL, + `content` longtext , + PRIMARY KEY (`id`), + KEY `load_test_report_log_report_id_resource_name_index` (`report_id`,`resource_id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; + CREATE TABLE IF NOT EXISTS `load_test_report_result` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `report_id` varchar(50) NOT NULL, - `report_key` varchar(64) DEFAULT NULL, - `report_value` text, + `id` varchar(50) NOT NULL, + `report_id` varchar(50) NOT NULL, + `report_key` varchar(64) DEFAULT NULL, + `report_value` text , PRIMARY KEY (`id`), KEY `load_test_report_result_report_id_report_key_index` (`report_id`,`report_key`) -) - ENGINE=InnoDB - DEFAULT CHARSET=utf8mb4 - COLLATE=utf8mb4_bin; +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin; -CREATE TABLE IF NOT EXISTS `load_test_report_log` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `report_id` varchar(50) NOT NULL, - `resource_id` varchar(50) DEFAULT NULL, - `content` longtext, - PRIMARY KEY (`id`), - KEY `load_test_report_log_report_id_resource_name_index` (`report_id`,`resource_id`) -) - ENGINE=InnoDB - DEFAULT CHARSET=utf8mb4 - COLLATE=utf8mb4_bin; CREATE TABLE IF NOT EXISTS `organization` ( `id` varchar(50) NOT NULL COMMENT 'Organization ID', @@ -145,7 +140,7 @@ CREATE TABLE IF NOT EXISTS `system_parameter` ( CREATE TABLE IF NOT EXISTS `test_resource` ( `id` varchar(50) NOT NULL COMMENT 'Test resource ID', - `test_resource_pool_id` varchar(50) COLLATE utf8mb4_bin NOT NULL COMMENT 'Test resource pool ID this test resource belongs to', + `test_resource_pool_id` varchar(50) NOT NULL COMMENT 'Test resource pool ID this test resource belongs to', `configuration` longtext COMMENT 'Test resource configuration', `status` varchar(64) NOT NULL COMMENT 'Test resource status', `create_time` bigint(13) NOT NULL COMMENT 'Create timestamp', @@ -217,13 +212,13 @@ CREATE TABLE IF NOT EXISTS `workspace` ( -- api start CREATE TABLE IF NOT EXISTS `api_test` ( - `id` varchar(50) COLLATE utf8mb4_bin NOT NULL COMMENT 'Test ID', - `project_id` varchar(50) COLLATE utf8mb4_bin NOT NULL COMMENT 'Project ID this test belongs to', - `name` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT 'Test name', - `description` varchar(255) COLLATE utf8mb4_bin DEFAULT NULL COMMENT 'Test description', - `scenario_definition` longtext COLLATE utf8mb4_bin COMMENT 'Scenario definition (JSON format)', - `schedule` longtext COLLATE utf8mb4_bin COMMENT 'Test schedule (cron list)', - `status` varchar(64) COLLATE utf8mb4_bin DEFAULT NULL, + `id` varchar(50) NOT NULL COMMENT 'Test ID', + `project_id` varchar(50) NOT NULL COMMENT 'Project ID this test belongs to', + `name` varchar(64) NOT NULL COMMENT 'Test name', + `description` varchar(255) DEFAULT NULL COMMENT 'Test description', + `scenario_definition` longtext COMMENT 'Scenario definition (JSON format)', + `schedule` longtext COMMENT 'Test schedule (cron list)', + `status` varchar(64) DEFAULT NULL, `create_time` bigint(13) NOT NULL COMMENT 'Create timestamp', `update_time` bigint(13) NOT NULL COMMENT 'Update timestamp', PRIMARY KEY (`id`) -- GitLab