From 59c9cdfef2b674bc91159aaa3dc106ce299e219f Mon Sep 17 00:00:00 2001 From: wenyann <64353056+wenyann@users.noreply.github.com> Date: Tue, 11 Aug 2020 15:57:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E6=B5=8B=E8=AF=95):?= =?UTF-8?q?=20=E5=9C=BA=E6=99=AF=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/api/report/components/MetricChart.vue | 4 ++-- .../src/business/components/api/test/OneClickOperation.vue | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/frontend/src/business/components/api/report/components/MetricChart.vue b/frontend/src/business/components/api/report/components/MetricChart.vue index eafc2e10a9..df7cfdfd52 100644 --- a/frontend/src/business/components/api/report/components/MetricChart.vue +++ b/frontend/src/business/components/api/report/components/MetricChart.vue @@ -56,8 +56,8 @@ }, data() { return { - minutes: Math.floor(this.totalTime / 60), - seconds: this.totalTime % 60, + minutes: Math.floor((this.totalTime % (1000 * 60 * 60)) / (1000 * 60)), + seconds: Math.round((this.totalTime % (1000 * 60)) / 1000), } }, computed: { diff --git a/frontend/src/business/components/api/test/OneClickOperation.vue b/frontend/src/business/components/api/test/OneClickOperation.vue index 03af1164f1..46355d913d 100644 --- a/frontend/src/business/components/api/test/OneClickOperation.vue +++ b/frontend/src/business/components/api/test/OneClickOperation.vue @@ -87,7 +87,10 @@ schedule: {}, }); this.test = this.test || test; - this.test.scenarioDefinition = this.test.scenarioDefinition.concat(test.scenarioDefinition); + if (this.tests.length > 1) { + this.test.scenarioDefinition = this.test.scenarioDefinition.concat(test.scenarioDefinition); + + } if (this.tests.length === this.selectIds.size) { this.tests = []; this.saveRunTest(); @@ -127,7 +130,7 @@ })); let jmx = this.test.toJMX(); let blob = new Blob([jmx.xml], {type: "application/octet-stream"}); - formData.append("files", new File([blob], jmx.name)); + formData.append("file", new File([blob], jmx.name)); return { method: 'POST', url: url, From b13fb0f001e213405532303a418fe91c525473cb Mon Sep 17 00:00:00 2001 From: shiziyuan9527 Date: Tue, 11 Aug 2020 17:17:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?feat:=20=E6=9C=8D=E5=8A=A1=E9=9B=86?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/metersphere/base/domain/Project.java | 7 +- .../base/domain/ProjectExample.java | 168 ++++++- .../base/domain/ServiceIntegration.java | 17 + .../domain/ServiceIntegrationExample.java | 410 ++++++++++++++++++ .../metersphere/base/mapper/ProjectMapper.xml | 56 ++- .../base/mapper/ServiceIntegrationMapper.java | 36 ++ .../base/mapper/ServiceIntegrationMapper.xml | 234 ++++++++++ .../base/mapper/ext/ExtProjectMapper.xml | 2 +- .../constants/DedectManagePlatform.java | 5 + .../ServiceIntegrationController.java | 38 ++ .../request/IntegrationRequest.java | 11 + .../java/io/metersphere/dto/ProjectDTO.java | 2 + .../service/IntegrationService.java | 74 ++++ .../db/migration/V13__service_integration.sql | 11 + .../db/migration/V14__modify_project.sql | 2 + .../business/components/project/MsProject.vue | 22 + .../organization/DefectManagement.vue | 144 +++++- 17 files changed, 1196 insertions(+), 43 deletions(-) create mode 100644 backend/src/main/java/io/metersphere/base/domain/ServiceIntegration.java create mode 100644 backend/src/main/java/io/metersphere/base/domain/ServiceIntegrationExample.java create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ServiceIntegrationMapper.java create mode 100644 backend/src/main/java/io/metersphere/base/mapper/ServiceIntegrationMapper.xml create mode 100644 backend/src/main/java/io/metersphere/commons/constants/DedectManagePlatform.java create mode 100644 backend/src/main/java/io/metersphere/controller/ServiceIntegrationController.java create mode 100644 backend/src/main/java/io/metersphere/controller/request/IntegrationRequest.java create mode 100644 backend/src/main/java/io/metersphere/service/IntegrationService.java create mode 100644 backend/src/main/resources/db/migration/V13__service_integration.sql create mode 100644 backend/src/main/resources/db/migration/V14__modify_project.sql diff --git a/backend/src/main/java/io/metersphere/base/domain/Project.java b/backend/src/main/java/io/metersphere/base/domain/Project.java index f1af671f4e..4b934ac658 100644 --- a/backend/src/main/java/io/metersphere/base/domain/Project.java +++ b/backend/src/main/java/io/metersphere/base/domain/Project.java @@ -1,8 +1,7 @@ package io.metersphere.base.domain; -import lombok.Data; - import java.io.Serializable; +import lombok.Data; @Data public class Project implements Serializable { @@ -18,5 +17,9 @@ public class Project implements Serializable { private Long updateTime; + private String tapdId; + + private String jiraKey; + private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java b/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java index c2a9a6f3c6..7c93737e82 100644 --- a/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java +++ b/backend/src/main/java/io/metersphere/base/domain/ProjectExample.java @@ -245,72 +245,72 @@ public class ProjectExample { } public Criteria andNameIsNull() { - addCriterion("name is null"); + addCriterion("`name` is null"); return (Criteria) this; } public Criteria andNameIsNotNull() { - addCriterion("name is not null"); + addCriterion("`name` is not null"); return (Criteria) this; } public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); + addCriterion("`name` =", value, "name"); return (Criteria) this; } public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); + addCriterion("`name` <>", value, "name"); return (Criteria) this; } public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); + addCriterion("`name` >", value, "name"); return (Criteria) this; } public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); + addCriterion("`name` >=", value, "name"); return (Criteria) this; } public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); + addCriterion("`name` <", value, "name"); return (Criteria) this; } public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); + addCriterion("`name` <=", value, "name"); return (Criteria) this; } public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); + addCriterion("`name` like", value, "name"); return (Criteria) this; } public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); + addCriterion("`name` not like", value, "name"); return (Criteria) this; } public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); + addCriterion("`name` in", values, "name"); return (Criteria) this; } public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); + addCriterion("`name` not in", values, "name"); return (Criteria) this; } public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); + addCriterion("`name` between", value1, value2, "name"); return (Criteria) this; } public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); + addCriterion("`name` not between", value1, value2, "name"); return (Criteria) this; } @@ -503,6 +503,146 @@ public class ProjectExample { addCriterion("update_time not between", value1, value2, "updateTime"); return (Criteria) this; } + + public Criteria andTapdIdIsNull() { + addCriterion("tapd_id is null"); + return (Criteria) this; + } + + public Criteria andTapdIdIsNotNull() { + addCriterion("tapd_id is not null"); + return (Criteria) this; + } + + public Criteria andTapdIdEqualTo(String value) { + addCriterion("tapd_id =", value, "tapdId"); + return (Criteria) this; + } + + public Criteria andTapdIdNotEqualTo(String value) { + addCriterion("tapd_id <>", value, "tapdId"); + return (Criteria) this; + } + + public Criteria andTapdIdGreaterThan(String value) { + addCriterion("tapd_id >", value, "tapdId"); + return (Criteria) this; + } + + public Criteria andTapdIdGreaterThanOrEqualTo(String value) { + addCriterion("tapd_id >=", value, "tapdId"); + return (Criteria) this; + } + + public Criteria andTapdIdLessThan(String value) { + addCriterion("tapd_id <", value, "tapdId"); + return (Criteria) this; + } + + public Criteria andTapdIdLessThanOrEqualTo(String value) { + addCriterion("tapd_id <=", value, "tapdId"); + return (Criteria) this; + } + + public Criteria andTapdIdLike(String value) { + addCriterion("tapd_id like", value, "tapdId"); + return (Criteria) this; + } + + public Criteria andTapdIdNotLike(String value) { + addCriterion("tapd_id not like", value, "tapdId"); + return (Criteria) this; + } + + public Criteria andTapdIdIn(List values) { + addCriterion("tapd_id in", values, "tapdId"); + return (Criteria) this; + } + + public Criteria andTapdIdNotIn(List values) { + addCriterion("tapd_id not in", values, "tapdId"); + return (Criteria) this; + } + + public Criteria andTapdIdBetween(String value1, String value2) { + addCriterion("tapd_id between", value1, value2, "tapdId"); + return (Criteria) this; + } + + public Criteria andTapdIdNotBetween(String value1, String value2) { + addCriterion("tapd_id not between", value1, value2, "tapdId"); + return (Criteria) this; + } + + public Criteria andJiraKeyIsNull() { + addCriterion("jira_key is null"); + return (Criteria) this; + } + + public Criteria andJiraKeyIsNotNull() { + addCriterion("jira_key is not null"); + return (Criteria) this; + } + + public Criteria andJiraKeyEqualTo(String value) { + addCriterion("jira_key =", value, "jiraKey"); + return (Criteria) this; + } + + public Criteria andJiraKeyNotEqualTo(String value) { + addCriterion("jira_key <>", value, "jiraKey"); + return (Criteria) this; + } + + public Criteria andJiraKeyGreaterThan(String value) { + addCriterion("jira_key >", value, "jiraKey"); + return (Criteria) this; + } + + public Criteria andJiraKeyGreaterThanOrEqualTo(String value) { + addCriterion("jira_key >=", value, "jiraKey"); + return (Criteria) this; + } + + public Criteria andJiraKeyLessThan(String value) { + addCriterion("jira_key <", value, "jiraKey"); + return (Criteria) this; + } + + public Criteria andJiraKeyLessThanOrEqualTo(String value) { + addCriterion("jira_key <=", value, "jiraKey"); + return (Criteria) this; + } + + public Criteria andJiraKeyLike(String value) { + addCriterion("jira_key like", value, "jiraKey"); + return (Criteria) this; + } + + public Criteria andJiraKeyNotLike(String value) { + addCriterion("jira_key not like", value, "jiraKey"); + return (Criteria) this; + } + + public Criteria andJiraKeyIn(List values) { + addCriterion("jira_key in", values, "jiraKey"); + return (Criteria) this; + } + + public Criteria andJiraKeyNotIn(List values) { + addCriterion("jira_key not in", values, "jiraKey"); + return (Criteria) this; + } + + public Criteria andJiraKeyBetween(String value1, String value2) { + addCriterion("jira_key between", value1, value2, "jiraKey"); + return (Criteria) this; + } + + public Criteria andJiraKeyNotBetween(String value1, String value2) { + addCriterion("jira_key not between", value1, value2, "jiraKey"); + return (Criteria) this; + } } public static class Criteria extends GeneratedCriteria { diff --git a/backend/src/main/java/io/metersphere/base/domain/ServiceIntegration.java b/backend/src/main/java/io/metersphere/base/domain/ServiceIntegration.java new file mode 100644 index 0000000000..8b4888386b --- /dev/null +++ b/backend/src/main/java/io/metersphere/base/domain/ServiceIntegration.java @@ -0,0 +1,17 @@ +package io.metersphere.base.domain; + +import java.io.Serializable; +import lombok.Data; + +@Data +public class ServiceIntegration implements Serializable { + private String id; + + private String organizationId; + + private String platform; + + private String configuration; + + private static final long serialVersionUID = 1L; +} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/domain/ServiceIntegrationExample.java b/backend/src/main/java/io/metersphere/base/domain/ServiceIntegrationExample.java new file mode 100644 index 0000000000..bae7990cf8 --- /dev/null +++ b/backend/src/main/java/io/metersphere/base/domain/ServiceIntegrationExample.java @@ -0,0 +1,410 @@ +package io.metersphere.base.domain; + +import java.util.ArrayList; +import java.util.List; + +public class ServiceIntegrationExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public ServiceIntegrationExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(String value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(String value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(String value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(String value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(String value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(String value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + 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) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(String value1, String value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(String value1, String value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andOrganizationIdIsNull() { + addCriterion("organization_id is null"); + return (Criteria) this; + } + + public Criteria andOrganizationIdIsNotNull() { + addCriterion("organization_id is not null"); + return (Criteria) this; + } + + public Criteria andOrganizationIdEqualTo(String value) { + addCriterion("organization_id =", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdNotEqualTo(String value) { + addCriterion("organization_id <>", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdGreaterThan(String value) { + addCriterion("organization_id >", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdGreaterThanOrEqualTo(String value) { + addCriterion("organization_id >=", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdLessThan(String value) { + addCriterion("organization_id <", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdLessThanOrEqualTo(String value) { + addCriterion("organization_id <=", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdLike(String value) { + addCriterion("organization_id like", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdNotLike(String value) { + addCriterion("organization_id not like", value, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdIn(List values) { + addCriterion("organization_id in", values, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdNotIn(List values) { + addCriterion("organization_id not in", values, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdBetween(String value1, String value2) { + addCriterion("organization_id between", value1, value2, "organizationId"); + return (Criteria) this; + } + + public Criteria andOrganizationIdNotBetween(String value1, String value2) { + addCriterion("organization_id not between", value1, value2, "organizationId"); + return (Criteria) this; + } + + public Criteria andPlatformIsNull() { + addCriterion("platform is null"); + return (Criteria) this; + } + + public Criteria andPlatformIsNotNull() { + addCriterion("platform is not null"); + return (Criteria) this; + } + + public Criteria andPlatformEqualTo(String value) { + addCriterion("platform =", value, "platform"); + return (Criteria) this; + } + + public Criteria andPlatformNotEqualTo(String value) { + addCriterion("platform <>", value, "platform"); + return (Criteria) this; + } + + public Criteria andPlatformGreaterThan(String value) { + addCriterion("platform >", value, "platform"); + return (Criteria) this; + } + + public Criteria andPlatformGreaterThanOrEqualTo(String value) { + addCriterion("platform >=", value, "platform"); + return (Criteria) this; + } + + public Criteria andPlatformLessThan(String value) { + addCriterion("platform <", value, "platform"); + return (Criteria) this; + } + + public Criteria andPlatformLessThanOrEqualTo(String value) { + addCriterion("platform <=", value, "platform"); + return (Criteria) this; + } + + public Criteria andPlatformLike(String value) { + addCriterion("platform like", value, "platform"); + return (Criteria) this; + } + + public Criteria andPlatformNotLike(String value) { + addCriterion("platform not like", value, "platform"); + return (Criteria) this; + } + + public Criteria andPlatformIn(List values) { + addCriterion("platform in", values, "platform"); + return (Criteria) this; + } + + public Criteria andPlatformNotIn(List values) { + addCriterion("platform not in", values, "platform"); + return (Criteria) this; + } + + public Criteria andPlatformBetween(String value1, String value2) { + addCriterion("platform between", value1, value2, "platform"); + return (Criteria) this; + } + + public Criteria andPlatformNotBetween(String value1, String value2) { + addCriterion("platform not between", value1, value2, "platform"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml index 05fc3dded9..a5939ef7bd 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ProjectMapper.xml @@ -8,6 +8,8 @@ + + @@ -68,7 +70,7 @@ - id, workspace_id, name, description, create_time, update_time + id, workspace_id, `name`, description, create_time, update_time, tapd_id, jira_key @@ -167,7 +181,7 @@ workspace_id = #{record.workspaceId,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, description = #{record.description,jdbcType=VARCHAR}, @@ -178,6 +192,12 @@ update_time = #{record.updateTime,jdbcType=BIGINT}, + + tapd_id = #{record.tapdId,jdbcType=VARCHAR}, + + + jira_key = #{record.jiraKey,jdbcType=VARCHAR}, + @@ -187,10 +207,12 @@ update project set id = #{record.id,jdbcType=VARCHAR}, workspace_id = #{record.workspaceId,jdbcType=VARCHAR}, - name = #{record.name,jdbcType=VARCHAR}, + `name` = #{record.name,jdbcType=VARCHAR}, description = #{record.description,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=BIGINT}, - update_time = #{record.updateTime,jdbcType=BIGINT} + update_time = #{record.updateTime,jdbcType=BIGINT}, + tapd_id = #{record.tapdId,jdbcType=VARCHAR}, + jira_key = #{record.jiraKey,jdbcType=VARCHAR} @@ -202,7 +224,7 @@ workspace_id = #{workspaceId,jdbcType=VARCHAR}, - name = #{name,jdbcType=VARCHAR}, + `name` = #{name,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR}, @@ -213,16 +235,24 @@ update_time = #{updateTime,jdbcType=BIGINT}, + + tapd_id = #{tapdId,jdbcType=VARCHAR}, + + + jira_key = #{jiraKey,jdbcType=VARCHAR}, + where id = #{id,jdbcType=VARCHAR} update project set workspace_id = #{workspaceId,jdbcType=VARCHAR}, - name = #{name,jdbcType=VARCHAR}, + `name` = #{name,jdbcType=VARCHAR}, description = #{description,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT} + update_time = #{updateTime,jdbcType=BIGINT}, + tapd_id = #{tapdId,jdbcType=VARCHAR}, + jira_key = #{jiraKey,jdbcType=VARCHAR} where id = #{id,jdbcType=VARCHAR} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/ServiceIntegrationMapper.java b/backend/src/main/java/io/metersphere/base/mapper/ServiceIntegrationMapper.java new file mode 100644 index 0000000000..d3c48eaf3a --- /dev/null +++ b/backend/src/main/java/io/metersphere/base/mapper/ServiceIntegrationMapper.java @@ -0,0 +1,36 @@ +package io.metersphere.base.mapper; + +import io.metersphere.base.domain.ServiceIntegration; +import io.metersphere.base.domain.ServiceIntegrationExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface ServiceIntegrationMapper { + long countByExample(ServiceIntegrationExample example); + + int deleteByExample(ServiceIntegrationExample example); + + int deleteByPrimaryKey(String id); + + int insert(ServiceIntegration record); + + int insertSelective(ServiceIntegration record); + + List selectByExampleWithBLOBs(ServiceIntegrationExample example); + + List selectByExample(ServiceIntegrationExample example); + + ServiceIntegration selectByPrimaryKey(String id); + + int updateByExampleSelective(@Param("record") ServiceIntegration record, @Param("example") ServiceIntegrationExample example); + + int updateByExampleWithBLOBs(@Param("record") ServiceIntegration record, @Param("example") ServiceIntegrationExample example); + + int updateByExample(@Param("record") ServiceIntegration record, @Param("example") ServiceIntegrationExample example); + + int updateByPrimaryKeySelective(ServiceIntegration record); + + int updateByPrimaryKeyWithBLOBs(ServiceIntegration record); + + int updateByPrimaryKey(ServiceIntegration record); +} \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/ServiceIntegrationMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ServiceIntegrationMapper.xml new file mode 100644 index 0000000000..8a85844582 --- /dev/null +++ b/backend/src/main/java/io/metersphere/base/mapper/ServiceIntegrationMapper.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, organization_id, platform + + + configuration + + + + + + delete from service_integration + where id = #{id,jdbcType=VARCHAR} + + + delete from service_integration + + + + + + insert into service_integration (id, organization_id, platform, + configuration) + values (#{id,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, #{platform,jdbcType=VARCHAR}, + #{configuration,jdbcType=LONGVARCHAR}) + + + insert into service_integration + + + id, + + + organization_id, + + + platform, + + + configuration, + + + + + #{id,jdbcType=VARCHAR}, + + + #{organizationId,jdbcType=VARCHAR}, + + + #{platform,jdbcType=VARCHAR}, + + + #{configuration,jdbcType=LONGVARCHAR}, + + + + + + update service_integration + + + id = #{record.id,jdbcType=VARCHAR}, + + + organization_id = #{record.organizationId,jdbcType=VARCHAR}, + + + platform = #{record.platform,jdbcType=VARCHAR}, + + + configuration = #{record.configuration,jdbcType=LONGVARCHAR}, + + + + + + + + update service_integration + set id = #{record.id,jdbcType=VARCHAR}, + organization_id = #{record.organizationId,jdbcType=VARCHAR}, + platform = #{record.platform,jdbcType=VARCHAR}, + configuration = #{record.configuration,jdbcType=LONGVARCHAR} + + + + + + update service_integration + set id = #{record.id,jdbcType=VARCHAR}, + organization_id = #{record.organizationId,jdbcType=VARCHAR}, + platform = #{record.platform,jdbcType=VARCHAR} + + + + + + update service_integration + + + organization_id = #{organizationId,jdbcType=VARCHAR}, + + + platform = #{platform,jdbcType=VARCHAR}, + + + configuration = #{configuration,jdbcType=LONGVARCHAR}, + + + where id = #{id,jdbcType=VARCHAR} + + + update service_integration + set organization_id = #{organizationId,jdbcType=VARCHAR}, + platform = #{platform,jdbcType=VARCHAR}, + configuration = #{configuration,jdbcType=LONGVARCHAR} + where id = #{id,jdbcType=VARCHAR} + + + update service_integration + set organization_id = #{organizationId,jdbcType=VARCHAR}, + platform = #{platform,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} + + \ No newline at end of file diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml index 23ef69272d..85589a901f 100644 --- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml +++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtProjectMapper.xml @@ -4,7 +4,7 @@