From b3d0b32e1904f24566e7913269b36c354c6d52a7 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Mon, 2 Aug 2021 12:01:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=20=E5=A2=9E=E5=8A=A0knife4j=20api=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/pom.xml | 21 +- .../java/io/dataease/auth/api/AuthApi.java | 12 +- .../io/dataease/auth/api/dto/LoginDto.java | 3 + .../io/dataease/auth/server/AuthServer.java | 4 +- .../auth/service/impl/ShiroServiceImpl.java | 2 + .../java/io/dataease/base/domain/Issues.java | 34 - .../dataease/base/domain/IssuesExample.java | 740 -------------- .../io/dataease/base/domain/JarConfig.java | 29 - .../base/domain/JarConfigExample.java | 870 ---------------- .../io/dataease/base/domain/MessageTask.java | 34 - .../base/domain/MessageTaskExample.java | 950 ------------------ .../io/dataease/base/domain/Organization.java | 20 - .../base/domain/OrganizationExample.java | 530 ---------- .../base/domain/ServiceIntegration.java | 17 - .../domain/ServiceIntegrationExample.java | 410 -------- .../base/domain/SwaggerUrlProject.java | 22 - .../base/domain/SwaggerUrlProjectExample.java | 620 ------------ .../io/dataease/base/mapper/IssuesMapper.java | 36 - .../io/dataease/base/mapper/IssuesMapper.xml | 323 ------ .../dataease/base/mapper/JarConfigMapper.java | 30 - .../dataease/base/mapper/JarConfigMapper.xml | 291 ------ .../base/mapper/MessageTaskMapper.java | 37 - .../base/mapper/MessageTaskMapper.xml | 377 ------- .../base/mapper/OrganizationMapper.java | 30 - .../base/mapper/OrganizationMapper.xml | 211 ---- .../base/mapper/ServiceIntegrationMapper.java | 36 - .../base/mapper/ServiceIntegrationMapper.xml | 234 ----- .../base/mapper/SwaggerUrlProjectMapper.java | 31 - .../base/mapper/SwaggerUrlProjectMapper.xml | 231 ----- .../base/mapper/ext/ExtIssuesMapper.java | 11 - .../base/mapper/ext/ExtIssuesMapper.xml | 13 - .../ext/ExtLoadTestReportDetailMapper.java | 7 - .../ext/ExtLoadTestReportDetailMapper.xml | 9 - .../mapper/ext/ExtOrganizationMapper.java | 8 - .../base/mapper/ext/ExtOrganizationMapper.xml | 13 - .../commons/utils/ScriptEngineUtils.java | 33 - .../dataease/config/Knife4jConfiguration.java | 111 ++ .../io/dataease/config/OpenApiConfig.java | 15 - .../controller/{ => sys}/AboutController.java | 2 +- .../{ => sys}/CommonFilesController.java | 2 +- .../{ => sys}/DisplayController.java | 2 +- .../controller/{ => sys}/I18nController.java | 2 +- .../{ => sys}/LicenseController.java | 3 +- .../{ => sys}/SystemParameterController.java | 9 +- .../notice/controller/NoticeController.java | 36 - .../controller/request/MessageRequest.java | 11 - .../java/io/dataease/notice/domain/Mail.java | 18 - .../io/dataease/notice/domain/MailInfo.java | 15 - .../dataease/notice/domain/MessageDetail.java | 21 - .../notice/domain/MessageSettingDetail.java | 13 - .../io/dataease/notice/domain/UserDetail.java | 9 - .../dataease/notice/message/LinkMessage.java | 45 - .../io/dataease/notice/message/Message.java | 5 - .../dataease/notice/message/TextMessage.java | 64 -- .../notice/sender/AbstractNoticeSender.java | 154 --- .../dataease/notice/sender/NoticeModel.java | 51 - .../dataease/notice/sender/NoticeSender.java | 9 - .../notice/sender/impl/MailNoticeSender.java | 50 - .../notice/sender/impl/WeComNoticeSender.java | 39 - .../dataease/notice/service/MailService.java | 79 -- .../notice/service/NoticeSendService.java | 63 -- .../notice/service/NoticeService.java | 159 --- .../io/dataease/notice/util/SendResult.java | 47 - .../dataease/notice/util/WxChatbotClient.java | 50 - .../system/SystemParameterService.java | 28 +- .../src/main/resources/application.properties | 9 + .../db/migration/V2__dataease_ddl.sql | 4 +- 67 files changed, 151 insertions(+), 7253 deletions(-) delete mode 100644 backend/src/main/java/io/dataease/base/domain/Issues.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/IssuesExample.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/JarConfig.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/JarConfigExample.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/MessageTask.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/MessageTaskExample.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/Organization.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/OrganizationExample.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/ServiceIntegration.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/ServiceIntegrationExample.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/SwaggerUrlProject.java delete mode 100644 backend/src/main/java/io/dataease/base/domain/SwaggerUrlProjectExample.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/IssuesMapper.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/IssuesMapper.xml delete mode 100644 backend/src/main/java/io/dataease/base/mapper/JarConfigMapper.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/JarConfigMapper.xml delete mode 100644 backend/src/main/java/io/dataease/base/mapper/MessageTaskMapper.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/MessageTaskMapper.xml delete mode 100644 backend/src/main/java/io/dataease/base/mapper/OrganizationMapper.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/OrganizationMapper.xml delete mode 100644 backend/src/main/java/io/dataease/base/mapper/ServiceIntegrationMapper.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/ServiceIntegrationMapper.xml delete mode 100644 backend/src/main/java/io/dataease/base/mapper/SwaggerUrlProjectMapper.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/SwaggerUrlProjectMapper.xml delete mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtIssuesMapper.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtIssuesMapper.xml delete mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtLoadTestReportDetailMapper.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtLoadTestReportDetailMapper.xml delete mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtOrganizationMapper.java delete mode 100644 backend/src/main/java/io/dataease/base/mapper/ext/ExtOrganizationMapper.xml delete mode 100644 backend/src/main/java/io/dataease/commons/utils/ScriptEngineUtils.java create mode 100644 backend/src/main/java/io/dataease/config/Knife4jConfiguration.java delete mode 100644 backend/src/main/java/io/dataease/config/OpenApiConfig.java rename backend/src/main/java/io/dataease/controller/{ => sys}/AboutController.java (95%) rename backend/src/main/java/io/dataease/controller/{ => sys}/CommonFilesController.java (96%) rename backend/src/main/java/io/dataease/controller/{ => sys}/DisplayController.java (95%) rename backend/src/main/java/io/dataease/controller/{ => sys}/I18nController.java (98%) rename backend/src/main/java/io/dataease/controller/{ => sys}/LicenseController.java (95%) rename backend/src/main/java/io/dataease/controller/{ => sys}/SystemParameterController.java (91%) delete mode 100644 backend/src/main/java/io/dataease/notice/controller/NoticeController.java delete mode 100644 backend/src/main/java/io/dataease/notice/controller/request/MessageRequest.java delete mode 100644 backend/src/main/java/io/dataease/notice/domain/Mail.java delete mode 100644 backend/src/main/java/io/dataease/notice/domain/MailInfo.java delete mode 100644 backend/src/main/java/io/dataease/notice/domain/MessageDetail.java delete mode 100644 backend/src/main/java/io/dataease/notice/domain/MessageSettingDetail.java delete mode 100644 backend/src/main/java/io/dataease/notice/domain/UserDetail.java delete mode 100644 backend/src/main/java/io/dataease/notice/message/LinkMessage.java delete mode 100644 backend/src/main/java/io/dataease/notice/message/Message.java delete mode 100644 backend/src/main/java/io/dataease/notice/message/TextMessage.java delete mode 100644 backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java delete mode 100644 backend/src/main/java/io/dataease/notice/sender/NoticeModel.java delete mode 100644 backend/src/main/java/io/dataease/notice/sender/NoticeSender.java delete mode 100644 backend/src/main/java/io/dataease/notice/sender/impl/MailNoticeSender.java delete mode 100644 backend/src/main/java/io/dataease/notice/sender/impl/WeComNoticeSender.java delete mode 100644 backend/src/main/java/io/dataease/notice/service/MailService.java delete mode 100644 backend/src/main/java/io/dataease/notice/service/NoticeSendService.java delete mode 100644 backend/src/main/java/io/dataease/notice/service/NoticeService.java delete mode 100644 backend/src/main/java/io/dataease/notice/util/SendResult.java delete mode 100644 backend/src/main/java/io/dataease/notice/util/WxChatbotClient.java diff --git a/backend/pom.xml b/backend/pom.xml index 27826a6cde..e3370c8d27 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -152,12 +152,6 @@ ${jwt.version} - - - org.springdoc - springdoc-openapi-ui - 1.2.32 - @@ -205,20 +199,11 @@ 0.0.7 - - io.swagger - swagger-parser - 1.0.51 + com.github.xiaoymin + knife4j-spring-boot-starter + 3.0.3 - - - - io.swagger.parser.v3 - swagger-parser - 2.0.18 - - org.graalvm.sdk diff --git a/backend/src/main/java/io/dataease/auth/api/AuthApi.java b/backend/src/main/java/io/dataease/auth/api/AuthApi.java index 313845a1ee..d21dd55365 100644 --- a/backend/src/main/java/io/dataease/auth/api/AuthApi.java +++ b/backend/src/main/java/io/dataease/auth/api/AuthApi.java @@ -3,6 +3,7 @@ package io.dataease.auth.api; import io.dataease.auth.api.dto.CurrentUserDto; import io.dataease.auth.api.dto.LoginDto; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -15,19 +16,26 @@ import java.util.Map; public interface AuthApi { + @ApiOperation("登录") @PostMapping("/login") Object login(LoginDto loginDto) throws Exception; + @ApiOperation("获取用户信息") @PostMapping("/userInfo") CurrentUserDto userInfo(); - @GetMapping("/isLogin") - Boolean isLogin(); + /*@GetMapping("/isLogin") + Boolean isLogin();*/ + + + @ApiOperation("登出") @PostMapping("/logout") String logout(); + + @ApiOperation("验证账号") @PostMapping("/validateName") Boolean validateName(Map nameDto); diff --git a/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java b/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java index 4b17ab4962..c1f0adc052 100644 --- a/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java +++ b/backend/src/main/java/io/dataease/auth/api/dto/LoginDto.java @@ -1,5 +1,6 @@ package io.dataease.auth.api.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -7,7 +8,9 @@ import java.io.Serializable; @Data public class LoginDto implements Serializable { + @ApiModelProperty(value = "账号", required = true) private String username; + @ApiModelProperty(value = "密码", required = true) private String password; } diff --git a/backend/src/main/java/io/dataease/auth/server/AuthServer.java b/backend/src/main/java/io/dataease/auth/server/AuthServer.java index ae1f33e357..09a311c22c 100644 --- a/backend/src/main/java/io/dataease/auth/server/AuthServer.java +++ b/backend/src/main/java/io/dataease/auth/server/AuthServer.java @@ -98,10 +98,10 @@ public class AuthServer implements AuthApi { return true; } - @Override + /*@Override public Boolean isLogin() { return null; - } + }*/ } diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java index 0298899473..a6cdf4ec83 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java @@ -20,6 +20,7 @@ public class ShiroServiceImpl implements ShiroService { // 配置过滤:不会被拦截的链接 -> 放行 start ---------------------------------------------------------- // 放行Swagger2页面，需要放行这些 + filterChainDefinitionMap.put("/doc.html",ANON); filterChainDefinitionMap.put("/swagger-ui.html",ANON); filterChainDefinitionMap.put("/swagger-ui/**",ANON); filterChainDefinitionMap.put("/swagger/**",ANON); @@ -27,6 +28,7 @@ public class ShiroServiceImpl implements ShiroService { filterChainDefinitionMap.put("/swagger-resources/**",ANON); filterChainDefinitionMap.put("/v2/**",ANON); filterChainDefinitionMap.put("/v3/**",ANON); + filterChainDefinitionMap.put("/static/**", ANON); filterChainDefinitionMap.put("/css/**", ANON); filterChainDefinitionMap.put("/js/**", ANON); diff --git a/backend/src/main/java/io/dataease/base/domain/Issues.java b/backend/src/main/java/io/dataease/base/domain/Issues.java deleted file mode 100644 index d91b781098..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/Issues.java +++ /dev/null @@ -1,34 +0,0 @@ -package io.dataease.base.domain; - -import java.io.Serializable; - -import lombok.Data; - -@Data -public class Issues implements Serializable { - private String id; - - private String title; - - private String status; - - private Long createTime; - - private Long updateTime; - - private String reporter; - - private String lastmodify; - - private String platform; - - private String description; - - private String model; - - private String projectName; - - private String currentOwner; - - private static final long serialVersionUID = 1L; -} diff --git a/backend/src/main/java/io/dataease/base/domain/IssuesExample.java b/backend/src/main/java/io/dataease/base/domain/IssuesExample.java deleted file mode 100644 index 348a14111a..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/IssuesExample.java +++ /dev/null @@ -1,740 +0,0 @@ -package io.dataease.base.domain; - -import java.util.ArrayList; -import java.util.List; - -public class IssuesExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public IssuesExample() { - 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 andTitleIsNull() { - addCriterion("title is null"); - return (Criteria) this; - } - - public Criteria andTitleIsNotNull() { - addCriterion("title is not null"); - return (Criteria) this; - } - - public Criteria andTitleEqualTo(String value) { - addCriterion("title =", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotEqualTo(String value) { - addCriterion("title <>", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThan(String value) { - addCriterion("title >", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleGreaterThanOrEqualTo(String value) { - addCriterion("title >=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThan(String value) { - addCriterion("title <", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLessThanOrEqualTo(String value) { - addCriterion("title <=", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleLike(String value) { - addCriterion("title like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotLike(String value) { - addCriterion("title not like", value, "title"); - return (Criteria) this; - } - - public Criteria andTitleIn(List values) { - addCriterion("title in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotIn(List values) { - addCriterion("title not in", values, "title"); - return (Criteria) this; - } - - public Criteria andTitleBetween(String value1, String value2) { - addCriterion("title between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andTitleNotBetween(String value1, String value2) { - addCriterion("title not between", value1, value2, "title"); - return (Criteria) this; - } - - public Criteria andStatusIsNull() { - addCriterion("`status` is null"); - return (Criteria) this; - } - - public Criteria andStatusIsNotNull() { - addCriterion("`status` is not null"); - return (Criteria) this; - } - - public Criteria andStatusEqualTo(String value) { - addCriterion("`status` =", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotEqualTo(String value) { - addCriterion("`status` <>", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThan(String value) { - addCriterion("`status` >", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusGreaterThanOrEqualTo(String value) { - addCriterion("`status` >=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThan(String value) { - addCriterion("`status` <", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLessThanOrEqualTo(String value) { - addCriterion("`status` <=", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusLike(String value) { - addCriterion("`status` like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotLike(String value) { - addCriterion("`status` not like", value, "status"); - return (Criteria) this; - } - - public Criteria andStatusIn(List values) { - addCriterion("`status` in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotIn(List values) { - addCriterion("`status` not in", values, "status"); - return (Criteria) this; - } - - public Criteria andStatusBetween(String value1, String value2) { - addCriterion("`status` between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andStatusNotBetween(String value1, String value2) { - addCriterion("`status` not between", value1, value2, "status"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Long value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Long value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Long value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Long value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Long value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Long value1, Long value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Long value1, Long value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Long value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Long value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Long value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Long value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Long value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Long value1, Long value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Long value1, Long value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andReporterIsNull() { - addCriterion("reporter is null"); - return (Criteria) this; - } - - public Criteria andReporterIsNotNull() { - addCriterion("reporter is not null"); - return (Criteria) this; - } - - public Criteria andReporterEqualTo(String value) { - addCriterion("reporter =", value, "reporter"); - return (Criteria) this; - } - - public Criteria andReporterNotEqualTo(String value) { - addCriterion("reporter <>", value, "reporter"); - return (Criteria) this; - } - - public Criteria andReporterGreaterThan(String value) { - addCriterion("reporter >", value, "reporter"); - return (Criteria) this; - } - - public Criteria andReporterGreaterThanOrEqualTo(String value) { - addCriterion("reporter >=", value, "reporter"); - return (Criteria) this; - } - - public Criteria andReporterLessThan(String value) { - addCriterion("reporter <", value, "reporter"); - return (Criteria) this; - } - - public Criteria andReporterLessThanOrEqualTo(String value) { - addCriterion("reporter <=", value, "reporter"); - return (Criteria) this; - } - - public Criteria andReporterLike(String value) { - addCriterion("reporter like", value, "reporter"); - return (Criteria) this; - } - - public Criteria andReporterNotLike(String value) { - addCriterion("reporter not like", value, "reporter"); - return (Criteria) this; - } - - public Criteria andReporterIn(List values) { - addCriterion("reporter in", values, "reporter"); - return (Criteria) this; - } - - public Criteria andReporterNotIn(List values) { - addCriterion("reporter not in", values, "reporter"); - return (Criteria) this; - } - - public Criteria andReporterBetween(String value1, String value2) { - addCriterion("reporter between", value1, value2, "reporter"); - return (Criteria) this; - } - - public Criteria andReporterNotBetween(String value1, String value2) { - addCriterion("reporter not between", value1, value2, "reporter"); - return (Criteria) this; - } - - public Criteria andLastmodifyIsNull() { - addCriterion("lastmodify is null"); - return (Criteria) this; - } - - public Criteria andLastmodifyIsNotNull() { - addCriterion("lastmodify is not null"); - return (Criteria) this; - } - - public Criteria andLastmodifyEqualTo(String value) { - addCriterion("lastmodify =", value, "lastmodify"); - return (Criteria) this; - } - - public Criteria andLastmodifyNotEqualTo(String value) { - addCriterion("lastmodify <>", value, "lastmodify"); - return (Criteria) this; - } - - public Criteria andLastmodifyGreaterThan(String value) { - addCriterion("lastmodify >", value, "lastmodify"); - return (Criteria) this; - } - - public Criteria andLastmodifyGreaterThanOrEqualTo(String value) { - addCriterion("lastmodify >=", value, "lastmodify"); - return (Criteria) this; - } - - public Criteria andLastmodifyLessThan(String value) { - addCriterion("lastmodify <", value, "lastmodify"); - return (Criteria) this; - } - - public Criteria andLastmodifyLessThanOrEqualTo(String value) { - addCriterion("lastmodify <=", value, "lastmodify"); - return (Criteria) this; - } - - public Criteria andLastmodifyLike(String value) { - addCriterion("lastmodify like", value, "lastmodify"); - return (Criteria) this; - } - - public Criteria andLastmodifyNotLike(String value) { - addCriterion("lastmodify not like", value, "lastmodify"); - return (Criteria) this; - } - - public Criteria andLastmodifyIn(List values) { - addCriterion("lastmodify in", values, "lastmodify"); - return (Criteria) this; - } - - public Criteria andLastmodifyNotIn(List values) { - addCriterion("lastmodify not in", values, "lastmodify"); - return (Criteria) this; - } - - public Criteria andLastmodifyBetween(String value1, String value2) { - addCriterion("lastmodify between", value1, value2, "lastmodify"); - return (Criteria) this; - } - - public Criteria andLastmodifyNotBetween(String value1, String value2) { - addCriterion("lastmodify not between", value1, value2, "lastmodify"); - 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); - } - } -} diff --git a/backend/src/main/java/io/dataease/base/domain/JarConfig.java b/backend/src/main/java/io/dataease/base/domain/JarConfig.java deleted file mode 100644 index 008109430a..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/JarConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -package io.dataease.base.domain; - -import java.io.Serializable; -import lombok.Data; - -@Data -public class JarConfig implements Serializable { - private String id; - - private String name; - - private String fileName; - - private String creator; - - private String modifier; - - private String path; - - private Boolean enable; - - private String description; - - private Long createTime; - - private Long updateTime; - - private static final long serialVersionUID = 1L; -} diff --git a/backend/src/main/java/io/dataease/base/domain/JarConfigExample.java b/backend/src/main/java/io/dataease/base/domain/JarConfigExample.java deleted file mode 100644 index aa4133674a..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/JarConfigExample.java +++ /dev/null @@ -1,870 +0,0 @@ -package io.dataease.base.domain; - -import java.util.ArrayList; -import java.util.List; - -public class JarConfigExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public JarConfigExample() { - 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 andNameIsNull() { - addCriterion("`name` is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("`name` is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("`name` =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("`name` <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("`name` >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("`name` >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("`name` <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("`name` <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("`name` like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("`name` not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("`name` in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("`name` not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("`name` between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("`name` not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andFileNameIsNull() { - addCriterion("file_name is null"); - return (Criteria) this; - } - - public Criteria andFileNameIsNotNull() { - addCriterion("file_name is not null"); - return (Criteria) this; - } - - public Criteria andFileNameEqualTo(String value) { - addCriterion("file_name =", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameNotEqualTo(String value) { - addCriterion("file_name <>", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameGreaterThan(String value) { - addCriterion("file_name >", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameGreaterThanOrEqualTo(String value) { - addCriterion("file_name >=", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameLessThan(String value) { - addCriterion("file_name <", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameLessThanOrEqualTo(String value) { - addCriterion("file_name <=", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameLike(String value) { - addCriterion("file_name like", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameNotLike(String value) { - addCriterion("file_name not like", value, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameIn(List values) { - addCriterion("file_name in", values, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameNotIn(List values) { - addCriterion("file_name not in", values, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameBetween(String value1, String value2) { - addCriterion("file_name between", value1, value2, "fileName"); - return (Criteria) this; - } - - public Criteria andFileNameNotBetween(String value1, String value2) { - addCriterion("file_name not between", value1, value2, "fileName"); - return (Criteria) this; - } - - public Criteria andCreatorIsNull() { - addCriterion("creator is null"); - return (Criteria) this; - } - - public Criteria andCreatorIsNotNull() { - addCriterion("creator is not null"); - return (Criteria) this; - } - - public Criteria andCreatorEqualTo(String value) { - addCriterion("creator =", value, "creator"); - return (Criteria) this; - } - - public Criteria andCreatorNotEqualTo(String value) { - addCriterion("creator <>", value, "creator"); - return (Criteria) this; - } - - public Criteria andCreatorGreaterThan(String value) { - addCriterion("creator >", value, "creator"); - return (Criteria) this; - } - - public Criteria andCreatorGreaterThanOrEqualTo(String value) { - addCriterion("creator >=", value, "creator"); - return (Criteria) this; - } - - public Criteria andCreatorLessThan(String value) { - addCriterion("creator <", value, "creator"); - return (Criteria) this; - } - - public Criteria andCreatorLessThanOrEqualTo(String value) { - addCriterion("creator <=", value, "creator"); - return (Criteria) this; - } - - public Criteria andCreatorLike(String value) { - addCriterion("creator like", value, "creator"); - return (Criteria) this; - } - - public Criteria andCreatorNotLike(String value) { - addCriterion("creator not like", value, "creator"); - return (Criteria) this; - } - - public Criteria andCreatorIn(List values) { - addCriterion("creator in", values, "creator"); - return (Criteria) this; - } - - public Criteria andCreatorNotIn(List values) { - addCriterion("creator not in", values, "creator"); - return (Criteria) this; - } - - public Criteria andCreatorBetween(String value1, String value2) { - addCriterion("creator between", value1, value2, "creator"); - return (Criteria) this; - } - - public Criteria andCreatorNotBetween(String value1, String value2) { - addCriterion("creator not between", value1, value2, "creator"); - return (Criteria) this; - } - - public Criteria andModifierIsNull() { - addCriterion("modifier is null"); - return (Criteria) this; - } - - public Criteria andModifierIsNotNull() { - addCriterion("modifier is not null"); - return (Criteria) this; - } - - public Criteria andModifierEqualTo(String value) { - addCriterion("modifier =", value, "modifier"); - return (Criteria) this; - } - - public Criteria andModifierNotEqualTo(String value) { - addCriterion("modifier <>", value, "modifier"); - return (Criteria) this; - } - - public Criteria andModifierGreaterThan(String value) { - addCriterion("modifier >", value, "modifier"); - return (Criteria) this; - } - - public Criteria andModifierGreaterThanOrEqualTo(String value) { - addCriterion("modifier >=", value, "modifier"); - return (Criteria) this; - } - - public Criteria andModifierLessThan(String value) { - addCriterion("modifier <", value, "modifier"); - return (Criteria) this; - } - - public Criteria andModifierLessThanOrEqualTo(String value) { - addCriterion("modifier <=", value, "modifier"); - return (Criteria) this; - } - - public Criteria andModifierLike(String value) { - addCriterion("modifier like", value, "modifier"); - return (Criteria) this; - } - - public Criteria andModifierNotLike(String value) { - addCriterion("modifier not like", value, "modifier"); - return (Criteria) this; - } - - public Criteria andModifierIn(List values) { - addCriterion("modifier in", values, "modifier"); - return (Criteria) this; - } - - public Criteria andModifierNotIn(List values) { - addCriterion("modifier not in", values, "modifier"); - return (Criteria) this; - } - - public Criteria andModifierBetween(String value1, String value2) { - addCriterion("modifier between", value1, value2, "modifier"); - return (Criteria) this; - } - - public Criteria andModifierNotBetween(String value1, String value2) { - addCriterion("modifier not between", value1, value2, "modifier"); - return (Criteria) this; - } - - public Criteria andPathIsNull() { - addCriterion("`path` is null"); - return (Criteria) this; - } - - public Criteria andPathIsNotNull() { - addCriterion("`path` is not null"); - return (Criteria) this; - } - - public Criteria andPathEqualTo(String value) { - addCriterion("`path` =", value, "path"); - return (Criteria) this; - } - - public Criteria andPathNotEqualTo(String value) { - addCriterion("`path` <>", value, "path"); - return (Criteria) this; - } - - public Criteria andPathGreaterThan(String value) { - addCriterion("`path` >", value, "path"); - return (Criteria) this; - } - - public Criteria andPathGreaterThanOrEqualTo(String value) { - addCriterion("`path` >=", value, "path"); - return (Criteria) this; - } - - public Criteria andPathLessThan(String value) { - addCriterion("`path` <", value, "path"); - return (Criteria) this; - } - - public Criteria andPathLessThanOrEqualTo(String value) { - addCriterion("`path` <=", value, "path"); - return (Criteria) this; - } - - public Criteria andPathLike(String value) { - addCriterion("`path` like", value, "path"); - return (Criteria) this; - } - - public Criteria andPathNotLike(String value) { - addCriterion("`path` not like", value, "path"); - return (Criteria) this; - } - - public Criteria andPathIn(List values) { - addCriterion("`path` in", values, "path"); - return (Criteria) this; - } - - public Criteria andPathNotIn(List values) { - addCriterion("`path` not in", values, "path"); - return (Criteria) this; - } - - public Criteria andPathBetween(String value1, String value2) { - addCriterion("`path` between", value1, value2, "path"); - return (Criteria) this; - } - - public Criteria andPathNotBetween(String value1, String value2) { - addCriterion("`path` not between", value1, value2, "path"); - return (Criteria) this; - } - - public Criteria andEnableIsNull() { - addCriterion("`enable` is null"); - return (Criteria) this; - } - - public Criteria andEnableIsNotNull() { - addCriterion("`enable` is not null"); - return (Criteria) this; - } - - public Criteria andEnableEqualTo(Boolean value) { - addCriterion("`enable` =", value, "enable"); - return (Criteria) this; - } - - public Criteria andEnableNotEqualTo(Boolean value) { - addCriterion("`enable` <>", value, "enable"); - return (Criteria) this; - } - - public Criteria andEnableGreaterThan(Boolean value) { - addCriterion("`enable` >", value, "enable"); - return (Criteria) this; - } - - public Criteria andEnableGreaterThanOrEqualTo(Boolean value) { - addCriterion("`enable` >=", value, "enable"); - return (Criteria) this; - } - - public Criteria andEnableLessThan(Boolean value) { - addCriterion("`enable` <", value, "enable"); - return (Criteria) this; - } - - public Criteria andEnableLessThanOrEqualTo(Boolean value) { - addCriterion("`enable` <=", value, "enable"); - return (Criteria) this; - } - - public Criteria andEnableIn(List values) { - addCriterion("`enable` in", values, "enable"); - return (Criteria) this; - } - - public Criteria andEnableNotIn(List values) { - addCriterion("`enable` not in", values, "enable"); - return (Criteria) this; - } - - public Criteria andEnableBetween(Boolean value1, Boolean value2) { - addCriterion("`enable` between", value1, value2, "enable"); - return (Criteria) this; - } - - public Criteria andEnableNotBetween(Boolean value1, Boolean value2) { - addCriterion("`enable` not between", value1, value2, "enable"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNull() { - addCriterion("description is null"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNotNull() { - addCriterion("description is not null"); - return (Criteria) this; - } - - public Criteria andDescriptionEqualTo(String value) { - addCriterion("description =", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotEqualTo(String value) { - addCriterion("description <>", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThan(String value) { - addCriterion("description >", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThanOrEqualTo(String value) { - addCriterion("description >=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThan(String value) { - addCriterion("description <", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThanOrEqualTo(String value) { - addCriterion("description <=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLike(String value) { - addCriterion("description like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotLike(String value) { - addCriterion("description not like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionIn(List values) { - addCriterion("description in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionBetween(String value1, String value2) { - addCriterion("description between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotBetween(String value1, String value2) { - addCriterion("description not between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Long value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Long value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Long value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Long value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Long value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Long value1, Long value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Long value1, Long value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Long value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Long value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Long value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Long value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Long value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Long value1, Long value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Long value1, Long value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - 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); - } - } -} diff --git a/backend/src/main/java/io/dataease/base/domain/MessageTask.java b/backend/src/main/java/io/dataease/base/domain/MessageTask.java deleted file mode 100644 index 776d6398ed..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/MessageTask.java +++ /dev/null @@ -1,34 +0,0 @@ -package io.dataease.base.domain; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class MessageTask implements Serializable { - private String id; - - private String type; - - private String event; - - private String userId; - - private String taskType; - - private String webhook; - - private String identification; - - private Boolean isSet; - - private String organizationId; - - private String testId; - - private Long createTime; - - private String template; - - private static final long serialVersionUID = 1L; -} diff --git a/backend/src/main/java/io/dataease/base/domain/MessageTaskExample.java b/backend/src/main/java/io/dataease/base/domain/MessageTaskExample.java deleted file mode 100644 index 9933984d83..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/MessageTaskExample.java +++ /dev/null @@ -1,950 +0,0 @@ -package io.dataease.base.domain; - -import java.util.ArrayList; -import java.util.List; - -public class MessageTaskExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public MessageTaskExample() { - 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 andTypeIsNull() { - addCriterion("`type` is null"); - return (Criteria) this; - } - - public Criteria andTypeIsNotNull() { - addCriterion("`type` is not null"); - return (Criteria) this; - } - - public Criteria andTypeEqualTo(String value) { - addCriterion("`type` =", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotEqualTo(String value) { - addCriterion("`type` <>", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThan(String value) { - addCriterion("`type` >", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeGreaterThanOrEqualTo(String value) { - addCriterion("`type` >=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThan(String value) { - addCriterion("`type` <", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLessThanOrEqualTo(String value) { - addCriterion("`type` <=", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeLike(String value) { - addCriterion("`type` like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotLike(String value) { - addCriterion("`type` not like", value, "type"); - return (Criteria) this; - } - - public Criteria andTypeIn(List values) { - addCriterion("`type` in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotIn(List values) { - addCriterion("`type` not in", values, "type"); - return (Criteria) this; - } - - public Criteria andTypeBetween(String value1, String value2) { - addCriterion("`type` between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andTypeNotBetween(String value1, String value2) { - addCriterion("`type` not between", value1, value2, "type"); - return (Criteria) this; - } - - public Criteria andEventIsNull() { - addCriterion("event is null"); - return (Criteria) this; - } - - public Criteria andEventIsNotNull() { - addCriterion("event is not null"); - return (Criteria) this; - } - - public Criteria andEventEqualTo(String value) { - addCriterion("event =", value, "event"); - return (Criteria) this; - } - - public Criteria andEventNotEqualTo(String value) { - addCriterion("event <>", value, "event"); - return (Criteria) this; - } - - public Criteria andEventGreaterThan(String value) { - addCriterion("event >", value, "event"); - return (Criteria) this; - } - - public Criteria andEventGreaterThanOrEqualTo(String value) { - addCriterion("event >=", value, "event"); - return (Criteria) this; - } - - public Criteria andEventLessThan(String value) { - addCriterion("event <", value, "event"); - return (Criteria) this; - } - - public Criteria andEventLessThanOrEqualTo(String value) { - addCriterion("event <=", value, "event"); - return (Criteria) this; - } - - public Criteria andEventLike(String value) { - addCriterion("event like", value, "event"); - return (Criteria) this; - } - - public Criteria andEventNotLike(String value) { - addCriterion("event not like", value, "event"); - return (Criteria) this; - } - - public Criteria andEventIn(List values) { - addCriterion("event in", values, "event"); - return (Criteria) this; - } - - public Criteria andEventNotIn(List values) { - addCriterion("event not in", values, "event"); - return (Criteria) this; - } - - public Criteria andEventBetween(String value1, String value2) { - addCriterion("event between", value1, value2, "event"); - return (Criteria) this; - } - - public Criteria andEventNotBetween(String value1, String value2) { - addCriterion("event not between", value1, value2, "event"); - return (Criteria) this; - } - - public Criteria andUserIdIsNull() { - addCriterion("user_id is null"); - return (Criteria) this; - } - - public Criteria andUserIdIsNotNull() { - addCriterion("user_id is not null"); - return (Criteria) this; - } - - public Criteria andUserIdEqualTo(String value) { - addCriterion("user_id =", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotEqualTo(String value) { - addCriterion("user_id <>", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThan(String value) { - addCriterion("user_id >", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdGreaterThanOrEqualTo(String value) { - addCriterion("user_id >=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThan(String value) { - addCriterion("user_id <", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLessThanOrEqualTo(String value) { - addCriterion("user_id <=", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdLike(String value) { - addCriterion("user_id like", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotLike(String value) { - addCriterion("user_id not like", value, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdIn(List values) { - addCriterion("user_id in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotIn(List values) { - addCriterion("user_id not in", values, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdBetween(String value1, String value2) { - addCriterion("user_id between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andUserIdNotBetween(String value1, String value2) { - addCriterion("user_id not between", value1, value2, "userId"); - return (Criteria) this; - } - - public Criteria andTaskTypeIsNull() { - addCriterion("task_type is null"); - return (Criteria) this; - } - - public Criteria andTaskTypeIsNotNull() { - addCriterion("task_type is not null"); - return (Criteria) this; - } - - public Criteria andTaskTypeEqualTo(String value) { - addCriterion("task_type =", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeNotEqualTo(String value) { - addCriterion("task_type <>", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeGreaterThan(String value) { - addCriterion("task_type >", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeGreaterThanOrEqualTo(String value) { - addCriterion("task_type >=", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeLessThan(String value) { - addCriterion("task_type <", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeLessThanOrEqualTo(String value) { - addCriterion("task_type <=", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeLike(String value) { - addCriterion("task_type like", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeNotLike(String value) { - addCriterion("task_type not like", value, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeIn(List values) { - addCriterion("task_type in", values, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeNotIn(List values) { - addCriterion("task_type not in", values, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeBetween(String value1, String value2) { - addCriterion("task_type between", value1, value2, "taskType"); - return (Criteria) this; - } - - public Criteria andTaskTypeNotBetween(String value1, String value2) { - addCriterion("task_type not between", value1, value2, "taskType"); - return (Criteria) this; - } - - public Criteria andWebhookIsNull() { - addCriterion("webhook is null"); - return (Criteria) this; - } - - public Criteria andWebhookIsNotNull() { - addCriterion("webhook is not null"); - return (Criteria) this; - } - - public Criteria andWebhookEqualTo(String value) { - addCriterion("webhook =", value, "webhook"); - return (Criteria) this; - } - - public Criteria andWebhookNotEqualTo(String value) { - addCriterion("webhook <>", value, "webhook"); - return (Criteria) this; - } - - public Criteria andWebhookGreaterThan(String value) { - addCriterion("webhook >", value, "webhook"); - return (Criteria) this; - } - - public Criteria andWebhookGreaterThanOrEqualTo(String value) { - addCriterion("webhook >=", value, "webhook"); - return (Criteria) this; - } - - public Criteria andWebhookLessThan(String value) { - addCriterion("webhook <", value, "webhook"); - return (Criteria) this; - } - - public Criteria andWebhookLessThanOrEqualTo(String value) { - addCriterion("webhook <=", value, "webhook"); - return (Criteria) this; - } - - public Criteria andWebhookLike(String value) { - addCriterion("webhook like", value, "webhook"); - return (Criteria) this; - } - - public Criteria andWebhookNotLike(String value) { - addCriterion("webhook not like", value, "webhook"); - return (Criteria) this; - } - - public Criteria andWebhookIn(List values) { - addCriterion("webhook in", values, "webhook"); - return (Criteria) this; - } - - public Criteria andWebhookNotIn(List values) { - addCriterion("webhook not in", values, "webhook"); - return (Criteria) this; - } - - public Criteria andWebhookBetween(String value1, String value2) { - addCriterion("webhook between", value1, value2, "webhook"); - return (Criteria) this; - } - - public Criteria andWebhookNotBetween(String value1, String value2) { - addCriterion("webhook not between", value1, value2, "webhook"); - return (Criteria) this; - } - - public Criteria andIdentificationIsNull() { - addCriterion("identification is null"); - return (Criteria) this; - } - - public Criteria andIdentificationIsNotNull() { - addCriterion("identification is not null"); - return (Criteria) this; - } - - public Criteria andIdentificationEqualTo(String value) { - addCriterion("identification =", value, "identification"); - return (Criteria) this; - } - - public Criteria andIdentificationNotEqualTo(String value) { - addCriterion("identification <>", value, "identification"); - return (Criteria) this; - } - - public Criteria andIdentificationGreaterThan(String value) { - addCriterion("identification >", value, "identification"); - return (Criteria) this; - } - - public Criteria andIdentificationGreaterThanOrEqualTo(String value) { - addCriterion("identification >=", value, "identification"); - return (Criteria) this; - } - - public Criteria andIdentificationLessThan(String value) { - addCriterion("identification <", value, "identification"); - return (Criteria) this; - } - - public Criteria andIdentificationLessThanOrEqualTo(String value) { - addCriterion("identification <=", value, "identification"); - return (Criteria) this; - } - - public Criteria andIdentificationLike(String value) { - addCriterion("identification like", value, "identification"); - return (Criteria) this; - } - - public Criteria andIdentificationNotLike(String value) { - addCriterion("identification not like", value, "identification"); - return (Criteria) this; - } - - public Criteria andIdentificationIn(List values) { - addCriterion("identification in", values, "identification"); - return (Criteria) this; - } - - public Criteria andIdentificationNotIn(List values) { - addCriterion("identification not in", values, "identification"); - return (Criteria) this; - } - - public Criteria andIdentificationBetween(String value1, String value2) { - addCriterion("identification between", value1, value2, "identification"); - return (Criteria) this; - } - - public Criteria andIdentificationNotBetween(String value1, String value2) { - addCriterion("identification not between", value1, value2, "identification"); - return (Criteria) this; - } - - public Criteria andIsSetIsNull() { - addCriterion("is_set is null"); - return (Criteria) this; - } - - public Criteria andIsSetIsNotNull() { - addCriterion("is_set is not null"); - return (Criteria) this; - } - - public Criteria andIsSetEqualTo(Boolean value) { - addCriterion("is_set =", value, "isSet"); - return (Criteria) this; - } - - public Criteria andIsSetNotEqualTo(Boolean value) { - addCriterion("is_set <>", value, "isSet"); - return (Criteria) this; - } - - public Criteria andIsSetGreaterThan(Boolean value) { - addCriterion("is_set >", value, "isSet"); - return (Criteria) this; - } - - public Criteria andIsSetGreaterThanOrEqualTo(Boolean value) { - addCriterion("is_set >=", value, "isSet"); - return (Criteria) this; - } - - public Criteria andIsSetLessThan(Boolean value) { - addCriterion("is_set <", value, "isSet"); - return (Criteria) this; - } - - public Criteria andIsSetLessThanOrEqualTo(Boolean value) { - addCriterion("is_set <=", value, "isSet"); - return (Criteria) this; - } - - public Criteria andIsSetIn(List values) { - addCriterion("is_set in", values, "isSet"); - return (Criteria) this; - } - - public Criteria andIsSetNotIn(List values) { - addCriterion("is_set not in", values, "isSet"); - return (Criteria) this; - } - - public Criteria andIsSetBetween(Boolean value1, Boolean value2) { - addCriterion("is_set between", value1, value2, "isSet"); - return (Criteria) this; - } - - public Criteria andIsSetNotBetween(Boolean value1, Boolean value2) { - addCriterion("is_set not between", value1, value2, "isSet"); - 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 andTestIdIsNull() { - addCriterion("test_id is null"); - return (Criteria) this; - } - - public Criteria andTestIdIsNotNull() { - addCriterion("test_id is not null"); - return (Criteria) this; - } - - public Criteria andTestIdEqualTo(String value) { - addCriterion("test_id =", value, "testId"); - return (Criteria) this; - } - - public Criteria andTestIdNotEqualTo(String value) { - addCriterion("test_id <>", value, "testId"); - return (Criteria) this; - } - - public Criteria andTestIdGreaterThan(String value) { - addCriterion("test_id >", value, "testId"); - return (Criteria) this; - } - - public Criteria andTestIdGreaterThanOrEqualTo(String value) { - addCriterion("test_id >=", value, "testId"); - return (Criteria) this; - } - - public Criteria andTestIdLessThan(String value) { - addCriterion("test_id <", value, "testId"); - return (Criteria) this; - } - - public Criteria andTestIdLessThanOrEqualTo(String value) { - addCriterion("test_id <=", value, "testId"); - return (Criteria) this; - } - - public Criteria andTestIdLike(String value) { - addCriterion("test_id like", value, "testId"); - return (Criteria) this; - } - - public Criteria andTestIdNotLike(String value) { - addCriterion("test_id not like", value, "testId"); - return (Criteria) this; - } - - public Criteria andTestIdIn(List values) { - addCriterion("test_id in", values, "testId"); - return (Criteria) this; - } - - public Criteria andTestIdNotIn(List values) { - addCriterion("test_id not in", values, "testId"); - return (Criteria) this; - } - - public Criteria andTestIdBetween(String value1, String value2) { - addCriterion("test_id between", value1, value2, "testId"); - return (Criteria) this; - } - - public Criteria andTestIdNotBetween(String value1, String value2) { - addCriterion("test_id not between", value1, value2, "testId"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Long value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Long value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Long value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Long value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Long value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Long value1, Long value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Long value1, Long value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - 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); - } - } -} diff --git a/backend/src/main/java/io/dataease/base/domain/Organization.java b/backend/src/main/java/io/dataease/base/domain/Organization.java deleted file mode 100644 index ad41ede36a..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/Organization.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.dataease.base.domain; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class Organization implements Serializable { - private String id; - - private String name; - - private String description; - - private Long createTime; - - private Long updateTime; - - private static final long serialVersionUID = 1L; -} diff --git a/backend/src/main/java/io/dataease/base/domain/OrganizationExample.java b/backend/src/main/java/io/dataease/base/domain/OrganizationExample.java deleted file mode 100644 index a31fef91c5..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/OrganizationExample.java +++ /dev/null @@ -1,530 +0,0 @@ -package io.dataease.base.domain; - -import java.util.ArrayList; -import java.util.List; - -public class OrganizationExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public OrganizationExample() { - 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 andNameIsNull() { - addCriterion("name is null"); - return (Criteria) this; - } - - public Criteria andNameIsNotNull() { - addCriterion("name is not null"); - return (Criteria) this; - } - - public Criteria andNameEqualTo(String value) { - addCriterion("name =", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotEqualTo(String value) { - addCriterion("name <>", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThan(String value) { - addCriterion("name >", value, "name"); - return (Criteria) this; - } - - public Criteria andNameGreaterThanOrEqualTo(String value) { - addCriterion("name >=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThan(String value) { - addCriterion("name <", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLessThanOrEqualTo(String value) { - addCriterion("name <=", value, "name"); - return (Criteria) this; - } - - public Criteria andNameLike(String value) { - addCriterion("name like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameNotLike(String value) { - addCriterion("name not like", value, "name"); - return (Criteria) this; - } - - public Criteria andNameIn(List values) { - addCriterion("name in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameNotIn(List values) { - addCriterion("name not in", values, "name"); - return (Criteria) this; - } - - public Criteria andNameBetween(String value1, String value2) { - addCriterion("name between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andNameNotBetween(String value1, String value2) { - addCriterion("name not between", value1, value2, "name"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNull() { - addCriterion("description is null"); - return (Criteria) this; - } - - public Criteria andDescriptionIsNotNull() { - addCriterion("description is not null"); - return (Criteria) this; - } - - public Criteria andDescriptionEqualTo(String value) { - addCriterion("description =", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotEqualTo(String value) { - addCriterion("description <>", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThan(String value) { - addCriterion("description >", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionGreaterThanOrEqualTo(String value) { - addCriterion("description >=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThan(String value) { - addCriterion("description <", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLessThanOrEqualTo(String value) { - addCriterion("description <=", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionLike(String value) { - addCriterion("description like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotLike(String value) { - addCriterion("description not like", value, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionIn(List values) { - addCriterion("description in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotIn(List values) { - addCriterion("description not in", values, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionBetween(String value1, String value2) { - addCriterion("description between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andDescriptionNotBetween(String value1, String value2) { - addCriterion("description not between", value1, value2, "description"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNull() { - addCriterion("create_time is null"); - return (Criteria) this; - } - - public Criteria andCreateTimeIsNotNull() { - addCriterion("create_time is not null"); - return (Criteria) this; - } - - public Criteria andCreateTimeEqualTo(Long value) { - addCriterion("create_time =", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotEqualTo(Long value) { - addCriterion("create_time <>", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThan(Long value) { - addCriterion("create_time >", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("create_time >=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThan(Long value) { - addCriterion("create_time <", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeLessThanOrEqualTo(Long value) { - addCriterion("create_time <=", value, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeIn(List values) { - addCriterion("create_time in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotIn(List values) { - addCriterion("create_time not in", values, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeBetween(Long value1, Long value2) { - addCriterion("create_time between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andCreateTimeNotBetween(Long value1, Long value2) { - addCriterion("create_time not between", value1, value2, "createTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNull() { - addCriterion("update_time is null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIsNotNull() { - addCriterion("update_time is not null"); - return (Criteria) this; - } - - public Criteria andUpdateTimeEqualTo(Long value) { - addCriterion("update_time =", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotEqualTo(Long value) { - addCriterion("update_time <>", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThan(Long value) { - addCriterion("update_time >", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeGreaterThanOrEqualTo(Long value) { - addCriterion("update_time >=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThan(Long value) { - addCriterion("update_time <", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeLessThanOrEqualTo(Long value) { - addCriterion("update_time <=", value, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeIn(List values) { - addCriterion("update_time in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotIn(List values) { - addCriterion("update_time not in", values, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeBetween(Long value1, Long value2) { - addCriterion("update_time between", value1, value2, "updateTime"); - return (Criteria) this; - } - - public Criteria andUpdateTimeNotBetween(Long value1, Long value2) { - addCriterion("update_time not between", value1, value2, "updateTime"); - 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); - } - } -} diff --git a/backend/src/main/java/io/dataease/base/domain/ServiceIntegration.java b/backend/src/main/java/io/dataease/base/domain/ServiceIntegration.java deleted file mode 100644 index 69e05c1406..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/ServiceIntegration.java +++ /dev/null @@ -1,17 +0,0 @@ -package io.dataease.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; -} diff --git a/backend/src/main/java/io/dataease/base/domain/ServiceIntegrationExample.java b/backend/src/main/java/io/dataease/base/domain/ServiceIntegrationExample.java deleted file mode 100644 index 9bea4bd056..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/ServiceIntegrationExample.java +++ /dev/null @@ -1,410 +0,0 @@ -package io.dataease.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); - } - } -} diff --git a/backend/src/main/java/io/dataease/base/domain/SwaggerUrlProject.java b/backend/src/main/java/io/dataease/base/domain/SwaggerUrlProject.java deleted file mode 100644 index 60668699b0..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/SwaggerUrlProject.java +++ /dev/null @@ -1,22 +0,0 @@ -package io.dataease.base.domain; - -import lombok.Data; - -import java.io.Serializable; - -@Data -public class SwaggerUrlProject implements Serializable { - private String id; - - private String projectId; - - private String swaggerUrl; - - private String moduleId; - - private String modulePath; - - private String modeId; - - private static final long serialVersionUID = 1L; -} diff --git a/backend/src/main/java/io/dataease/base/domain/SwaggerUrlProjectExample.java b/backend/src/main/java/io/dataease/base/domain/SwaggerUrlProjectExample.java deleted file mode 100644 index d56fee7efb..0000000000 --- a/backend/src/main/java/io/dataease/base/domain/SwaggerUrlProjectExample.java +++ /dev/null @@ -1,620 +0,0 @@ -package io.dataease.base.domain; - -import java.util.ArrayList; -import java.util.List; - -public class SwaggerUrlProjectExample { - protected String orderByClause; - - protected boolean distinct; - - protected List oredCriteria; - - public SwaggerUrlProjectExample() { - 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 andProjectIdIsNull() { - addCriterion("project_id is null"); - return (Criteria) this; - } - - public Criteria andProjectIdIsNotNull() { - addCriterion("project_id is not null"); - return (Criteria) this; - } - - public Criteria andProjectIdEqualTo(String value) { - addCriterion("project_id =", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotEqualTo(String value) { - addCriterion("project_id <>", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdGreaterThan(String value) { - addCriterion("project_id >", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdGreaterThanOrEqualTo(String value) { - addCriterion("project_id >=", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdLessThan(String value) { - addCriterion("project_id <", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdLessThanOrEqualTo(String value) { - addCriterion("project_id <=", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdLike(String value) { - addCriterion("project_id like", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotLike(String value) { - addCriterion("project_id not like", value, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdIn(List values) { - addCriterion("project_id in", values, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotIn(List values) { - addCriterion("project_id not in", values, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdBetween(String value1, String value2) { - addCriterion("project_id between", value1, value2, "projectId"); - return (Criteria) this; - } - - public Criteria andProjectIdNotBetween(String value1, String value2) { - addCriterion("project_id not between", value1, value2, "projectId"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlIsNull() { - addCriterion("swagger_url is null"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlIsNotNull() { - addCriterion("swagger_url is not null"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlEqualTo(String value) { - addCriterion("swagger_url =", value, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlNotEqualTo(String value) { - addCriterion("swagger_url <>", value, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlGreaterThan(String value) { - addCriterion("swagger_url >", value, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlGreaterThanOrEqualTo(String value) { - addCriterion("swagger_url >=", value, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlLessThan(String value) { - addCriterion("swagger_url <", value, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlLessThanOrEqualTo(String value) { - addCriterion("swagger_url <=", value, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlLike(String value) { - addCriterion("swagger_url like", value, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlNotLike(String value) { - addCriterion("swagger_url not like", value, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlIn(List values) { - addCriterion("swagger_url in", values, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlNotIn(List values) { - addCriterion("swagger_url not in", values, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlBetween(String value1, String value2) { - addCriterion("swagger_url between", value1, value2, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andSwaggerUrlNotBetween(String value1, String value2) { - addCriterion("swagger_url not between", value1, value2, "swaggerUrl"); - return (Criteria) this; - } - - public Criteria andModuleIdIsNull() { - addCriterion("module_id is null"); - return (Criteria) this; - } - - public Criteria andModuleIdIsNotNull() { - addCriterion("module_id is not null"); - return (Criteria) this; - } - - public Criteria andModuleIdEqualTo(String value) { - addCriterion("module_id =", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdNotEqualTo(String value) { - addCriterion("module_id <>", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdGreaterThan(String value) { - addCriterion("module_id >", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdGreaterThanOrEqualTo(String value) { - addCriterion("module_id >=", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdLessThan(String value) { - addCriterion("module_id <", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdLessThanOrEqualTo(String value) { - addCriterion("module_id <=", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdLike(String value) { - addCriterion("module_id like", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdNotLike(String value) { - addCriterion("module_id not like", value, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdIn(List values) { - addCriterion("module_id in", values, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdNotIn(List values) { - addCriterion("module_id not in", values, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdBetween(String value1, String value2) { - addCriterion("module_id between", value1, value2, "moduleId"); - return (Criteria) this; - } - - public Criteria andModuleIdNotBetween(String value1, String value2) { - addCriterion("module_id not between", value1, value2, "moduleId"); - return (Criteria) this; - } - - public Criteria andModulePathIsNull() { - addCriterion("module_path is null"); - return (Criteria) this; - } - - public Criteria andModulePathIsNotNull() { - addCriterion("module_path is not null"); - return (Criteria) this; - } - - public Criteria andModulePathEqualTo(String value) { - addCriterion("module_path =", value, "modulePath"); - return (Criteria) this; - } - - public Criteria andModulePathNotEqualTo(String value) { - addCriterion("module_path <>", value, "modulePath"); - return (Criteria) this; - } - - public Criteria andModulePathGreaterThan(String value) { - addCriterion("module_path >", value, "modulePath"); - return (Criteria) this; - } - - public Criteria andModulePathGreaterThanOrEqualTo(String value) { - addCriterion("module_path >=", value, "modulePath"); - return (Criteria) this; - } - - public Criteria andModulePathLessThan(String value) { - addCriterion("module_path <", value, "modulePath"); - return (Criteria) this; - } - - public Criteria andModulePathLessThanOrEqualTo(String value) { - addCriterion("module_path <=", value, "modulePath"); - return (Criteria) this; - } - - public Criteria andModulePathLike(String value) { - addCriterion("module_path like", value, "modulePath"); - return (Criteria) this; - } - - public Criteria andModulePathNotLike(String value) { - addCriterion("module_path not like", value, "modulePath"); - return (Criteria) this; - } - - public Criteria andModulePathIn(List values) { - addCriterion("module_path in", values, "modulePath"); - return (Criteria) this; - } - - public Criteria andModulePathNotIn(List values) { - addCriterion("module_path not in", values, "modulePath"); - return (Criteria) this; - } - - public Criteria andModulePathBetween(String value1, String value2) { - addCriterion("module_path between", value1, value2, "modulePath"); - return (Criteria) this; - } - - public Criteria andModulePathNotBetween(String value1, String value2) { - addCriterion("module_path not between", value1, value2, "modulePath"); - return (Criteria) this; - } - - public Criteria andModeIdIsNull() { - addCriterion("mode_id is null"); - return (Criteria) this; - } - - public Criteria andModeIdIsNotNull() { - addCriterion("mode_id is not null"); - return (Criteria) this; - } - - public Criteria andModeIdEqualTo(String value) { - addCriterion("mode_id =", value, "modeId"); - return (Criteria) this; - } - - public Criteria andModeIdNotEqualTo(String value) { - addCriterion("mode_id <>", value, "modeId"); - return (Criteria) this; - } - - public Criteria andModeIdGreaterThan(String value) { - addCriterion("mode_id >", value, "modeId"); - return (Criteria) this; - } - - public Criteria andModeIdGreaterThanOrEqualTo(String value) { - addCriterion("mode_id >=", value, "modeId"); - return (Criteria) this; - } - - public Criteria andModeIdLessThan(String value) { - addCriterion("mode_id <", value, "modeId"); - return (Criteria) this; - } - - public Criteria andModeIdLessThanOrEqualTo(String value) { - addCriterion("mode_id <=", value, "modeId"); - return (Criteria) this; - } - - public Criteria andModeIdLike(String value) { - addCriterion("mode_id like", value, "modeId"); - return (Criteria) this; - } - - public Criteria andModeIdNotLike(String value) { - addCriterion("mode_id not like", value, "modeId"); - return (Criteria) this; - } - - public Criteria andModeIdIn(List values) { - addCriterion("mode_id in", values, "modeId"); - return (Criteria) this; - } - - public Criteria andModeIdNotIn(List values) { - addCriterion("mode_id not in", values, "modeId"); - return (Criteria) this; - } - - public Criteria andModeIdBetween(String value1, String value2) { - addCriterion("mode_id between", value1, value2, "modeId"); - return (Criteria) this; - } - - public Criteria andModeIdNotBetween(String value1, String value2) { - addCriterion("mode_id not between", value1, value2, "modeId"); - 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); - } - } -} diff --git a/backend/src/main/java/io/dataease/base/mapper/IssuesMapper.java b/backend/src/main/java/io/dataease/base/mapper/IssuesMapper.java deleted file mode 100644 index daaccc0c82..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/IssuesMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.dataease.base.mapper; - -import io.dataease.base.domain.Issues; -import io.dataease.base.domain.IssuesExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface IssuesMapper { - long countByExample(IssuesExample example); - - int deleteByExample(IssuesExample example); - - int deleteByPrimaryKey(String id); - - int insert(Issues record); - - int insertSelective(Issues record); - - List selectByExampleWithBLOBs(IssuesExample example); - - List selectByExample(IssuesExample example); - - Issues selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") Issues record, @Param("example") IssuesExample example); - - int updateByExampleWithBLOBs(@Param("record") Issues record, @Param("example") IssuesExample example); - - int updateByExample(@Param("record") Issues record, @Param("example") IssuesExample example); - - int updateByPrimaryKeySelective(Issues record); - - int updateByPrimaryKeyWithBLOBs(Issues record); - - int updateByPrimaryKey(Issues record); -} diff --git a/backend/src/main/java/io/dataease/base/mapper/IssuesMapper.xml b/backend/src/main/java/io/dataease/base/mapper/IssuesMapper.xml deleted file mode 100644 index 0f9118f10c..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/IssuesMapper.xml +++ /dev/null @@ -1,323 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - 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, title, `status`, create_time, update_time, reporter, lastmodify, platform - - - description - - - - - - delete from issues - where id = #{id,jdbcType=VARCHAR} - - - delete from issues - - - - - - insert into issues (id, title, `status`, - create_time, update_time, reporter, - lastmodify, platform, description - ) - values (#{id,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, - #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, #{reporter,jdbcType=VARCHAR}, - #{lastmodify,jdbcType=VARCHAR}, #{platform,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR} - ) - - - insert into issues - - - id, - - - title, - - - `status`, - - - create_time, - - - update_time, - - - reporter, - - - lastmodify, - - - platform, - - - description, - - - - - #{id,jdbcType=VARCHAR}, - - - #{title,jdbcType=VARCHAR}, - - - #{status,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=BIGINT}, - - - #{updateTime,jdbcType=BIGINT}, - - - #{reporter,jdbcType=VARCHAR}, - - - #{lastmodify,jdbcType=VARCHAR}, - - - #{platform,jdbcType=VARCHAR}, - - - #{description,jdbcType=LONGVARCHAR}, - - - - - - update issues - - - id = #{record.id,jdbcType=VARCHAR}, - - - title = #{record.title,jdbcType=VARCHAR}, - - - `status` = #{record.status,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=BIGINT}, - - - update_time = #{record.updateTime,jdbcType=BIGINT}, - - - reporter = #{record.reporter,jdbcType=VARCHAR}, - - - lastmodify = #{record.lastmodify,jdbcType=VARCHAR}, - - - platform = #{record.platform,jdbcType=VARCHAR}, - - - description = #{record.description,jdbcType=LONGVARCHAR}, - - - - - - - - update issues - set id = #{record.id,jdbcType=VARCHAR}, - title = #{record.title,jdbcType=VARCHAR}, - `status` = #{record.status,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, - update_time = #{record.updateTime,jdbcType=BIGINT}, - reporter = #{record.reporter,jdbcType=VARCHAR}, - lastmodify = #{record.lastmodify,jdbcType=VARCHAR}, - platform = #{record.platform,jdbcType=VARCHAR}, - description = #{record.description,jdbcType=LONGVARCHAR} - - - - - - update issues - set id = #{record.id,jdbcType=VARCHAR}, - title = #{record.title,jdbcType=VARCHAR}, - `status` = #{record.status,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, - update_time = #{record.updateTime,jdbcType=BIGINT}, - reporter = #{record.reporter,jdbcType=VARCHAR}, - lastmodify = #{record.lastmodify,jdbcType=VARCHAR}, - platform = #{record.platform,jdbcType=VARCHAR} - - - - - - update issues - - - title = #{title,jdbcType=VARCHAR}, - - - `status` = #{status,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=BIGINT}, - - - update_time = #{updateTime,jdbcType=BIGINT}, - - - reporter = #{reporter,jdbcType=VARCHAR}, - - - lastmodify = #{lastmodify,jdbcType=VARCHAR}, - - - platform = #{platform,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update issues - set title = #{title,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT}, - reporter = #{reporter,jdbcType=VARCHAR}, - lastmodify = #{lastmodify,jdbcType=VARCHAR}, - platform = #{platform,jdbcType=VARCHAR}, - description = #{description,jdbcType=LONGVARCHAR} - where id = #{id,jdbcType=VARCHAR} - - - update issues - set title = #{title,jdbcType=VARCHAR}, - `status` = #{status,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT}, - reporter = #{reporter,jdbcType=VARCHAR}, - lastmodify = #{lastmodify,jdbcType=VARCHAR}, - platform = #{platform,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - - diff --git a/backend/src/main/java/io/dataease/base/mapper/JarConfigMapper.java b/backend/src/main/java/io/dataease/base/mapper/JarConfigMapper.java deleted file mode 100644 index a056b34071..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/JarConfigMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.dataease.base.mapper; - -import io.dataease.base.domain.JarConfig; -import io.dataease.base.domain.JarConfigExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface JarConfigMapper { - long countByExample(JarConfigExample example); - - int deleteByExample(JarConfigExample example); - - int deleteByPrimaryKey(String id); - - int insert(JarConfig record); - - int insertSelective(JarConfig record); - - List selectByExample(JarConfigExample example); - - JarConfig selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") JarConfig record, @Param("example") JarConfigExample example); - - int updateByExample(@Param("record") JarConfig record, @Param("example") JarConfigExample example); - - int updateByPrimaryKeySelective(JarConfig record); - - int updateByPrimaryKey(JarConfig record); -} diff --git a/backend/src/main/java/io/dataease/base/mapper/JarConfigMapper.xml b/backend/src/main/java/io/dataease/base/mapper/JarConfigMapper.xml deleted file mode 100644 index d6e6ef4c51..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/JarConfigMapper.xml +++ /dev/null @@ -1,291 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - 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, `name`, file_name, creator, modifier, `path`, `enable`, description, create_time, - update_time - - - - - delete from jar_config - where id = #{id,jdbcType=VARCHAR} - - - delete from jar_config - - - - - - insert into jar_config (id, `name`, file_name, - creator, modifier, `path`, - `enable`, description, create_time, - update_time) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{fileName,jdbcType=VARCHAR}, - #{creator,jdbcType=VARCHAR}, #{modifier,jdbcType=VARCHAR}, #{path,jdbcType=VARCHAR}, - #{enable,jdbcType=BIT}, #{description,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, - #{updateTime,jdbcType=BIGINT}) - - - insert into jar_config - - - id, - - - `name`, - - - file_name, - - - creator, - - - modifier, - - - `path`, - - - `enable`, - - - description, - - - create_time, - - - update_time, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{fileName,jdbcType=VARCHAR}, - - - #{creator,jdbcType=VARCHAR}, - - - #{modifier,jdbcType=VARCHAR}, - - - #{path,jdbcType=VARCHAR}, - - - #{enable,jdbcType=BIT}, - - - #{description,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=BIGINT}, - - - #{updateTime,jdbcType=BIGINT}, - - - - - - update jar_config - - - id = #{record.id,jdbcType=VARCHAR}, - - - `name` = #{record.name,jdbcType=VARCHAR}, - - - file_name = #{record.fileName,jdbcType=VARCHAR}, - - - creator = #{record.creator,jdbcType=VARCHAR}, - - - modifier = #{record.modifier,jdbcType=VARCHAR}, - - - `path` = #{record.path,jdbcType=VARCHAR}, - - - `enable` = #{record.enable,jdbcType=BIT}, - - - description = #{record.description,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=BIGINT}, - - - update_time = #{record.updateTime,jdbcType=BIGINT}, - - - - - - - - update jar_config - set id = #{record.id,jdbcType=VARCHAR}, - `name` = #{record.name,jdbcType=VARCHAR}, - file_name = #{record.fileName,jdbcType=VARCHAR}, - creator = #{record.creator,jdbcType=VARCHAR}, - modifier = #{record.modifier,jdbcType=VARCHAR}, - `path` = #{record.path,jdbcType=VARCHAR}, - `enable` = #{record.enable,jdbcType=BIT}, - description = #{record.description,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, - update_time = #{record.updateTime,jdbcType=BIGINT} - - - - - - update jar_config - - - `name` = #{name,jdbcType=VARCHAR}, - - - file_name = #{fileName,jdbcType=VARCHAR}, - - - creator = #{creator,jdbcType=VARCHAR}, - - - modifier = #{modifier,jdbcType=VARCHAR}, - - - `path` = #{path,jdbcType=VARCHAR}, - - - `enable` = #{enable,jdbcType=BIT}, - - - description = #{description,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=BIGINT}, - - - update_time = #{updateTime,jdbcType=BIGINT}, - - - where id = #{id,jdbcType=VARCHAR} - - - update jar_config - set `name` = #{name,jdbcType=VARCHAR}, - file_name = #{fileName,jdbcType=VARCHAR}, - creator = #{creator,jdbcType=VARCHAR}, - modifier = #{modifier,jdbcType=VARCHAR}, - `path` = #{path,jdbcType=VARCHAR}, - `enable` = #{enable,jdbcType=BIT}, - description = #{description,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT} - where id = #{id,jdbcType=VARCHAR} - - diff --git a/backend/src/main/java/io/dataease/base/mapper/MessageTaskMapper.java b/backend/src/main/java/io/dataease/base/mapper/MessageTaskMapper.java deleted file mode 100644 index ea812ce178..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/MessageTaskMapper.java +++ /dev/null @@ -1,37 +0,0 @@ -package io.dataease.base.mapper; - -import io.dataease.base.domain.MessageTask; -import io.dataease.base.domain.MessageTaskExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface MessageTaskMapper { - long countByExample(MessageTaskExample example); - - int deleteByExample(MessageTaskExample example); - - int deleteByPrimaryKey(String id); - - int insert(MessageTask record); - - int insertSelective(MessageTask record); - - List selectByExampleWithBLOBs(MessageTaskExample example); - - List selectByExample(MessageTaskExample example); - - MessageTask selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") MessageTask record, @Param("example") MessageTaskExample example); - - int updateByExampleWithBLOBs(@Param("record") MessageTask record, @Param("example") MessageTaskExample example); - - int updateByExample(@Param("record") MessageTask record, @Param("example") MessageTaskExample example); - - int updateByPrimaryKeySelective(MessageTask record); - - int updateByPrimaryKeyWithBLOBs(MessageTask record); - - int updateByPrimaryKey(MessageTask record); -} diff --git a/backend/src/main/java/io/dataease/base/mapper/MessageTaskMapper.xml b/backend/src/main/java/io/dataease/base/mapper/MessageTaskMapper.xml deleted file mode 100644 index 1ade038b93..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/MessageTaskMapper.xml +++ /dev/null @@ -1,377 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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, `type`, event, user_id, task_type, webhook, identification, is_set, organization_id, - test_id, create_time - - - `template` - - - - - - delete from message_task - where id = #{id,jdbcType=VARCHAR} - - - delete from message_task - - - - - - INSERT INTO message_task (id, `type`, event, - user_id, task_type, webhook, - identification, is_set, organization_id, - test_id, create_time, `template` - ) - VALUES (#{id,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{event,jdbcType=VARCHAR}, - #{userId,jdbcType=VARCHAR}, #{taskType,jdbcType=VARCHAR}, #{webhook,jdbcType=VARCHAR}, - #{identification,jdbcType=VARCHAR}, #{isSet,jdbcType=BIT}, #{organizationId,jdbcType=VARCHAR}, - #{testId,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{template,jdbcType=LONGVARCHAR} - ) - - - insert into message_task - - - id, - - - `type`, - - - event, - - - user_id, - - - task_type, - - - webhook, - - - identification, - - - is_set, - - - organization_id, - - - test_id, - - - create_time, - - - `template`, - - - - - #{id,jdbcType=VARCHAR}, - - - #{type,jdbcType=VARCHAR}, - - - #{event,jdbcType=VARCHAR}, - - - #{userId,jdbcType=VARCHAR}, - - - #{taskType,jdbcType=VARCHAR}, - - - #{webhook,jdbcType=VARCHAR}, - - - #{identification,jdbcType=VARCHAR}, - - - #{isSet,jdbcType=BIT}, - - - #{organizationId,jdbcType=VARCHAR}, - - - #{testId,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=BIGINT}, - - - #{template,jdbcType=LONGVARCHAR}, - - - - - - update message_task - - - id = #{record.id,jdbcType=VARCHAR}, - - - `type` = #{record.type,jdbcType=VARCHAR}, - - - event = #{record.event,jdbcType=VARCHAR}, - - - user_id = #{record.userId,jdbcType=VARCHAR}, - - - task_type = #{record.taskType,jdbcType=VARCHAR}, - - - webhook = #{record.webhook,jdbcType=VARCHAR}, - - - identification = #{record.identification,jdbcType=VARCHAR}, - - - is_set = #{record.isSet,jdbcType=BIT}, - - - organization_id = #{record.organizationId,jdbcType=VARCHAR}, - - - test_id = #{record.testId,jdbcType=VARCHAR}, - - - create_time = #{record.createTime,jdbcType=BIGINT}, - - - `template` = #{record.template,jdbcType=LONGVARCHAR}, - - - - - - - - UPDATE message_task - SET id = #{record.id,jdbcType=VARCHAR}, - `type` = #{record.type,jdbcType=VARCHAR}, - event = #{record.event,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=VARCHAR}, - task_type = #{record.taskType,jdbcType=VARCHAR}, - webhook = #{record.webhook,jdbcType=VARCHAR}, - identification = #{record.identification,jdbcType=VARCHAR}, - is_set = #{record.isSet,jdbcType=BIT}, - organization_id = #{record.organizationId,jdbcType=VARCHAR}, - test_id = #{record.testId,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT}, - `template` = #{record.template,jdbcType=LONGVARCHAR} - - - - - - update message_task - set id = #{record.id,jdbcType=VARCHAR}, - `type` = #{record.type,jdbcType=VARCHAR}, - event = #{record.event,jdbcType=VARCHAR}, - user_id = #{record.userId,jdbcType=VARCHAR}, - task_type = #{record.taskType,jdbcType=VARCHAR}, - webhook = #{record.webhook,jdbcType=VARCHAR}, - identification = #{record.identification,jdbcType=VARCHAR}, - is_set = #{record.isSet,jdbcType=BIT}, - organization_id = #{record.organizationId,jdbcType=VARCHAR}, - test_id = #{record.testId,jdbcType=VARCHAR}, - create_time = #{record.createTime,jdbcType=BIGINT} - - - - - - update message_task - - - `type` = #{type,jdbcType=VARCHAR}, - - - event = #{event,jdbcType=VARCHAR}, - - - user_id = #{userId,jdbcType=VARCHAR}, - - - task_type = #{taskType,jdbcType=VARCHAR}, - - - webhook = #{webhook,jdbcType=VARCHAR}, - - - identification = #{identification,jdbcType=VARCHAR}, - - - is_set = #{isSet,jdbcType=BIT}, - - - organization_id = #{organizationId,jdbcType=VARCHAR}, - - - test_id = #{testId,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=BIGINT}, - - - `template` = #{template,jdbcType=LONGVARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - UPDATE message_task - SET `type` = #{type,jdbcType=VARCHAR}, - event = #{event,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=VARCHAR}, - task_type = #{taskType,jdbcType=VARCHAR}, - webhook = #{webhook,jdbcType=VARCHAR}, - identification = #{identification,jdbcType=VARCHAR}, - is_set = #{isSet,jdbcType=BIT}, - organization_id = #{organizationId,jdbcType=VARCHAR}, - test_id = #{testId,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, - `template` = #{template,jdbcType=LONGVARCHAR} - WHERE id = #{id,jdbcType=VARCHAR} - - - UPDATE message_task - SET `type` = #{type,jdbcType=VARCHAR}, - event = #{event,jdbcType=VARCHAR}, - user_id = #{userId,jdbcType=VARCHAR}, - task_type = #{taskType,jdbcType=VARCHAR}, - webhook = #{webhook,jdbcType=VARCHAR}, - identification = #{identification,jdbcType=VARCHAR}, - is_set = #{isSet,jdbcType=BIT}, - organization_id = #{organizationId,jdbcType=VARCHAR}, - test_id = #{testId,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT} - WHERE id = #{id,jdbcType=VARCHAR} - - diff --git a/backend/src/main/java/io/dataease/base/mapper/OrganizationMapper.java b/backend/src/main/java/io/dataease/base/mapper/OrganizationMapper.java deleted file mode 100644 index 3d0db35a04..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/OrganizationMapper.java +++ /dev/null @@ -1,30 +0,0 @@ -package io.dataease.base.mapper; - -import io.dataease.base.domain.Organization; -import io.dataease.base.domain.OrganizationExample; -import java.util.List; -import org.apache.ibatis.annotations.Param; - -public interface OrganizationMapper { - long countByExample(OrganizationExample example); - - int deleteByExample(OrganizationExample example); - - int deleteByPrimaryKey(String id); - - int insert(Organization record); - - int insertSelective(Organization record); - - List selectByExample(OrganizationExample example); - - Organization selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") Organization record, @Param("example") OrganizationExample example); - - int updateByExample(@Param("record") Organization record, @Param("example") OrganizationExample example); - - int updateByPrimaryKeySelective(Organization record); - - int updateByPrimaryKey(Organization record); -} diff --git a/backend/src/main/java/io/dataease/base/mapper/OrganizationMapper.xml b/backend/src/main/java/io/dataease/base/mapper/OrganizationMapper.xml deleted file mode 100644 index 3f8d62f7b7..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/OrganizationMapper.xml +++ /dev/null @@ -1,211 +0,0 @@ - - - - - - - - - - - - - - - - - - - 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, name, description, create_time, update_time - - - - - delete from organization - where id = #{id,jdbcType=VARCHAR} - - - delete from organization - - - - - - insert into organization (id, name, description, - create_time, update_time) - values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, - #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}) - - - insert into organization - - - id, - - - name, - - - description, - - - create_time, - - - update_time, - - - - - #{id,jdbcType=VARCHAR}, - - - #{name,jdbcType=VARCHAR}, - - - #{description,jdbcType=VARCHAR}, - - - #{createTime,jdbcType=BIGINT}, - - - #{updateTime,jdbcType=BIGINT}, - - - - - - update organization - - - id = #{record.id,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 organization - set id = #{record.id,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 organization - - - name = #{name,jdbcType=VARCHAR}, - - - description = #{description,jdbcType=VARCHAR}, - - - create_time = #{createTime,jdbcType=BIGINT}, - - - update_time = #{updateTime,jdbcType=BIGINT}, - - - where id = #{id,jdbcType=VARCHAR} - - - update organization - set name = #{name,jdbcType=VARCHAR}, - description = #{description,jdbcType=VARCHAR}, - create_time = #{createTime,jdbcType=BIGINT}, - update_time = #{updateTime,jdbcType=BIGINT} - where id = #{id,jdbcType=VARCHAR} - - diff --git a/backend/src/main/java/io/dataease/base/mapper/ServiceIntegrationMapper.java b/backend/src/main/java/io/dataease/base/mapper/ServiceIntegrationMapper.java deleted file mode 100644 index affdba1d99..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/ServiceIntegrationMapper.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.dataease.base.mapper; - -import io.dataease.base.domain.ServiceIntegration; -import io.dataease.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); -} diff --git a/backend/src/main/java/io/dataease/base/mapper/ServiceIntegrationMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ServiceIntegrationMapper.xml deleted file mode 100644 index 8304d8f2c2..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/ServiceIntegrationMapper.xml +++ /dev/null @@ -1,234 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 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} - - diff --git a/backend/src/main/java/io/dataease/base/mapper/SwaggerUrlProjectMapper.java b/backend/src/main/java/io/dataease/base/mapper/SwaggerUrlProjectMapper.java deleted file mode 100644 index 0327444b32..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/SwaggerUrlProjectMapper.java +++ /dev/null @@ -1,31 +0,0 @@ -package io.dataease.base.mapper; - -import io.dataease.base.domain.SwaggerUrlProject; -import io.dataease.base.domain.SwaggerUrlProjectExample; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface SwaggerUrlProjectMapper { - long countByExample(SwaggerUrlProjectExample example); - - int deleteByExample(SwaggerUrlProjectExample example); - - int deleteByPrimaryKey(String id); - - int insert(SwaggerUrlProject record); - - int insertSelective(SwaggerUrlProject record); - - List selectByExample(SwaggerUrlProjectExample example); - - SwaggerUrlProject selectByPrimaryKey(String id); - - int updateByExampleSelective(@Param("record") SwaggerUrlProject record, @Param("example") SwaggerUrlProjectExample example); - - int updateByExample(@Param("record") SwaggerUrlProject record, @Param("example") SwaggerUrlProjectExample example); - - int updateByPrimaryKeySelective(SwaggerUrlProject record); - - int updateByPrimaryKey(SwaggerUrlProject record); -} diff --git a/backend/src/main/java/io/dataease/base/mapper/SwaggerUrlProjectMapper.xml b/backend/src/main/java/io/dataease/base/mapper/SwaggerUrlProjectMapper.xml deleted file mode 100644 index 428531fb41..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/SwaggerUrlProjectMapper.xml +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - - - - - - - - - - - - - - - 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, project_id, swagger_url, module_id, module_path, mode_id - - - - - delete - from swagger_url_project - where id = #{id,jdbcType=VARCHAR} - - - delete from swagger_url_project - - - - - - insert into swagger_url_project (id, project_id, swagger_url, - module_id, module_path, mode_id) - values (#{id,jdbcType=VARCHAR}, #{projectId,jdbcType=VARCHAR}, #{swaggerUrl,jdbcType=VARCHAR}, - #{moduleId,jdbcType=VARCHAR}, #{modulePath,jdbcType=VARCHAR}, #{modeId,jdbcType=VARCHAR}) - - - insert into swagger_url_project - - - id, - - - project_id, - - - swagger_url, - - - module_id, - - - module_path, - - - mode_id, - - - - - #{id,jdbcType=VARCHAR}, - - - #{projectId,jdbcType=VARCHAR}, - - - #{swaggerUrl,jdbcType=VARCHAR}, - - - #{moduleId,jdbcType=VARCHAR}, - - - #{modulePath,jdbcType=VARCHAR}, - - - #{modeId,jdbcType=VARCHAR}, - - - - - - update swagger_url_project - - - id = #{record.id,jdbcType=VARCHAR}, - - - project_id = #{record.projectId,jdbcType=VARCHAR}, - - - swagger_url = #{record.swaggerUrl,jdbcType=VARCHAR}, - - - module_id = #{record.moduleId,jdbcType=VARCHAR}, - - - module_path = #{record.modulePath,jdbcType=VARCHAR}, - - - mode_id = #{record.modeId,jdbcType=VARCHAR}, - - - - - - - - update swagger_url_project - set id = #{record.id,jdbcType=VARCHAR}, - project_id = #{record.projectId,jdbcType=VARCHAR}, - swagger_url = #{record.swaggerUrl,jdbcType=VARCHAR}, - module_id = #{record.moduleId,jdbcType=VARCHAR}, - module_path = #{record.modulePath,jdbcType=VARCHAR}, - mode_id = #{record.modeId,jdbcType=VARCHAR} - - - - - - update swagger_url_project - - - project_id = #{projectId,jdbcType=VARCHAR}, - - - swagger_url = #{swaggerUrl,jdbcType=VARCHAR}, - - - module_id = #{moduleId,jdbcType=VARCHAR}, - - - module_path = #{modulePath,jdbcType=VARCHAR}, - - - mode_id = #{modeId,jdbcType=VARCHAR}, - - - where id = #{id,jdbcType=VARCHAR} - - - update swagger_url_project - set project_id = #{projectId,jdbcType=VARCHAR}, - swagger_url = #{swaggerUrl,jdbcType=VARCHAR}, - module_id = #{moduleId,jdbcType=VARCHAR}, - module_path = #{modulePath,jdbcType=VARCHAR}, - mode_id = #{modeId,jdbcType=VARCHAR} - where id = #{id,jdbcType=VARCHAR} - - diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtIssuesMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtIssuesMapper.java deleted file mode 100644 index 220c698fb5..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtIssuesMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.dataease.base.mapper.ext; - -import io.dataease.base.domain.Issues; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -public interface ExtIssuesMapper { - - List getIssues(@Param("caseId") String caseId, @Param("platform") String platform); -} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtIssuesMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtIssuesMapper.xml deleted file mode 100644 index 4ba4c2932c..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtIssuesMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtLoadTestReportDetailMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtLoadTestReportDetailMapper.java deleted file mode 100644 index 57d244543d..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtLoadTestReportDetailMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -package io.dataease.base.mapper.ext; - -import org.apache.ibatis.annotations.Param; - -public interface ExtLoadTestReportDetailMapper { - int appendLine(@Param("reportId") String id, @Param("line") String line); -} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtLoadTestReportDetailMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtLoadTestReportDetailMapper.xml deleted file mode 100644 index a86ac403ed..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtLoadTestReportDetailMapper.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - UPDATE load_test_report_detail - SET content = concat(content, #{line}) - WHERE report_id = #{reportId} - - diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtOrganizationMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtOrganizationMapper.java deleted file mode 100644 index 6d96466ce8..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtOrganizationMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package io.dataease.base.mapper.ext; - -import org.apache.ibatis.annotations.Param; - -public interface ExtOrganizationMapper { - - int checkSourceRole(@Param("sourceId") String sourceId,@Param("userId") String userId,@Param("roleId") String roleId); -} diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtOrganizationMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtOrganizationMapper.xml deleted file mode 100644 index 69cc618ee1..0000000000 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtOrganizationMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - diff --git a/backend/src/main/java/io/dataease/commons/utils/ScriptEngineUtils.java b/backend/src/main/java/io/dataease/commons/utils/ScriptEngineUtils.java deleted file mode 100644 index 245b9f24c1..0000000000 --- a/backend/src/main/java/io/dataease/commons/utils/ScriptEngineUtils.java +++ /dev/null @@ -1,33 +0,0 @@ -package io.dataease.commons.utils; - -import org.apache.commons.io.IOUtils; - -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import javax.script.ScriptException; -import java.nio.charset.StandardCharsets; - -public class ScriptEngineUtils { - private static final String ENGINE_NAME = "graal.js"; - private static ScriptEngine engine; - - static { - final ScriptEngineManager engineManager = new ScriptEngineManager(); - engine = engineManager.getEngineByName(ENGINE_NAME); - try { - String script = IOUtils.toString(ScriptEngineUtils.class.getResource("/javascript/func.js"), StandardCharsets.UTF_8); - engine.eval(script); - } catch (Exception e) { - LogUtil.error(e.getMessage(), e); - } - } - - public static String calculate(String input) { - try { - return engine.eval("calculate('" + input + "')").toString(); - } catch (ScriptException e) { - LogUtil.error(e.getMessage(), e); - return input; - } - } -} diff --git a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java new file mode 100644 index 0000000000..0a9717caf4 --- /dev/null +++ b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java @@ -0,0 +1,111 @@ +package io.dataease.config; + +import cn.hutool.core.collection.CollectionUtil; +import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; +import org.springframework.http.HttpHeaders; +import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration; +import springfox.documentation.builders.*; +import springfox.documentation.oas.annotations.EnableOpenApi; +import springfox.documentation.service.*; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spi.service.contexts.SecurityContext; +import springfox.documentation.spring.web.plugins.Docket; +import java.util.ArrayList; +import java.util.List; + +@EnableOpenApi +@Configuration +@Import(BeanValidatorPluginsConfiguration.class) +public class Knife4jConfiguration { + + private final OpenApiExtensionResolver openApiExtensionResolver; + + + @Autowired + public Knife4jConfiguration(OpenApiExtensionResolver openApiExtensionResolver) { + this.openApiExtensionResolver = openApiExtensionResolver; + } + + @Bean(value = "authApi") + public Docket authApi() { + return defaultApi("权限管理", "io.dataease.auth"); + } + + @Bean(value = "chartApi") + public Docket chartApi() { + return defaultApi("视图管理", "io.dataease.controller.chart"); + } + + @Bean(value = "datasetApi") + public Docket datasetApi() { + return defaultApi("数据集管理", "io.dataease.controller.dataset"); + } + + @Bean(value = "panelApi") + public Docket panelApi() { + return defaultApi("仪表板管理", "io.dataease.controller.panel"); + } + + @Bean(value = "datasourceApi") + public Docket datasourceApi() { + return defaultApi("数据源管理", "io.dataease.datasource"); + } + + @Bean(value = "sysApi") + public Docket sysApi() { + return defaultApi("系统管理", "io.dataease.controller.sys"); + } + + + private ApiInfo apiInfo(){ + return new ApiInfoBuilder() + .title("DataEase很棒~~~！！！") + .license("杭州飞致云信息科技有限公司 1.0-b9") + .description("人人可用的可视化工具") + .termsOfServiceUrl("http://fit2cloud.com/") + .contact(new Contact("fit2cloud","https://www.fit2cloud.com/dataease/index.html","dataease@fit2cloud.com")) + .version("1.0") + .build(); + } + + private Docket defaultApi(String groupName, String packageName) { + List securitySchemes=new ArrayList<>(); + List securityContexts = new ArrayList<>(); + securityContexts.add(securityContext()); + HttpAuthenticationScheme httpAuthenticationScheme = HttpAuthenticationScheme.JWT_BEARER_BUILDER + .name(HttpHeaders.AUTHORIZATION) + .description("Bearer Token") + .build(); + securitySchemes.add(httpAuthenticationScheme); + Docket docket=new Docket(DocumentationType.OAS_30) + .apiInfo(apiInfo()) + .groupName(groupName) + .select() + .apis(RequestHandlerSelectors.basePackage(packageName)) + .paths(PathSelectors.any()) + .build() + .securityContexts(securityContexts).securitySchemes(securitySchemes) + .extensions(openApiExtensionResolver.buildExtensions(groupName)); + return docket; + } + + private SecurityContext securityContext() { + return SecurityContext.builder() + .securityReferences(defaultAuth()) + .forPaths(PathSelectors.regex("/.*")) + .build(); + } + + + List defaultAuth() { + AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything"); + AuthorizationScope[] authorizationScopes = new AuthorizationScope[1]; + authorizationScopes[0] = authorizationScope; + return CollectionUtil.newArrayList(new SecurityReference("BearerToken", authorizationScopes)); + } + +} diff --git a/backend/src/main/java/io/dataease/config/OpenApiConfig.java b/backend/src/main/java/io/dataease/config/OpenApiConfig.java deleted file mode 100644 index 1f75742431..0000000000 --- a/backend/src/main/java/io/dataease/config/OpenApiConfig.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.dataease.config; - -import io.swagger.v3.oas.annotations.OpenAPIDefinition; -import io.swagger.v3.oas.annotations.info.Info; -import org.springframework.context.annotation.Configuration; - -@OpenAPIDefinition( - info = @Info( - title = "MeterSphere", - version = "1.0" - ) -) -@Configuration -public class OpenApiConfig { -} diff --git a/backend/src/main/java/io/dataease/controller/AboutController.java b/backend/src/main/java/io/dataease/controller/sys/AboutController.java similarity index 95% rename from backend/src/main/java/io/dataease/controller/AboutController.java rename to backend/src/main/java/io/dataease/controller/sys/AboutController.java index a4d9fa1e6d..32fbd92273 100644 --- a/backend/src/main/java/io/dataease/controller/AboutController.java +++ b/backend/src/main/java/io/dataease/controller/sys/AboutController.java @@ -1,4 +1,4 @@ -package io.dataease.controller; +package io.dataease.controller.sys; import io.dataease.commons.license.F2CLicenseResponse; diff --git a/backend/src/main/java/io/dataease/controller/CommonFilesController.java b/backend/src/main/java/io/dataease/controller/sys/CommonFilesController.java similarity index 96% rename from backend/src/main/java/io/dataease/controller/CommonFilesController.java rename to backend/src/main/java/io/dataease/controller/sys/CommonFilesController.java index c8d409aef4..434841b447 100644 --- a/backend/src/main/java/io/dataease/controller/CommonFilesController.java +++ b/backend/src/main/java/io/dataease/controller/sys/CommonFilesController.java @@ -1,4 +1,4 @@ -package io.dataease.controller; +package io.dataease.controller.sys; import io.dataease.service.CommonFilesService; import org.springframework.http.ResponseEntity; diff --git a/backend/src/main/java/io/dataease/controller/DisplayController.java b/backend/src/main/java/io/dataease/controller/sys/DisplayController.java similarity index 95% rename from backend/src/main/java/io/dataease/controller/DisplayController.java rename to backend/src/main/java/io/dataease/controller/sys/DisplayController.java index c69519c4a8..0521f552be 100644 --- a/backend/src/main/java/io/dataease/controller/DisplayController.java +++ b/backend/src/main/java/io/dataease/controller/sys/DisplayController.java @@ -1,4 +1,4 @@ -package io.dataease.controller; +package io.dataease.controller.sys; import io.dataease.service.BaseDisplayService; import org.springframework.http.ResponseEntity; diff --git a/backend/src/main/java/io/dataease/controller/I18nController.java b/backend/src/main/java/io/dataease/controller/sys/I18nController.java similarity index 98% rename from backend/src/main/java/io/dataease/controller/I18nController.java rename to backend/src/main/java/io/dataease/controller/sys/I18nController.java index fafc89094d..26e0c595f0 100644 --- a/backend/src/main/java/io/dataease/controller/I18nController.java +++ b/backend/src/main/java/io/dataease/controller/sys/I18nController.java @@ -1,4 +1,4 @@ -package io.dataease.controller; +package io.dataease.controller.sys; import io.dataease.commons.constants.I18nConstants; diff --git a/backend/src/main/java/io/dataease/controller/LicenseController.java b/backend/src/main/java/io/dataease/controller/sys/LicenseController.java similarity index 95% rename from backend/src/main/java/io/dataease/controller/LicenseController.java rename to backend/src/main/java/io/dataease/controller/sys/LicenseController.java index 0fa489a799..e9ca2a353c 100644 --- a/backend/src/main/java/io/dataease/controller/LicenseController.java +++ b/backend/src/main/java/io/dataease/controller/sys/LicenseController.java @@ -1,10 +1,11 @@ -package io.dataease.controller; +package io.dataease.controller.sys; import com.google.gson.Gson; import io.dataease.commons.license.DefaultLicenseService; import io.dataease.commons.license.F2CLicenseResponse; +import io.dataease.controller.ResultHolder; import io.dataease.exception.DataEaseException; import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/src/main/java/io/dataease/controller/SystemParameterController.java b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java similarity index 91% rename from backend/src/main/java/io/dataease/controller/SystemParameterController.java rename to backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java index 14c7b5ebef..7a7e225808 100644 --- a/backend/src/main/java/io/dataease/controller/SystemParameterController.java +++ b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java @@ -1,9 +1,8 @@ -package io.dataease.controller; +package io.dataease.controller.sys; import io.dataease.base.domain.SystemParameter; import io.dataease.commons.constants.ParamConstants; import io.dataease.dto.SystemParameterDTO; -import io.dataease.notice.domain.MailInfo; import io.dataease.service.FileService; import io.dataease.service.system.SystemParameterService; import org.springframework.http.HttpHeaders; @@ -12,7 +11,6 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import java.io.IOException; import java.util.HashMap; @@ -43,10 +41,7 @@ public class SystemParameterController { return systemParameterService.getVersion(); } - @GetMapping("/mail/info") - public MailInfo mailInfo() { - return systemParameterService.mailInfo(ParamConstants.Classify.MAIL.getValue()); - } + @GetMapping("/base/info") diff --git a/backend/src/main/java/io/dataease/notice/controller/NoticeController.java b/backend/src/main/java/io/dataease/notice/controller/NoticeController.java deleted file mode 100644 index 05ab59215c..0000000000 --- a/backend/src/main/java/io/dataease/notice/controller/NoticeController.java +++ /dev/null @@ -1,36 +0,0 @@ -package io.dataease.notice.controller; - -import io.dataease.notice.domain.MessageDetail; -import io.dataease.notice.service.NoticeService; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.List; - -@RestController -@RequestMapping("notice") -public class NoticeController { - @Resource - private NoticeService noticeService; - - @PostMapping("save/message/task") - public void saveMessage(@RequestBody MessageDetail messageDetail) { - noticeService.saveMessageTask(messageDetail); - } - - @GetMapping("/search/message/type/{type}") - public List searchMessage(@PathVariable String type) { - return noticeService.searchMessageByType(type); - } - - @GetMapping("/search/message/{testId}") - public List searchMessageSchedule(@PathVariable String testId) { - return noticeService.searchMessageByTestId(testId); - } - - @GetMapping("/delete/message/{identification}") - public int deleteMessage(@PathVariable String identification) { - return noticeService.delMessage(identification); - } -} - diff --git a/backend/src/main/java/io/dataease/notice/controller/request/MessageRequest.java b/backend/src/main/java/io/dataease/notice/controller/request/MessageRequest.java deleted file mode 100644 index b6642a8657..0000000000 --- a/backend/src/main/java/io/dataease/notice/controller/request/MessageRequest.java +++ /dev/null @@ -1,11 +0,0 @@ -package io.dataease.notice.controller.request; - -import io.dataease.notice.domain.MessageDetail; -import lombok.Data; - -import java.util.List; - -@Data -public class MessageRequest { - private List messageDetail; -} diff --git a/backend/src/main/java/io/dataease/notice/domain/Mail.java b/backend/src/main/java/io/dataease/notice/domain/Mail.java deleted file mode 100644 index 309bbe1368..0000000000 --- a/backend/src/main/java/io/dataease/notice/domain/Mail.java +++ /dev/null @@ -1,18 +0,0 @@ -package io.dataease.notice.domain; - -import lombok.Data; - -@Data -public class Mail { - // 发送给谁 - private String to; - - // 发送主题 - private String subject; - - // 发送内容 - private String content; - - // 附件地址 - private String filePath; -} diff --git a/backend/src/main/java/io/dataease/notice/domain/MailInfo.java b/backend/src/main/java/io/dataease/notice/domain/MailInfo.java deleted file mode 100644 index d2f942a125..0000000000 --- a/backend/src/main/java/io/dataease/notice/domain/MailInfo.java +++ /dev/null @@ -1,15 +0,0 @@ -package io.dataease.notice.domain; - -import lombok.Data; - -@Data -public class MailInfo { - private String host; - private String port; - private String account; - private String password; - private String ssl; - private String tls; - private String recipient; - -} diff --git a/backend/src/main/java/io/dataease/notice/domain/MessageDetail.java b/backend/src/main/java/io/dataease/notice/domain/MessageDetail.java deleted file mode 100644 index 96d0a7d572..0000000000 --- a/backend/src/main/java/io/dataease/notice/domain/MessageDetail.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.dataease.notice.domain; - -import lombok.Data; - -import java.util.ArrayList; -import java.util.List; - -@Data -public class MessageDetail { - private List userIds = new ArrayList<>(); - private String event; - private String taskType; - private String webhook; - private String type; - private String identification; - private String organizationId; - private Boolean isSet; - private String testId; - private Long createTime; - private String template; -} diff --git a/backend/src/main/java/io/dataease/notice/domain/MessageSettingDetail.java b/backend/src/main/java/io/dataease/notice/domain/MessageSettingDetail.java deleted file mode 100644 index 07ef6ad484..0000000000 --- a/backend/src/main/java/io/dataease/notice/domain/MessageSettingDetail.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.dataease.notice.domain; - -import lombok.Data; - -import java.util.List; - -@Data -public class MessageSettingDetail { - private List jenkinsTask; - private List testCasePlanTask; - private List reviewTask; - private List defectTask; -} diff --git a/backend/src/main/java/io/dataease/notice/domain/UserDetail.java b/backend/src/main/java/io/dataease/notice/domain/UserDetail.java deleted file mode 100644 index 91d080b042..0000000000 --- a/backend/src/main/java/io/dataease/notice/domain/UserDetail.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.dataease.notice.domain; - -import lombok.Data; - -@Data -public class UserDetail { - private String email; - private String phone; -} diff --git a/backend/src/main/java/io/dataease/notice/message/LinkMessage.java b/backend/src/main/java/io/dataease/notice/message/LinkMessage.java deleted file mode 100644 index b2712564c8..0000000000 --- a/backend/src/main/java/io/dataease/notice/message/LinkMessage.java +++ /dev/null @@ -1,45 +0,0 @@ -package io.dataease.notice.message; - -import com.alibaba.fastjson.JSON; -import org.apache.commons.lang3.StringUtils; - -import java.util.HashMap; -import java.util.Map; - - -public class LinkMessage implements Message { - - private String title; - private String text; - private String picUrl; - private String messageUrl; - - public String toJsonString() { - Map items = new HashMap(); - items.put("msgtype", "link"); - - Map linkContent = new HashMap(); - if (StringUtils.isBlank(title)) { - throw new IllegalArgumentException("title should not be blank"); - } - linkContent.put("title", title); - - if (StringUtils.isBlank(messageUrl)) { - throw new IllegalArgumentException("messageUrl should not be blank"); - } - linkContent.put("messageUrl", messageUrl); - - if (StringUtils.isBlank(text)) { - throw new IllegalArgumentException("text should not be blank"); - } - linkContent.put("text", text); - - if (StringUtils.isNotBlank(picUrl)) { - linkContent.put("picUrl", picUrl); - } - - items.put("link", linkContent); - - return JSON.toJSONString(items); - } -} diff --git a/backend/src/main/java/io/dataease/notice/message/Message.java b/backend/src/main/java/io/dataease/notice/message/Message.java deleted file mode 100644 index 5dbad90764..0000000000 --- a/backend/src/main/java/io/dataease/notice/message/Message.java +++ /dev/null @@ -1,5 +0,0 @@ -package io.dataease.notice.message; - -public interface Message { - String toJsonString(); -} diff --git a/backend/src/main/java/io/dataease/notice/message/TextMessage.java b/backend/src/main/java/io/dataease/notice/message/TextMessage.java deleted file mode 100644 index 91caa7e4d6..0000000000 --- a/backend/src/main/java/io/dataease/notice/message/TextMessage.java +++ /dev/null @@ -1,64 +0,0 @@ -package io.dataease.notice.message; - -import com.alibaba.fastjson.JSON; -import org.apache.commons.lang3.StringUtils; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - - -public class TextMessage implements Message { - private String text; - private List mentionedMobileList; - private boolean isAtAll; - - public TextMessage(String text) { - this.text = text; - } - - public String getText() { - return text; - } - - public void setText(String text) { - this.text = text; - } - - public boolean isAtAll() { - return isAtAll; - } - - public void setIsAtAll(boolean isAtAll) { - this.isAtAll = isAtAll; - } - - public List getMentionedMobileList() { - return mentionedMobileList; - } - - public void setMentionedMobileList(List mentionedMobileList) { - this.mentionedMobileList = mentionedMobileList; - } - - public String toJsonString() { - Map items = new HashMap(); - items.put("msgtype", "text"); - - Map textContent = new HashMap(); - if (StringUtils.isBlank(text)) { - throw new IllegalArgumentException("text should not be blank"); - } - textContent.put("content", text); - if (isAtAll) { - if (mentionedMobileList == null) mentionedMobileList = new ArrayList(); - mentionedMobileList.add("@all"); - } - if (mentionedMobileList != null && !mentionedMobileList.isEmpty()) { - textContent.put("mentioned_mobile_list", mentionedMobileList); - } - items.put("text", textContent); - return JSON.toJSONString(items); - } -} diff --git a/backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java b/backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java deleted file mode 100644 index f2c2a10dcd..0000000000 --- a/backend/src/main/java/io/dataease/notice/sender/AbstractNoticeSender.java +++ /dev/null @@ -1,154 +0,0 @@ -package io.dataease.notice.sender; - -import io.dataease.base.domain.SysUser; -import io.dataease.commons.constants.NoticeConstants; -import io.dataease.commons.utils.LogUtil; -import io.dataease.notice.domain.MessageDetail; -import io.dataease.service.sys.SysUserService; -import org.apache.commons.collections4.MapUtils; -import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.RegExUtils; -import org.apache.commons.lang3.StringUtils; - -import javax.annotation.Resource; -import java.io.IOException; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; - -public abstract class AbstractNoticeSender implements NoticeSender { - @Resource - private SysUserService sysUserService; - - protected String getContext(MessageDetail messageDetail, NoticeModel noticeModel) { - // 如果配置了模版就直接使用模版 - if (StringUtils.isNotBlank(messageDetail.getTemplate())) { - return getContent(messageDetail.getTemplate(), noticeModel.getParamMap()); - } - // 处理 userIds 中包含的特殊值 - List realUserIds = getRealUserIds(messageDetail.getUserIds(), noticeModel.getRelatedUsers(), messageDetail.getEvent()); - messageDetail.setUserIds(realUserIds); - - // 处理 WeCom Ding context - String context = ""; - switch (messageDetail.getEvent()) { - case NoticeConstants.Event.CREATE: - case NoticeConstants.Event.UPDATE: - case NoticeConstants.Event.DELETE: - case NoticeConstants.Event.COMMENT: - context = noticeModel.getContext(); - break; - case NoticeConstants.Event.EXECUTE_FAILED: - context = noticeModel.getFailedContext(); - break; - case NoticeConstants.Event.EXECUTE_SUCCESSFUL: - context = noticeModel.getSuccessContext(); - break; - default: - break; - } - return context; - } - - protected String getHtmlContext(MessageDetail messageDetail, NoticeModel noticeModel) { - // 如果配置了模版就直接使用模版 - if (StringUtils.isNotBlank(messageDetail.getTemplate())) { - return getContent(messageDetail.getTemplate(), noticeModel.getParamMap()); - } - // 处理 userIds 中包含的特殊值 - List realUserIds = getRealUserIds(messageDetail.getUserIds(), noticeModel.getRelatedUsers(), messageDetail.getEvent()); - messageDetail.setUserIds(realUserIds); - - // 处理 mail context - String context = ""; - try { - switch (messageDetail.getEvent()) { - case NoticeConstants.Event.CREATE: - case NoticeConstants.Event.UPDATE: - case NoticeConstants.Event.DELETE: - case NoticeConstants.Event.COMMENT: - URL resource = this.getClass().getResource("/mail/" + noticeModel.getMailTemplate() + ".html"); - context = IOUtils.toString(resource, StandardCharsets.UTF_8); - break; - case NoticeConstants.Event.EXECUTE_FAILED: - URL resource1 = this.getClass().getResource("/mail/" + noticeModel.getFailedMailTemplate() + ".html"); - context = IOUtils.toString(resource1, StandardCharsets.UTF_8); - break; - case NoticeConstants.Event.EXECUTE_SUCCESSFUL: - URL resource2 = this.getClass().getResource("/mail/" + noticeModel.getSuccessMailTemplate() + ".html"); - context = IOUtils.toString(resource2, StandardCharsets.UTF_8); - break; - default: - break; - } - } catch (IOException e) { - LogUtil.error(e); - } - return getContent(context, noticeModel.getParamMap()); - } - - protected String getContent(String template, Map context) { - if (MapUtils.isNotEmpty(context)) { - for (String k : context.keySet()) { - if (context.get(k) != null) { - template = RegExUtils.replaceAll(template, "\\$\\{" + k + "}", context.get(k).toString()); - } else { - template = RegExUtils.replaceAll(template, "\\$\\{" + k + "}", "未设置"); - } - } - } - return template; - } - - protected List getUserPhones(List userIds) { - List userIdLists = userIds.stream().map(Long::parseLong).collect(Collectors.toList()); - List list = sysUserService.users(userIdLists); - //List list = userService.queryTypeByIds(userIds); - List phoneList = new ArrayList<>(); - list.forEach(u -> phoneList.add(u.getPhone())); - LogUtil.info("收件人地址: " + phoneList); - return phoneList.stream().distinct().collect(Collectors.toList()); - } - - protected List getUserEmails(List userIds) { - /*List list = userService.queryTypeByIds(userIds);*/ - List userIdLists = userIds.stream().map(Long::parseLong).collect(Collectors.toList()); - List list = sysUserService.users(userIdLists); - List phoneList = new ArrayList<>(); - list.forEach(u -> phoneList.add(u.getEmail())); - LogUtil.info("收件人地址: " + phoneList); - return phoneList.stream().distinct().collect(Collectors.toList()); - } - - private List getRealUserIds(List userIds, List relatedUsers, String event) { - List toUserIds = new ArrayList<>(); - for (String userId : userIds) { - switch (userId) { - case NoticeConstants.RelatedUser.EXECUTOR: - if (StringUtils.equals(NoticeConstants.Event.CREATE, event)) { - toUserIds.addAll(relatedUsers); - } - break; - case NoticeConstants.RelatedUser.FOUNDER: - if (StringUtils.equals(NoticeConstants.Event.UPDATE, event) - || StringUtils.equals(NoticeConstants.Event.DELETE, event)) { - toUserIds.addAll(relatedUsers); - } - break; - case NoticeConstants.RelatedUser.MAINTAINER: - if (StringUtils.equals(NoticeConstants.Event.COMMENT, event)) { - toUserIds.addAll(relatedUsers); - } - break; - default: - toUserIds.add(userId); - break; - } - } - - return toUserIds; - } -} diff --git a/backend/src/main/java/io/dataease/notice/sender/NoticeModel.java b/backend/src/main/java/io/dataease/notice/sender/NoticeModel.java deleted file mode 100644 index 2dc6f7d47a..0000000000 --- a/backend/src/main/java/io/dataease/notice/sender/NoticeModel.java +++ /dev/null @@ -1,51 +0,0 @@ -package io.dataease.notice.sender; - -import lombok.Builder; -import lombok.Data; - -import java.util.List; -import java.util.Map; - -@Data -@Builder -public class NoticeModel { - /** - * 保存 测试id - */ - private String testId; - /** - * 保存状态 - */ - private String status; - /** - * Event - */ - private String event; - /** - * 消息主题 - */ - private String subject; - /** - * 消息内容 - */ - private String context; - private String successContext; - private String failedContext; - - /** - * html 消息模版 - */ - private String mailTemplate; - private String failedMailTemplate; - private String successMailTemplate; - - /** - * 保存特殊的用户 - */ - private List relatedUsers; - - /** - * 模版里的参数信息 - */ - private Map paramMap; -} diff --git a/backend/src/main/java/io/dataease/notice/sender/NoticeSender.java b/backend/src/main/java/io/dataease/notice/sender/NoticeSender.java deleted file mode 100644 index 8958d71006..0000000000 --- a/backend/src/main/java/io/dataease/notice/sender/NoticeSender.java +++ /dev/null @@ -1,9 +0,0 @@ -package io.dataease.notice.sender; - -import io.dataease.notice.domain.MessageDetail; -import org.springframework.scheduling.annotation.Async; - -public interface NoticeSender { - @Async - void send(MessageDetail messageDetail, NoticeModel noticeModel); -} diff --git a/backend/src/main/java/io/dataease/notice/sender/impl/MailNoticeSender.java b/backend/src/main/java/io/dataease/notice/sender/impl/MailNoticeSender.java deleted file mode 100644 index e82b56c66f..0000000000 --- a/backend/src/main/java/io/dataease/notice/sender/impl/MailNoticeSender.java +++ /dev/null @@ -1,50 +0,0 @@ -package io.dataease.notice.sender.impl; - - -import io.dataease.commons.utils.LogUtil; -import io.dataease.notice.domain.MessageDetail; -import io.dataease.notice.sender.AbstractNoticeSender; -import io.dataease.notice.sender.NoticeModel; -import io.dataease.notice.service.MailService; -import org.springframework.mail.javamail.JavaMailSenderImpl; -import org.springframework.mail.javamail.MimeMessageHelper; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import javax.mail.MessagingException; -import javax.mail.internet.MimeMessage; -import java.util.List; - -@Component -public class MailNoticeSender extends AbstractNoticeSender { - @Resource - private MailService mailService; - - private void sendMail(MessageDetail messageDetail, String context, NoticeModel noticeModel) throws MessagingException { - LogUtil.info("发送邮件开始 "); - JavaMailSenderImpl javaMailSender = mailService.getMailSender(); - MimeMessage mimeMessage = javaMailSender.createMimeMessage(); - MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true); - helper.setFrom(javaMailSender.getUsername()); - LogUtil.info("发件人地址"+javaMailSender.getUsername()); - LogUtil.info("helper"+helper); - helper.setSubject("MeterSphere " + noticeModel.getSubject()); - List emails = super.getUserEmails(messageDetail.getUserIds()); - String[] users = emails.toArray(new String[0]); - LogUtil.info("收件人地址: " + emails); - helper.setText(context, true); - helper.setTo(users); - javaMailSender.send(mimeMessage); - } - - @Override - public void send(MessageDetail messageDetail, NoticeModel noticeModel) { - String context = super.getHtmlContext(messageDetail, noticeModel); - try { - sendMail(messageDetail, context, noticeModel); - LogUtil.info("发送邮件结束"); - } catch (Exception e) { - LogUtil.error(e); - } - } -} diff --git a/backend/src/main/java/io/dataease/notice/sender/impl/WeComNoticeSender.java b/backend/src/main/java/io/dataease/notice/sender/impl/WeComNoticeSender.java deleted file mode 100644 index 1bd43b5664..0000000000 --- a/backend/src/main/java/io/dataease/notice/sender/impl/WeComNoticeSender.java +++ /dev/null @@ -1,39 +0,0 @@ -package io.dataease.notice.sender.impl; - -import io.dataease.notice.sender.AbstractNoticeSender; -import io.dataease.commons.utils.LogUtil; -import io.dataease.notice.domain.MessageDetail; -import io.dataease.notice.message.TextMessage; -import io.dataease.notice.sender.NoticeModel; -import io.dataease.notice.util.WxChatbotClient; -import org.apache.commons.collections4.CollectionUtils; -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.util.List; - -@Component -public class WeComNoticeSender extends AbstractNoticeSender { - - - public void sendWechatRobot(MessageDetail messageDetail, String context) { - List userIds = messageDetail.getUserIds(); - if (CollectionUtils.isEmpty(userIds)) { - return; - } - TextMessage message = new TextMessage(context); - List phoneLists = super.getUserPhones(userIds); - message.setMentionedMobileList(phoneLists); - try { - WxChatbotClient.send(messageDetail.getWebhook(), message); - } catch (IOException e) { - LogUtil.error(e.getMessage(), e); - } - } - - @Override - public void send(MessageDetail messageDetail, NoticeModel noticeModel) { - String context = super.getContext(messageDetail, noticeModel); - sendWechatRobot(messageDetail, context); - } -} diff --git a/backend/src/main/java/io/dataease/notice/service/MailService.java b/backend/src/main/java/io/dataease/notice/service/MailService.java deleted file mode 100644 index bd33b23f25..0000000000 --- a/backend/src/main/java/io/dataease/notice/service/MailService.java +++ /dev/null @@ -1,79 +0,0 @@ -package io.dataease.notice.service; - -import io.dataease.base.domain.SystemParameter; -import io.dataease.commons.constants.ParamConstants; -import io.dataease.commons.utils.EncryptUtils; -import io.dataease.service.system.SystemParameterService; -import org.apache.commons.lang3.BooleanUtils; -import org.springframework.mail.javamail.JavaMailSenderImpl; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -import javax.annotation.Resource; -import java.util.List; -import java.util.Properties; - -@Service -@Transactional(propagation = Propagation.NOT_SUPPORTED) -public class MailService { - @Resource - private SystemParameterService systemParameterService; - - public JavaMailSenderImpl getMailSender() { - Properties props = new Properties(); - JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl(); - List paramList = systemParameterService.getParamList(ParamConstants.Classify.MAIL.getValue()); - javaMailSender.setDefaultEncoding("UTF-8"); - javaMailSender.setProtocol("smtp"); - props.put("mail.smtp.auth", "true"); - - for (SystemParameter p : paramList) { - switch (p.getParamKey()) { - case "smtp.host": - javaMailSender.setHost(p.getParamValue()); - break; - case "smtp.port": - javaMailSender.setPort(Integer.parseInt(p.getParamValue())); - break; - case "smtp.account": - javaMailSender.setUsername(p.getParamValue()); - break; - case "smtp.password": - javaMailSender.setPassword(EncryptUtils.aesDecrypt(p.getParamValue()).toString()); - break; - case "smtp.ssl": - if (BooleanUtils.toBoolean(p.getParamValue())) { - javaMailSender.setProtocol("smtps"); - props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory"); - } - break; - case "smtp.tls": - String result = BooleanUtils.toString(BooleanUtils.toBoolean(p.getParamValue()), "true", "false"); - props.put("mail.smtp.starttls.enable", result); - props.put("mail.smtp.starttls.required", result); - break; - /* case "smtp.anon": - boolean isAnon = BooleanUtils.toBoolean(p.getParamValue()); - if (isAnon) { - props.put("mail.smtp.auth", "false"); - javaMailSender.setUsername(null); - javaMailSender.setPassword(null); - } - break;*/ - default: - break; - } - } - - props.put("mail.smtp.timeout", "30000"); - props.put("mail.smtp.connectiontimeout", "5000"); - javaMailSender.setJavaMailProperties(props); - return javaMailSender; - } -} - - - - - diff --git a/backend/src/main/java/io/dataease/notice/service/NoticeSendService.java b/backend/src/main/java/io/dataease/notice/service/NoticeSendService.java deleted file mode 100644 index 7ab13e1fbb..0000000000 --- a/backend/src/main/java/io/dataease/notice/service/NoticeSendService.java +++ /dev/null @@ -1,63 +0,0 @@ -package io.dataease.notice.service; - -import io.dataease.commons.constants.NoticeConstants; -import io.dataease.notice.domain.MessageDetail; -import io.dataease.notice.sender.NoticeModel; -import io.dataease.notice.sender.NoticeSender; -import io.dataease.notice.sender.impl.MailNoticeSender; -import io.dataease.notice.sender.impl.WeComNoticeSender; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.List; - -@Component -public class NoticeSendService { - @Resource - private MailNoticeSender mailNoticeSender; - @Resource - private WeComNoticeSender weComNoticeSender; - - @Resource - private NoticeService noticeService; - - private NoticeSender getNoticeSender(MessageDetail messageDetail) { - NoticeSender noticeSender = null; - switch (messageDetail.getType()) { - case NoticeConstants.Type.EMAIL: - noticeSender = mailNoticeSender; - break; - case NoticeConstants.Type.WECHAT_ROBOT: - noticeSender = weComNoticeSender; - break; -// case NoticeConstants.Type.NAIL_ROBOT: -// noticeSender = dingNoticeSender; -// break; - default: - break; - } - - return noticeSender; - } - - public void send(String taskType, NoticeModel noticeModel) { - List messageDetails; - switch (taskType) { - case NoticeConstants.Mode.API: - messageDetails = noticeService.searchMessageByType(NoticeConstants.TaskType.JENKINS_TASK); - break; - case NoticeConstants.Mode.SCHEDULE: - messageDetails = noticeService.searchMessageByTestId(noticeModel.getTestId()); - break; - default: - messageDetails = noticeService.searchMessageByType(taskType); - break; - } - messageDetails.forEach(messageDetail -> { - if (StringUtils.equals(messageDetail.getEvent(), noticeModel.getEvent())) { - this.getNoticeSender(messageDetail).send(messageDetail, noticeModel); - } - }); - } -} diff --git a/backend/src/main/java/io/dataease/notice/service/NoticeService.java b/backend/src/main/java/io/dataease/notice/service/NoticeService.java deleted file mode 100644 index 170c1910ff..0000000000 --- a/backend/src/main/java/io/dataease/notice/service/NoticeService.java +++ /dev/null @@ -1,159 +0,0 @@ -package io.dataease.notice.service; - -import io.dataease.auth.api.dto.CurrentUserDto; -import io.dataease.base.domain.MessageTask; -import io.dataease.base.domain.MessageTaskExample; -import io.dataease.base.mapper.MessageTaskMapper; -import io.dataease.commons.exception.DEException; -import io.dataease.commons.utils.AuthUtils; -import io.dataease.i18n.Translator; -import io.dataease.notice.domain.MessageDetail; -import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.util.*; -import java.util.stream.Collectors; - -@Service -@Transactional(rollbackFor = Exception.class) -public class NoticeService { - @Resource - private MessageTaskMapper messageTaskMapper; - - public void saveMessageTask(MessageDetail messageDetail) { - /*MessageTaskExample example = new MessageTaskExample(); - example.createCriteria().andIdentificationEqualTo(messageDetail.getIdentification()); - List messageTaskLists = messageTaskMapper.selectByExample(example); - if (messageTaskLists.size() > 0) { - delMessage(messageDetail.getIdentification()); - } - SysUser user = AuthUtils.getUser(); - String orgId = user.getLastOrganizationId(); - long time = System.currentTimeMillis(); - String identification = messageDetail.getIdentification(); - if (StringUtils.isBlank(identification)) { - identification = UUID.randomUUID().toString(); - } - for (String userId : messageDetail.getUserIds()) { - checkUserIdExist(userId, messageDetail, orgId); - MessageTask messageTask = new MessageTask(); - messageTask.setId(UUID.randomUUID().toString()); - messageTask.setEvent(messageDetail.getEvent()); - messageTask.setTaskType(messageDetail.getTaskType()); - messageTask.setUserId(userId); - messageTask.setType(messageDetail.getType()); - messageTask.setWebhook(messageDetail.getWebhook()); - messageTask.setIdentification(identification); - messageTask.setIsSet(false); - messageTask.setOrganizationId(orgId); - messageTask.setTestId(messageDetail.getTestId()); - messageTask.setCreateTime(time); - setTemplate(messageDetail, messageTask); - messageTaskMapper.insert(messageTask); - }*/ - } - - private void setTemplate(MessageDetail messageDetail, MessageTask messageTask) { - if (StringUtils.isNotBlank(messageDetail.getTemplate())) { - messageTask.setTemplate(messageDetail.getTemplate()); - } - } - - private void checkUserIdExist(String userId, MessageDetail list, String orgId) { - MessageTaskExample example = new MessageTaskExample(); - if (StringUtils.isBlank(list.getTestId())) { - example.createCriteria() - .andUserIdEqualTo(userId) - .andEventEqualTo(list.getEvent()) - .andTypeEqualTo(list.getType()) - .andTaskTypeEqualTo(list.getTaskType()) - .andWebhookEqualTo(list.getWebhook()) - .andOrganizationIdEqualTo(orgId); - } else { - example.createCriteria() - .andUserIdEqualTo(userId) - .andEventEqualTo(list.getEvent()) - .andTypeEqualTo(list.getType()) - .andTaskTypeEqualTo(list.getTaskType()) - .andWebhookEqualTo(list.getWebhook()) - .andTestIdEqualTo(list.getTestId()) - .andOrganizationIdEqualTo(orgId); - } - if (messageTaskMapper.countByExample(example) > 0) { - DEException.throwException(Translator.get("message_task_already_exists")); - } - } - - public List searchMessageByTestId(String testId) { - MessageTaskExample example = new MessageTaskExample(); - example.createCriteria().andTestIdEqualTo(testId); - List messageTaskLists = messageTaskMapper.selectByExampleWithBLOBs(example); - List scheduleMessageTask = new ArrayList<>(); - Map> MessageTaskMap = messageTaskLists.stream().collect(Collectors.groupingBy(MessageTask::getIdentification)); - MessageTaskMap.forEach((k, v) -> { - MessageDetail messageDetail = getMessageDetail(v); - scheduleMessageTask.add(messageDetail); - }); - scheduleMessageTask.sort(Comparator.comparing(MessageDetail::getCreateTime, Comparator.nullsLast(Long::compareTo)).reversed()); - return scheduleMessageTask; - } - - public List searchMessageByType(String type) { - CurrentUserDto user = AuthUtils.getUser(); - //String orgId = user.getLastOrganizationId(); - List messageDetails = new ArrayList<>(); - - MessageTaskExample example = new MessageTaskExample(); - example.createCriteria() - .andTaskTypeEqualTo(type); - //.andOrganizationIdEqualTo(orgId); - List messageTaskLists = messageTaskMapper.selectByExampleWithBLOBs(example); - - Map> messageTaskMap = messageTaskLists.stream() - .collect(Collectors.groupingBy(NoticeService::fetchGroupKey)); - messageTaskMap.forEach((k, v) -> { - MessageDetail messageDetail = getMessageDetail(v); - messageDetails.add(messageDetail); - }); - - return messageDetails.stream() - .sorted(Comparator.comparing(MessageDetail::getCreateTime, Comparator.nullsLast(Long::compareTo)).reversed()) - .collect(Collectors.toList()) - .stream() - .distinct() - .collect(Collectors.toList()); - } - - private MessageDetail getMessageDetail(List messageTasks) { - Set userIds = new HashSet<>(); - - MessageDetail messageDetail = new MessageDetail(); - for (MessageTask m : messageTasks) { - userIds.add(m.getUserId()); - messageDetail.setEvent(m.getEvent()); - messageDetail.setTaskType(m.getTaskType()); - messageDetail.setWebhook(m.getWebhook()); - messageDetail.setIdentification(m.getIdentification()); - messageDetail.setType(m.getType()); - messageDetail.setIsSet(m.getIsSet()); - messageDetail.setCreateTime(m.getCreateTime()); - messageDetail.setTemplate(m.getTemplate()); - } - if (CollectionUtils.isNotEmpty(userIds)) { - messageDetail.setUserIds(new ArrayList<>(userIds)); - } - return messageDetail; - } - - private static String fetchGroupKey(MessageTask messageTask) { - return messageTask.getTaskType() + "#" + messageTask.getIdentification(); - } - - public int delMessage(String identification) { - MessageTaskExample example = new MessageTaskExample(); - example.createCriteria().andIdentificationEqualTo(identification); - return messageTaskMapper.deleteByExample(example); - } -} diff --git a/backend/src/main/java/io/dataease/notice/util/SendResult.java b/backend/src/main/java/io/dataease/notice/util/SendResult.java deleted file mode 100644 index 6b154bdd3a..0000000000 --- a/backend/src/main/java/io/dataease/notice/util/SendResult.java +++ /dev/null @@ -1,47 +0,0 @@ -package io.dataease.notice.util; - -import com.alibaba.fastjson.JSON; - -import java.util.HashMap; -import java.util.Map; - -/** - * - */ -public class SendResult { - private boolean isSuccess; - private Integer errorCode; - private String errorMsg; - - public boolean isSuccess() { - return isSuccess; - } - - public void setIsSuccess(boolean isSuccess) { - this.isSuccess = isSuccess; - } - - public Integer getErrorCode() { - return errorCode; - } - - public void setErrorCode(Integer errorCode) { - this.errorCode = errorCode; - } - - public String getErrorMsg() { - return errorMsg; - } - - public void setErrorMsg(String errorMsg) { - this.errorMsg = errorMsg; - } - - public String toString() { - Map items = new HashMap(); - items.put("errorCode", errorCode); - items.put("errorMsg", errorMsg); - items.put("isSuccess", isSuccess); - return JSON.toJSONString(items); - } -} diff --git a/backend/src/main/java/io/dataease/notice/util/WxChatbotClient.java b/backend/src/main/java/io/dataease/notice/util/WxChatbotClient.java deleted file mode 100644 index 192e9c42e1..0000000000 --- a/backend/src/main/java/io/dataease/notice/util/WxChatbotClient.java +++ /dev/null @@ -1,50 +0,0 @@ -package io.dataease.notice.util; - -import com.alibaba.fastjson.JSONObject; -import io.dataease.notice.message.Message; -import org.apache.commons.lang3.StringUtils; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.entity.StringEntity; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; - -import java.io.IOException; - -/** - * - */ -public class WxChatbotClient { - - static HttpClient httpclient = HttpClients.createDefault(); - - public static SendResult send(String webhook, Message message) throws IOException { - - if (StringUtils.isBlank(webhook)) { - return new SendResult(); - } - HttpPost httppost = new HttpPost(webhook); - httppost.addHeader("Content-Type", "application/json; charset=utf-8"); - StringEntity se = new StringEntity(message.toJsonString(), "utf-8"); - httppost.setEntity(se); - - SendResult sendResult = new SendResult(); - HttpResponse response = httpclient.execute(httppost); - if (response.getStatusLine().getStatusCode() == HttpStatus.SC_OK) { - String result = EntityUtils.toString(response.getEntity()); - JSONObject obj = JSONObject.parseObject(result); - - Integer errcode = obj.getInteger("errcode"); - sendResult.setErrorCode(errcode); - sendResult.setErrorMsg(obj.getString("errmsg")); - sendResult.setIsSuccess(errcode.equals(0)); - } - - return sendResult; - } - -} - - diff --git a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java index cfabe1c283..fd868cb3c7 100644 --- a/backend/src/main/java/io/dataease/service/system/SystemParameterService.java +++ b/backend/src/main/java/io/dataease/service/system/SystemParameterService.java @@ -13,7 +13,6 @@ import io.dataease.commons.utils.EncryptUtils; import io.dataease.commons.utils.LogUtil; import io.dataease.dto.SystemParameterDTO; import io.dataease.i18n.Translator; -import io.dataease.notice.domain.MailInfo; import io.dataease.service.FileService; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.BooleanUtils; @@ -23,7 +22,6 @@ import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; - import javax.annotation.Resource; import javax.imageio.ImageIO; import javax.mail.MessagingException; @@ -139,31 +137,7 @@ public class SystemParameterService { return System.getenv("MS_VERSION"); } - public MailInfo mailInfo(String type) { - List paramList = this.getParamList(type); - MailInfo mailInfo=new MailInfo (); - if (!CollectionUtils.isEmpty(paramList)) { - for (SystemParameter param : paramList) { - if (StringUtils.equals(param.getParamKey(),ParamConstants.MAIL.SERVER.getValue() )) { - mailInfo.setHost(param.getParamValue()); - } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.PORT.getValue())) { - mailInfo.setPort(param.getParamValue()); - } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.ACCOUNT.getValue())) { - mailInfo.setAccount(param.getParamValue()); - } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.PASSWORD.getValue())) { - String password = EncryptUtils.aesDecrypt(param.getParamValue()).toString(); - mailInfo.setPassword(password); - } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.SSL.getValue())) { - mailInfo.setSsl(param.getParamValue()); - } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.TLS.getValue())) { - mailInfo.setTls(param.getParamValue()); - } else if (StringUtils.equals(param.getParamKey(), ParamConstants.MAIL.RECIPIENTS.getValue())) { - mailInfo.setRecipient(param.getParamValue()); - } - } - } - return mailInfo; - } + public void saveLdap(List parameters) { SystemParameterExample example = new SystemParameterExample(); diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index bc3b1498e0..c0e7b296f7 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -23,6 +23,15 @@ mybatis.configuration.auto-mapping-behavior=full mybatis.configuration.default-statement-timeout=25000 mybatis.configuration.map-underscore-to-camel-case=true +# knife4j +knife4j.enable=true +knife4j.setting.enableFooter=false +knife4j.setting.enableFooterCustom=true +knife4j.setting.footerCustomContent=杭州飞致云信息科技有限公司 1.0-b9 +knife4j.setting.enableSwaggerModels=false +knife4j.setting.enableDocumentManage=false + + logging.file.path=/opt/dataease/logs/${spring.application.name} # view diff --git a/backend/src/main/resources/db/migration/V2__dataease_ddl.sql b/backend/src/main/resources/db/migration/V2__dataease_ddl.sql index ade838b23b..3bfe790d66 100644 --- a/backend/src/main/resources/db/migration/V2__dataease_ddl.sql +++ b/backend/src/main/resources/db/migration/V2__dataease_ddl.sql @@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `system_parameter` ( )ENGINE = InnoDB DEFAULT CHARSET = utf8mb4; -CREATE TABLE IF NOT EXISTS `user_role` ( +/*CREATE TABLE IF NOT EXISTS `user_role` ( `id` varchar(50) NOT NULL COMMENT 'ID of user''s role info', `user_id` varchar(50) NOT NULL COMMENT 'User ID of this user-role info', `role_id` varchar(50) NOT NULL COMMENT 'Role ID of this user-role info', @@ -34,7 +34,7 @@ CREATE TABLE IF NOT EXISTS `user_role` ( `update_time` bigint(13) NOT NULL COMMENT 'Update timestamp', PRIMARY KEY (`id`) )ENGINE = InnoDB -DEFAULT CHARSET = utf8mb4; +DEFAULT CHARSET = utf8mb4;*/ DROP TABLE IF EXISTS `datasource`; CREATE TABLE `datasource` (