From 3f9a26e65ac4e1095e15ec96ef35aeeed83a4294 Mon Sep 17 00:00:00 2001 From: fit2-zhao Date: Fri, 29 Jan 2021 10:31:07 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8C=96):=20=E6=97=A7=E7=89=88=E6=9C=AC=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=81=E7=A7=BB=20=E5=91=BD=E5=90=8D=E8=A7=84=E5=88=99?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=BC=E5=AE=B9=E5=A4=8D=E5=88=B6=E7=9A=84?= =?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../metersphere/api/service/HistoricalDataUpgradeService.java | 2 ++ .../src/main/resources/db/migration/V71__modify_scenario.sql | 1 + 2 files changed, 3 insertions(+) create mode 100644 backend/src/main/resources/db/migration/V71__modify_scenario.sql diff --git a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java index a36b4ff3d7..6277311471 100644 --- a/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java +++ b/backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java @@ -377,6 +377,8 @@ public class HistoricalDataUpgradeService { if (CollectionUtils.isNotEmpty(scenarios)) { // 批量处理 for (Scenario scenario : scenarios) { + scenario.setId(test.getId() + "=" + scenario.getId()); + scenario.setName(test.getName() + "_" + scenario.getName()); MsScenario scenario1 = createScenario(scenario); String scenarioDefinition = JSON.toJSONString(scenario1); num++; diff --git a/backend/src/main/resources/db/migration/V71__modify_scenario.sql b/backend/src/main/resources/db/migration/V71__modify_scenario.sql new file mode 100644 index 0000000000..6edc321985 --- /dev/null +++ b/backend/src/main/resources/db/migration/V71__modify_scenario.sql @@ -0,0 +1 @@ +ALTER TABLE api_scenario MODIFY COLUMN id VARCHAR (120); \ No newline at end of file