Merge pull request #477 from dataease/dev

Dev

backend/pom.xml

@@ -152,12 +152,6 @@
             <version>${jwt.version}</version>
         </dependency>
 
-        <!-- openapi -->
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
-            <version>1.2.32</version>
-        </dependency>
 
 
 
@@ -205,20 +199,11 @@
             <version>0.0.7</version>
         </dependency>
 
-        <!-- swagger2 解析 -->
         <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-parser</artifactId>
-            <version>1.0.51</version>
+            <groupId>com.github.xiaoymin</groupId>
+            <artifactId>knife4j-spring-boot-starter</artifactId>
+            <version>3.0.3</version>
         </dependency>
-
-        <!-- swagger3 解析 最新版本会有swagger-core版本冲突 -->
-        <dependency>
-            <groupId>io.swagger.parser.v3</groupId>
-            <artifactId>swagger-parser</artifactId>
-            <version>2.0.18</version>
-        </dependency>
-
         <!-- 执行 js 代码依赖 -->
         <dependency>
             <groupId>org.graalvm.sdk</groupId>
@@ -399,7 +384,7 @@
                 <includes>
                     <include>**/*</include>
                 </includes>
-                <filtering>false</filtering>
+                <filtering>true</filtering>
             </resource>
         </resources>
         <plugins>
@@ -429,6 +414,12 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.4.3</version>
+            </plugin>
+
             <plugin>
                 <artifactId>maven-clean-plugin</artifactId>
                 <configuration>

backend/src/main/java/io/dataease/auth/api/AuthApi.java

@@ -1,8 +1,10 @@
 package io.dataease.auth.api;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 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;
@@ -11,23 +13,31 @@ import java.util.Map;
 
 
 @Api(tags = "权限：权限管理")
+@ApiSupport(order = 10)
 @RequestMapping("/api/auth")
 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<String, String> nameDto);
 

backend/src/main/java/io/dataease/auth/api/DynamicMenuApi.java

@@ -1,14 +1,17 @@
 package io.dataease.auth.api;
 
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.auth.api.dto.DynamicMenuDto;
 import io.dataease.controller.handler.annotation.I18n;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.List;
 
 @Api(tags = "权限：动态菜单")
+@ApiSupport(order = 20)
 @RequestMapping("/api/dynamicMenu")
 public interface DynamicMenuApi {
 
@@ -16,6 +19,7 @@ public interface DynamicMenuApi {
      * 根据heads中获取的token 获取username 获取对应权限的菜单
      * @return
      */
+    @ApiOperation("查询")
     @PostMapping("/menus")
     @I18n
     List<DynamicMenuDto> menus();

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;
 }

backend/src/main/java/io/dataease/auth/filter/F2CLinkFilter.java

@@ -34,10 +34,14 @@ public class F2CLinkFilter extends AnonymousFilter {
             String id = resourceId.asString();
             PanelLink panelLink = LinkUtil.queryLink(id);
             if (ObjectUtil.isEmpty(panelLink)) return false;
+            String pwd;
             if (!panelLink.getEnablePwd()) {
                 panelLink.setPwd("dataease");
+                pwd = panelLink.getPwd();
+            }else {
+                pwd = RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, panelLink.getPwd());
             }
-            return JWTUtils.verifyLink(link_token, id, RsaUtil.decryptByPrivateKey(RsaProperties.privateKey, panelLink.getPwd()));
+            return JWTUtils.verifyLink(link_token, id, pwd);
         }catch (Exception e) {
             LogUtil.error(e);
         }

backend/src/main/java/io/dataease/auth/filter/JWTFilter.java

@@ -49,6 +49,9 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
     protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception {
         HttpServletRequest httpServletRequest = (HttpServletRequest) request;
         String authorization = httpServletRequest.getHeader("Authorization");
+        if (StringUtils.startsWith(authorization, "Basic")) {
+            return false;
+        }
         // 当没有出现登录超时 且需要刷新token 则执行刷新token
         if (JWTUtils.loginExpire(authorization)){
             throw new AuthenticationException(expireMessage);

backend/src/main/java/io/dataease/auth/server/AuthServer.java

@@ -12,6 +12,7 @@ import io.dataease.auth.util.JWTUtils;
 import io.dataease.auth.util.RsaUtil;
 import io.dataease.commons.utils.BeanUtils;
 import io.dataease.commons.utils.CodingUtil;
+import io.dataease.commons.utils.LogUtil;
 import io.dataease.commons.utils.ServletUtils;
 
 import io.dataease.exception.DataEaseException;
@@ -84,8 +85,17 @@ public class AuthServer implements AuthApi {
     @Override
     public String logout() {
         String token = ServletUtils.getToken();
+        if (StringUtils.isEmpty(token) || StringUtils.equals("null", token) || StringUtils.equals("undefined", token)) {
+            return "success";
+        }
+        try{
             Long userId = JWTUtils.tokenInfoByToken(token).getUserId();
             authUserService.clearCache(userId);
+        }catch (Exception e) {
+            LogUtil.error(e);
+            return "fail";
+        }
+
         return "success";
     }
 
@@ -98,10 +108,10 @@ public class AuthServer implements AuthApi {
         return true;
     }
 
-    @Override
+    /*@Override
     public Boolean isLogin() {
         return null;
-    }
+    }*/
 
 
 }

backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java

@@ -52,11 +52,11 @@ public class ExtAuthServiceImpl implements ExtAuthService {
         }
 
         if (!CollectionUtils.isEmpty(authMap.get("role"))) {
-            authURD.setUserIds(authMap.get("role").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList()));
+            authURD.setRoleIds(authMap.get("role").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList()));
         }
 
         if (!CollectionUtils.isEmpty(authMap.get("dept"))) {
-            authURD.setUserIds(authMap.get("dept").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList()));
+            authURD.setDeptIds(authMap.get("dept").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList()));
         }
         return authURD;
     }

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);

backend/src/main/java/io/dataease/base/domain/Issues.java

@@ -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;
-}

backend/src/main/java/io/dataease/base/domain/IssuesExample.java

@@ -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<Criteria> oredCriteria;
-
-    public IssuesExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    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<Criteria> 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<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> 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<String> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<String> 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<String> values) {
-            addCriterion("title in", values, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleNotIn(List<String> 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<String> values) {
-            addCriterion("`status` in", values, "status");
-            return (Criteria) this;
-        }
-
-        public Criteria andStatusNotIn(List<String> 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<Long> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Long> 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<Long> values) {
-            addCriterion("update_time in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotIn(List<Long> 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<String> values) {
-            addCriterion("reporter in", values, "reporter");
-            return (Criteria) this;
-        }
-
-        public Criteria andReporterNotIn(List<String> 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<String> values) {
-            addCriterion("lastmodify in", values, "lastmodify");
-            return (Criteria) this;
-        }
-
-        public Criteria andLastmodifyNotIn(List<String> 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<String> values) {
-            addCriterion("platform in", values, "platform");
-            return (Criteria) this;
-        }
-
-        public Criteria andPlatformNotIn(List<String> 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);
-        }
-    }
-}

backend/src/main/java/io/dataease/base/domain/JarConfig.java

@@ -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;
-}

backend/src/main/java/io/dataease/base/domain/JarConfigExample.java

@@ -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<Criteria> oredCriteria;
-
-    public JarConfigExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    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<Criteria> 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<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> 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<String> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<String> 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<String> values) {
-            addCriterion("`name` in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotIn(List<String> 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<String> values) {
-            addCriterion("file_name in", values, "fileName");
-            return (Criteria) this;
-        }
-
-        public Criteria andFileNameNotIn(List<String> 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<String> values) {
-            addCriterion("creator in", values, "creator");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreatorNotIn(List<String> 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<String> values) {
-            addCriterion("modifier in", values, "modifier");
-            return (Criteria) this;
-        }
-
-        public Criteria andModifierNotIn(List<String> 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<String> values) {
-            addCriterion("`path` in", values, "path");
-            return (Criteria) this;
-        }
-
-        public Criteria andPathNotIn(List<String> 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<Boolean> values) {
-            addCriterion("`enable` in", values, "enable");
-            return (Criteria) this;
-        }
-
-        public Criteria andEnableNotIn(List<Boolean> 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<String> values) {
-            addCriterion("description in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotIn(List<String> 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<Long> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Long> 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<Long> values) {
-            addCriterion("update_time in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotIn(List<Long> 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);
-        }
-    }
-}

backend/src/main/java/io/dataease/base/domain/MessageTask.java

@@ -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;
-}

backend/src/main/java/io/dataease/base/domain/MessageTaskExample.java

@@ -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<Criteria> oredCriteria;
-
-    public MessageTaskExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    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<Criteria> 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<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> 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<String> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<String> 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<String> values) {
-            addCriterion("`type` in", values, "type");
-            return (Criteria) this;
-        }
-
-        public Criteria andTypeNotIn(List<String> 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<String> values) {
-            addCriterion("event in", values, "event");
-            return (Criteria) this;
-        }
-
-        public Criteria andEventNotIn(List<String> 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<String> values) {
-            addCriterion("user_id in", values, "userId");
-            return (Criteria) this;
-        }
-
-        public Criteria andUserIdNotIn(List<String> 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<String> values) {
-            addCriterion("task_type in", values, "taskType");
-            return (Criteria) this;
-        }
-
-        public Criteria andTaskTypeNotIn(List<String> 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<String> values) {
-            addCriterion("webhook in", values, "webhook");
-            return (Criteria) this;
-        }
-
-        public Criteria andWebhookNotIn(List<String> 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<String> values) {
-            addCriterion("identification in", values, "identification");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdentificationNotIn(List<String> 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<Boolean> values) {
-            addCriterion("is_set in", values, "isSet");
-            return (Criteria) this;
-        }
-
-        public Criteria andIsSetNotIn(List<Boolean> 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<String> values) {
-            addCriterion("organization_id in", values, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdNotIn(List<String> 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<String> values) {
-            addCriterion("test_id in", values, "testId");
-            return (Criteria) this;
-        }
-
-        public Criteria andTestIdNotIn(List<String> 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<Long> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Long> 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);
-        }
-    }
-}

backend/src/main/java/io/dataease/base/domain/Organization.java

@@ -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;
-}

backend/src/main/java/io/dataease/base/domain/OrganizationExample.java

@@ -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<Criteria> oredCriteria;
-
-    public OrganizationExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    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<Criteria> 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<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> 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<String> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<String> 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<String> values) {
-            addCriterion("name in", values, "name");
-            return (Criteria) this;
-        }
-
-        public Criteria andNameNotIn(List<String> 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<String> values) {
-            addCriterion("description in", values, "description");
-            return (Criteria) this;
-        }
-
-        public Criteria andDescriptionNotIn(List<String> 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<Long> values) {
-            addCriterion("create_time in", values, "createTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andCreateTimeNotIn(List<Long> 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<Long> values) {
-            addCriterion("update_time in", values, "updateTime");
-            return (Criteria) this;
-        }
-
-        public Criteria andUpdateTimeNotIn(List<Long> 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);
-        }
-    }
-}

backend/src/main/java/io/dataease/base/domain/ServiceIntegration.java

@@ -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;
-}

backend/src/main/java/io/dataease/base/domain/ServiceIntegrationExample.java

@@ -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<Criteria> oredCriteria;
-
-    public ServiceIntegrationExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    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<Criteria> 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<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> 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<String> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<String> 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<String> values) {
-            addCriterion("organization_id in", values, "organizationId");
-            return (Criteria) this;
-        }
-
-        public Criteria andOrganizationIdNotIn(List<String> 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<String> values) {
-            addCriterion("platform in", values, "platform");
-            return (Criteria) this;
-        }
-
-        public Criteria andPlatformNotIn(List<String> 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);
-        }
-    }
-}

backend/src/main/java/io/dataease/base/domain/SwaggerUrlProject.java

@@ -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;
-}

backend/src/main/java/io/dataease/base/domain/SwaggerUrlProjectExample.java

@@ -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<Criteria> oredCriteria;
-
-    public SwaggerUrlProjectExample() {
-        oredCriteria = new ArrayList<Criteria>();
-    }
-
-    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<Criteria> 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<Criterion> criteria;
-
-        protected GeneratedCriteria() {
-            super();
-            criteria = new ArrayList<Criterion>();
-        }
-
-        public boolean isValid() {
-            return criteria.size() > 0;
-        }
-
-        public List<Criterion> getAllCriteria() {
-            return criteria;
-        }
-
-        public List<Criterion> 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<String> values) {
-            addCriterion("id in", values, "id");
-            return (Criteria) this;
-        }
-
-        public Criteria andIdNotIn(List<String> 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<String> values) {
-            addCriterion("project_id in", values, "projectId");
-            return (Criteria) this;
-        }
-
-        public Criteria andProjectIdNotIn(List<String> 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<String> values) {
-            addCriterion("swagger_url in", values, "swaggerUrl");
-            return (Criteria) this;
-        }
-
-        public Criteria andSwaggerUrlNotIn(List<String> 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<String> values) {
-            addCriterion("module_id in", values, "moduleId");
-            return (Criteria) this;
-        }
-
-        public Criteria andModuleIdNotIn(List<String> 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<String> values) {
-            addCriterion("module_path in", values, "modulePath");
-            return (Criteria) this;
-        }
-
-        public Criteria andModulePathNotIn(List<String> 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<String> values) {
-            addCriterion("mode_id in", values, "modeId");
-            return (Criteria) this;
-        }
-
-        public Criteria andModeIdNotIn(List<String> 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);
-        }
-    }
-}

backend/src/main/java/io/dataease/base/mapper/IssuesMapper.java

@@ -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<Issues> selectByExampleWithBLOBs(IssuesExample example);
-
-    List<Issues> 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);
-}

backend/src/main/java/io/dataease/base/mapper/IssuesMapper.xml

@@ -1,323 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.dataease.base.mapper.IssuesMapper">
-  <resultMap id="BaseResultMap" type="io.dataease.base.domain.Issues">
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="title" jdbcType="VARCHAR" property="title" />
-    <result column="status" jdbcType="VARCHAR" property="status" />
-    <result column="create_time" jdbcType="BIGINT" property="createTime" />
-    <result column="update_time" jdbcType="BIGINT" property="updateTime" />
-    <result column="reporter" jdbcType="VARCHAR" property="reporter" />
-    <result column="lastmodify" jdbcType="VARCHAR" property="lastmodify" />
-    <result column="platform" jdbcType="VARCHAR" property="platform" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.Issues">
-    <result column="description" jdbcType="LONGVARCHAR" property="description" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, title, `status`, create_time, update_time, reporter, lastmodify, platform
-  </sql>
-  <sql id="Blob_Column_List">
-    description
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.IssuesExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from issues
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="io.dataease.base.domain.IssuesExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from issues
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from issues
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from issues
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="io.dataease.base.domain.IssuesExample">
-    delete from issues
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="io.dataease.base.domain.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>
-  <insert id="insertSelective" parameterType="io.dataease.base.domain.Issues">
-    insert into issues
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="title != null">
-        title,
-      </if>
-      <if test="status != null">
-        `status`,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-      <if test="reporter != null">
-        reporter,
-      </if>
-      <if test="lastmodify != null">
-        lastmodify,
-      </if>
-      <if test="platform != null">
-        platform,
-      </if>
-      <if test="description != null">
-        description,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="title != null">
-        #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        #{status,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=BIGINT},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=BIGINT},
-      </if>
-      <if test="reporter != null">
-        #{reporter,jdbcType=VARCHAR},
-      </if>
-      <if test="lastmodify != null">
-        #{lastmodify,jdbcType=VARCHAR},
-      </if>
-      <if test="platform != null">
-        #{platform,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="io.dataease.base.domain.IssuesExample" resultType="java.lang.Long">
-    select count(*) from issues
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update issues
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.title != null">
-        title = #{record.title,jdbcType=VARCHAR},
-      </if>
-      <if test="record.status != null">
-        `status` = #{record.status,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=BIGINT},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=BIGINT},
-      </if>
-      <if test="record.reporter != null">
-        reporter = #{record.reporter,jdbcType=VARCHAR},
-      </if>
-      <if test="record.lastmodify != null">
-        lastmodify = #{record.lastmodify,jdbcType=VARCHAR},
-      </if>
-      <if test="record.platform != null">
-        platform = #{record.platform,jdbcType=VARCHAR},
-      </if>
-      <if test="record.description != null">
-        description = #{record.description,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    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}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    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}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.Issues">
-    update issues
-    <set>
-      <if test="title != null">
-        title = #{title,jdbcType=VARCHAR},
-      </if>
-      <if test="status != null">
-        `status` = #{status,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=BIGINT},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=BIGINT},
-      </if>
-      <if test="reporter != null">
-        reporter = #{reporter,jdbcType=VARCHAR},
-      </if>
-      <if test="lastmodify != null">
-        lastmodify = #{lastmodify,jdbcType=VARCHAR},
-      </if>
-      <if test="platform != null">
-        platform = #{platform,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        description = #{description,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.dataease.base.domain.Issues">
-    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>
-  <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.Issues">
-    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}
-  </update>
-</mapper>

backend/src/main/java/io/dataease/base/mapper/JarConfigMapper.java

@@ -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<JarConfig> 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);
-}

backend/src/main/java/io/dataease/base/mapper/JarConfigMapper.xml

@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.dataease.base.mapper.JarConfigMapper">
-  <resultMap id="BaseResultMap" type="io.dataease.base.domain.JarConfig">
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="file_name" jdbcType="VARCHAR" property="fileName" />
-    <result column="creator" jdbcType="VARCHAR" property="creator" />
-    <result column="modifier" jdbcType="VARCHAR" property="modifier" />
-    <result column="path" jdbcType="VARCHAR" property="path" />
-    <result column="enable" jdbcType="BIT" property="enable" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="create_time" jdbcType="BIGINT" property="createTime" />
-    <result column="update_time" jdbcType="BIGINT" property="updateTime" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, `name`, file_name, creator, modifier, `path`, `enable`, description, create_time,
-    update_time
-  </sql>
-  <select id="selectByExample" parameterType="io.dataease.base.domain.JarConfigExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from jar_config
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from jar_config
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from jar_config
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="io.dataease.base.domain.JarConfigExample">
-    delete from jar_config
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="io.dataease.base.domain.JarConfig">
-    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>
-  <insert id="insertSelective" parameterType="io.dataease.base.domain.JarConfig">
-    insert into jar_config
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="name != null">
-        `name`,
-      </if>
-      <if test="fileName != null">
-        file_name,
-      </if>
-      <if test="creator != null">
-        creator,
-      </if>
-      <if test="modifier != null">
-        modifier,
-      </if>
-      <if test="path != null">
-        `path`,
-      </if>
-      <if test="enable != null">
-        `enable`,
-      </if>
-      <if test="description != null">
-        description,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="fileName != null">
-        #{fileName,jdbcType=VARCHAR},
-      </if>
-      <if test="creator != null">
-        #{creator,jdbcType=VARCHAR},
-      </if>
-      <if test="modifier != null">
-        #{modifier,jdbcType=VARCHAR},
-      </if>
-      <if test="path != null">
-        #{path,jdbcType=VARCHAR},
-      </if>
-      <if test="enable != null">
-        #{enable,jdbcType=BIT},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=BIGINT},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="io.dataease.base.domain.JarConfigExample" resultType="java.lang.Long">
-    select count(*) from jar_config
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update jar_config
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.name != null">
-        `name` = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.fileName != null">
-        file_name = #{record.fileName,jdbcType=VARCHAR},
-      </if>
-      <if test="record.creator != null">
-        creator = #{record.creator,jdbcType=VARCHAR},
-      </if>
-      <if test="record.modifier != null">
-        modifier = #{record.modifier,jdbcType=VARCHAR},
-      </if>
-      <if test="record.path != null">
-        `path` = #{record.path,jdbcType=VARCHAR},
-      </if>
-      <if test="record.enable != null">
-        `enable` = #{record.enable,jdbcType=BIT},
-      </if>
-      <if test="record.description != null">
-        description = #{record.description,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=BIGINT},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    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}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.JarConfig">
-    update jar_config
-    <set>
-      <if test="name != null">
-        `name` = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="fileName != null">
-        file_name = #{fileName,jdbcType=VARCHAR},
-      </if>
-      <if test="creator != null">
-        creator = #{creator,jdbcType=VARCHAR},
-      </if>
-      <if test="modifier != null">
-        modifier = #{modifier,jdbcType=VARCHAR},
-      </if>
-      <if test="path != null">
-        `path` = #{path,jdbcType=VARCHAR},
-      </if>
-      <if test="enable != null">
-        `enable` = #{enable,jdbcType=BIT},
-      </if>
-      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=BIGINT},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.JarConfig">
-    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}
-  </update>
-</mapper>

backend/src/main/java/io/dataease/base/mapper/MessageTaskMapper.java

@@ -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<MessageTask> selectByExampleWithBLOBs(MessageTaskExample example);
-
-    List<MessageTask> 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);
-}

backend/src/main/java/io/dataease/base/mapper/MessageTaskMapper.xml

@@ -1,377 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.dataease.base.mapper.MessageTaskMapper">
-  <resultMap id="BaseResultMap" type="io.dataease.base.domain.MessageTask">
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="type" jdbcType="VARCHAR" property="type" />
-    <result column="event" jdbcType="VARCHAR" property="event" />
-    <result column="user_id" jdbcType="VARCHAR" property="userId" />
-    <result column="task_type" jdbcType="VARCHAR" property="taskType" />
-    <result column="webhook" jdbcType="VARCHAR" property="webhook" />
-    <result column="identification" jdbcType="VARCHAR" property="identification" />
-    <result column="is_set" jdbcType="BIT" property="isSet" />
-    <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
-    <result column="test_id" jdbcType="VARCHAR" property="testId" />
-    <result column="create_time" jdbcType="BIGINT" property="createTime" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.MessageTask">
-    <result column="template" jdbcType="LONGVARCHAR" property="template" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  AND ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  AND ${criterion.condition} #{criterion.value} AND #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  AND ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, `type`, event, user_id, task_type, webhook, identification, is_set, organization_id,
-    test_id, create_time
-  </sql>
-  <sql id="Blob_Column_List">
-    `template`
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.MessageTaskExample" resultMap="ResultMapWithBLOBs">
-    SELECT
-    <if test="distinct">
-      DISTINCT
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    FROM message_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      ORDER BY ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="io.dataease.base.domain.MessageTaskExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from message_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from message_task
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from message_task
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="io.dataease.base.domain.MessageTaskExample">
-    delete from message_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="io.dataease.base.domain.MessageTask">
-    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>
-  <insert id="insertSelective" parameterType="io.dataease.base.domain.MessageTask">
-    insert into message_task
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="type != null">
-        `type`,
-      </if>
-      <if test="event != null">
-        event,
-      </if>
-      <if test="userId != null">
-        user_id,
-      </if>
-      <if test="taskType != null">
-        task_type,
-      </if>
-      <if test="webhook != null">
-        webhook,
-      </if>
-      <if test="identification != null">
-        identification,
-      </if>
-      <if test="isSet != null">
-        is_set,
-      </if>
-      <if test="organizationId != null">
-        organization_id,
-      </if>
-      <if test="testId != null">
-        test_id,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="template != null">
-        `template`,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="type != null">
-        #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="event != null">
-        #{event,jdbcType=VARCHAR},
-      </if>
-      <if test="userId != null">
-        #{userId,jdbcType=VARCHAR},
-      </if>
-      <if test="taskType != null">
-        #{taskType,jdbcType=VARCHAR},
-      </if>
-      <if test="webhook != null">
-        #{webhook,jdbcType=VARCHAR},
-      </if>
-      <if test="identification != null">
-        #{identification,jdbcType=VARCHAR},
-      </if>
-      <if test="isSet != null">
-        #{isSet,jdbcType=BIT},
-      </if>
-      <if test="organizationId != null">
-        #{organizationId,jdbcType=VARCHAR},
-      </if>
-      <if test="testId != null">
-        #{testId,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=BIGINT},
-      </if>
-      <if test="template != null">
-        #{template,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="io.dataease.base.domain.MessageTaskExample" resultType="java.lang.Long">
-    select count(*) from message_task
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update message_task
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.type != null">
-        `type` = #{record.type,jdbcType=VARCHAR},
-      </if>
-      <if test="record.event != null">
-        event = #{record.event,jdbcType=VARCHAR},
-      </if>
-      <if test="record.userId != null">
-        user_id = #{record.userId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.taskType != null">
-        task_type = #{record.taskType,jdbcType=VARCHAR},
-      </if>
-      <if test="record.webhook != null">
-        webhook = #{record.webhook,jdbcType=VARCHAR},
-      </if>
-      <if test="record.identification != null">
-        identification = #{record.identification,jdbcType=VARCHAR},
-      </if>
-      <if test="record.isSet != null">
-        is_set = #{record.isSet,jdbcType=BIT},
-      </if>
-      <if test="record.organizationId != null">
-        organization_id = #{record.organizationId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.testId != null">
-        test_id = #{record.testId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=BIGINT},
-      </if>
-      <if test="record.template != null">
-        `template` = #{record.template,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    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}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    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}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.MessageTask">
-    update message_task
-    <set>
-      <if test="type != null">
-        `type` = #{type,jdbcType=VARCHAR},
-      </if>
-      <if test="event != null">
-        event = #{event,jdbcType=VARCHAR},
-      </if>
-      <if test="userId != null">
-        user_id = #{userId,jdbcType=VARCHAR},
-      </if>
-      <if test="taskType != null">
-        task_type = #{taskType,jdbcType=VARCHAR},
-      </if>
-      <if test="webhook != null">
-        webhook = #{webhook,jdbcType=VARCHAR},
-      </if>
-      <if test="identification != null">
-        identification = #{identification,jdbcType=VARCHAR},
-      </if>
-      <if test="isSet != null">
-        is_set = #{isSet,jdbcType=BIT},
-      </if>
-      <if test="organizationId != null">
-        organization_id = #{organizationId,jdbcType=VARCHAR},
-      </if>
-      <if test="testId != null">
-        test_id = #{testId,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=BIGINT},
-      </if>
-      <if test="template != null">
-        `template` = #{template,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.dataease.base.domain.MessageTask">
-    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>
-  <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.MessageTask">
-    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}
-  </update>
-</mapper>

backend/src/main/java/io/dataease/base/mapper/OrganizationMapper.java

@@ -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<Organization> 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);
-}

backend/src/main/java/io/dataease/base/mapper/OrganizationMapper.xml

@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.dataease.base.mapper.OrganizationMapper">
-  <resultMap id="BaseResultMap" type="io.dataease.base.domain.Organization">
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="name" jdbcType="VARCHAR" property="name" />
-    <result column="description" jdbcType="VARCHAR" property="description" />
-    <result column="create_time" jdbcType="BIGINT" property="createTime" />
-    <result column="update_time" jdbcType="BIGINT" property="updateTime" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, name, description, create_time, update_time
-  </sql>
-  <select id="selectByExample" parameterType="io.dataease.base.domain.OrganizationExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from organization
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-    select
-    <include refid="Base_Column_List" />
-    from organization
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from organization
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="io.dataease.base.domain.OrganizationExample">
-    delete from organization
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="io.dataease.base.domain.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>
-  <insert id="insertSelective" parameterType="io.dataease.base.domain.Organization">
-    insert into organization
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="name != null">
-        name,
-      </if>
-      <if test="description != null">
-        description,
-      </if>
-      <if test="createTime != null">
-        create_time,
-      </if>
-      <if test="updateTime != null">
-        update_time,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="name != null">
-        #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        #{createTime,jdbcType=BIGINT},
-      </if>
-      <if test="updateTime != null">
-        #{updateTime,jdbcType=BIGINT},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="io.dataease.base.domain.OrganizationExample" resultType="java.lang.Long">
-    select count(*) from organization
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update organization
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.name != null">
-        name = #{record.name,jdbcType=VARCHAR},
-      </if>
-      <if test="record.description != null">
-        description = #{record.description,jdbcType=VARCHAR},
-      </if>
-      <if test="record.createTime != null">
-        create_time = #{record.createTime,jdbcType=BIGINT},
-      </if>
-      <if test="record.updateTime != null">
-        update_time = #{record.updateTime,jdbcType=BIGINT},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    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}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.Organization">
-    update organization
-    <set>
-      <if test="name != null">
-        name = #{name,jdbcType=VARCHAR},
-      </if>
-      <if test="description != null">
-        description = #{description,jdbcType=VARCHAR},
-      </if>
-      <if test="createTime != null">
-        create_time = #{createTime,jdbcType=BIGINT},
-      </if>
-      <if test="updateTime != null">
-        update_time = #{updateTime,jdbcType=BIGINT},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.Organization">
-    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}
-  </update>
-</mapper>

backend/src/main/java/io/dataease/base/mapper/ServiceIntegrationMapper.java

@@ -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<ServiceIntegration> selectByExampleWithBLOBs(ServiceIntegrationExample example);
-
-    List<ServiceIntegration> 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);
-}

backend/src/main/java/io/dataease/base/mapper/ServiceIntegrationMapper.xml

@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.dataease.base.mapper.ServiceIntegrationMapper">
-  <resultMap id="BaseResultMap" type="io.dataease.base.domain.ServiceIntegration">
-    <id column="id" jdbcType="VARCHAR" property="id" />
-    <result column="organization_id" jdbcType="VARCHAR" property="organizationId" />
-    <result column="platform" jdbcType="VARCHAR" property="platform" />
-  </resultMap>
-  <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.ServiceIntegration">
-    <result column="configuration" jdbcType="LONGVARCHAR" property="configuration" />
-  </resultMap>
-  <sql id="Example_Where_Clause">
-    <where>
-      <foreach collection="oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Update_By_Example_Where_Clause">
-    <where>
-      <foreach collection="example.oredCriteria" item="criteria" separator="or">
-        <if test="criteria.valid">
-          <trim prefix="(" prefixOverrides="and" suffix=")">
-            <foreach collection="criteria.criteria" item="criterion">
-              <choose>
-                <when test="criterion.noValue">
-                  and ${criterion.condition}
-                </when>
-                <when test="criterion.singleValue">
-                  and ${criterion.condition} #{criterion.value}
-                </when>
-                <when test="criterion.betweenValue">
-                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                </when>
-                <when test="criterion.listValue">
-                  and ${criterion.condition}
-                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
-                    #{listItem}
-                  </foreach>
-                </when>
-              </choose>
-            </foreach>
-          </trim>
-        </if>
-      </foreach>
-    </where>
-  </sql>
-  <sql id="Base_Column_List">
-    id, organization_id, platform
-  </sql>
-  <sql id="Blob_Column_List">
-    configuration
-  </sql>
-  <select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.ServiceIntegrationExample" resultMap="ResultMapWithBLOBs">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from service_integration
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByExample" parameterType="io.dataease.base.domain.ServiceIntegrationExample" resultMap="BaseResultMap">
-    select
-    <if test="distinct">
-      distinct
-    </if>
-    <include refid="Base_Column_List" />
-    from service_integration
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-    <if test="orderByClause != null">
-      order by ${orderByClause}
-    </if>
-  </select>
-  <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="ResultMapWithBLOBs">
-    select
-    <include refid="Base_Column_List" />
-    ,
-    <include refid="Blob_Column_List" />
-    from service_integration
-    where id = #{id,jdbcType=VARCHAR}
-  </select>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-    delete from service_integration
-    where id = #{id,jdbcType=VARCHAR}
-  </delete>
-  <delete id="deleteByExample" parameterType="io.dataease.base.domain.ServiceIntegrationExample">
-    delete from service_integration
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </delete>
-  <insert id="insert" parameterType="io.dataease.base.domain.ServiceIntegration">
-    insert into service_integration (id, organization_id, platform,
-      configuration)
-    values (#{id,jdbcType=VARCHAR}, #{organizationId,jdbcType=VARCHAR}, #{platform,jdbcType=VARCHAR},
-      #{configuration,jdbcType=LONGVARCHAR})
-  </insert>
-  <insert id="insertSelective" parameterType="io.dataease.base.domain.ServiceIntegration">
-    insert into service_integration
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        id,
-      </if>
-      <if test="organizationId != null">
-        organization_id,
-      </if>
-      <if test="platform != null">
-        platform,
-      </if>
-      <if test="configuration != null">
-        configuration,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="id != null">
-        #{id,jdbcType=VARCHAR},
-      </if>
-      <if test="organizationId != null">
-        #{organizationId,jdbcType=VARCHAR},
-      </if>
-      <if test="platform != null">
-        #{platform,jdbcType=VARCHAR},
-      </if>
-      <if test="configuration != null">
-        #{configuration,jdbcType=LONGVARCHAR},
-      </if>
-    </trim>
-  </insert>
-  <select id="countByExample" parameterType="io.dataease.base.domain.ServiceIntegrationExample" resultType="java.lang.Long">
-    select count(*) from service_integration
-    <if test="_parameter != null">
-      <include refid="Example_Where_Clause" />
-    </if>
-  </select>
-  <update id="updateByExampleSelective" parameterType="map">
-    update service_integration
-    <set>
-      <if test="record.id != null">
-        id = #{record.id,jdbcType=VARCHAR},
-      </if>
-      <if test="record.organizationId != null">
-        organization_id = #{record.organizationId,jdbcType=VARCHAR},
-      </if>
-      <if test="record.platform != null">
-        platform = #{record.platform,jdbcType=VARCHAR},
-      </if>
-      <if test="record.configuration != null">
-        configuration = #{record.configuration,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExampleWithBLOBs" parameterType="map">
-    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}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByExample" parameterType="map">
-    update service_integration
-    set id = #{record.id,jdbcType=VARCHAR},
-      organization_id = #{record.organizationId,jdbcType=VARCHAR},
-      platform = #{record.platform,jdbcType=VARCHAR}
-    <if test="_parameter != null">
-      <include refid="Update_By_Example_Where_Clause" />
-    </if>
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.ServiceIntegration">
-    update service_integration
-    <set>
-      <if test="organizationId != null">
-        organization_id = #{organizationId,jdbcType=VARCHAR},
-      </if>
-      <if test="platform != null">
-        platform = #{platform,jdbcType=VARCHAR},
-      </if>
-      <if test="configuration != null">
-        configuration = #{configuration,jdbcType=LONGVARCHAR},
-      </if>
-    </set>
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.dataease.base.domain.ServiceIntegration">
-    update service_integration
-    set organization_id = #{organizationId,jdbcType=VARCHAR},
-      platform = #{platform,jdbcType=VARCHAR},
-      configuration = #{configuration,jdbcType=LONGVARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-  <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.ServiceIntegration">
-    update service_integration
-    set organization_id = #{organizationId,jdbcType=VARCHAR},
-      platform = #{platform,jdbcType=VARCHAR}
-    where id = #{id,jdbcType=VARCHAR}
-  </update>
-</mapper>

backend/src/main/java/io/dataease/base/mapper/SwaggerUrlProjectMapper.java

@@ -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<SwaggerUrlProject> 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);
-}

backend/src/main/java/io/dataease/base/mapper/SwaggerUrlProjectMapper.xml

@@ -1,231 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="io.dataease.base.mapper.SwaggerUrlProjectMapper">
-    <resultMap id="BaseResultMap" type="io.dataease.base.domain.SwaggerUrlProject">
-        <id column="id" jdbcType="VARCHAR" property="id"/>
-        <result column="project_id" jdbcType="VARCHAR" property="projectId"/>
-        <result column="swagger_url" jdbcType="VARCHAR" property="swaggerUrl"/>
-        <result column="module_id" jdbcType="VARCHAR" property="moduleId"/>
-        <result column="module_path" jdbcType="VARCHAR" property="modulePath"/>
-        <result column="mode_id" jdbcType="VARCHAR" property="modeId"/>
-    </resultMap>
-    <sql id="Example_Where_Clause">
-        <where>
-            <foreach collection="oredCriteria" item="criteria" separator="or">
-                <if test="criteria.valid">
-                    <trim prefix="(" prefixOverrides="and" suffix=")">
-                        <foreach collection="criteria.criteria" item="criterion">
-                            <choose>
-                                <when test="criterion.noValue">
-                                    and ${criterion.condition}
-                                </when>
-                                <when test="criterion.singleValue">
-                                    and ${criterion.condition} #{criterion.value}
-                                </when>
-                                <when test="criterion.betweenValue">
-                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                                </when>
-                                <when test="criterion.listValue">
-                                    and ${criterion.condition}
-                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
-                                             separator=",">
-                                        #{listItem}
-                                    </foreach>
-                                </when>
-                            </choose>
-                        </foreach>
-                    </trim>
-                </if>
-            </foreach>
-        </where>
-    </sql>
-    <sql id="Update_By_Example_Where_Clause">
-        <where>
-            <foreach collection="example.oredCriteria" item="criteria" separator="or">
-                <if test="criteria.valid">
-                    <trim prefix="(" prefixOverrides="and" suffix=")">
-                        <foreach collection="criteria.criteria" item="criterion">
-                            <choose>
-                                <when test="criterion.noValue">
-                                    and ${criterion.condition}
-                                </when>
-                                <when test="criterion.singleValue">
-                                    and ${criterion.condition} #{criterion.value}
-                                </when>
-                                <when test="criterion.betweenValue">
-                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-                                </when>
-                                <when test="criterion.listValue">
-                                    and ${criterion.condition}
-                                    <foreach close=")" collection="criterion.value" item="listItem" open="("
-                                             separator=",">
-                                        #{listItem}
-                                    </foreach>
-                                </when>
-                            </choose>
-                        </foreach>
-                    </trim>
-                </if>
-            </foreach>
-        </where>
-    </sql>
-    <sql id="Base_Column_List">
-        id, project_id, swagger_url, module_id, module_path, mode_id
-    </sql>
-    <select id="selectByExample" parameterType="io.dataease.base.domain.SwaggerUrlProjectExample"
-            resultMap="BaseResultMap">
-        select
-        <if test="distinct">
-            distinct
-        </if>
-        <include refid="Base_Column_List"/>
-        from swagger_url_project
-        <if test="_parameter != null">
-            <include refid="Example_Where_Clause"/>
-        </if>
-        <if test="orderByClause != null">
-            order by ${orderByClause}
-        </if>
-    </select>
-    <select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List"/>
-        from swagger_url_project
-        where id = #{id,jdbcType=VARCHAR}
-    </select>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.String">
-        delete
-        from swagger_url_project
-        where id = #{id,jdbcType=VARCHAR}
-    </delete>
-    <delete id="deleteByExample" parameterType="io.dataease.base.domain.SwaggerUrlProjectExample">
-        delete from swagger_url_project
-        <if test="_parameter != null">
-            <include refid="Example_Where_Clause"/>
-        </if>
-    </delete>
-    <insert id="insert" parameterType="io.dataease.base.domain.SwaggerUrlProject">
-        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>
-    <insert id="insertSelective" parameterType="io.dataease.base.domain.SwaggerUrlProject">
-        insert into swagger_url_project
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                id,
-            </if>
-            <if test="projectId != null">
-                project_id,
-            </if>
-            <if test="swaggerUrl != null">
-                swagger_url,
-            </if>
-            <if test="moduleId != null">
-                module_id,
-            </if>
-            <if test="modulePath != null">
-                module_path,
-            </if>
-            <if test="modeId != null">
-                mode_id,
-            </if>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="id != null">
-                #{id,jdbcType=VARCHAR},
-            </if>
-            <if test="projectId != null">
-                #{projectId,jdbcType=VARCHAR},
-            </if>
-            <if test="swaggerUrl != null">
-                #{swaggerUrl,jdbcType=VARCHAR},
-            </if>
-            <if test="moduleId != null">
-                #{moduleId,jdbcType=VARCHAR},
-            </if>
-            <if test="modulePath != null">
-                #{modulePath,jdbcType=VARCHAR},
-            </if>
-            <if test="modeId != null">
-                #{modeId,jdbcType=VARCHAR},
-            </if>
-        </trim>
-    </insert>
-    <select id="countByExample" parameterType="io.dataease.base.domain.SwaggerUrlProjectExample"
-            resultType="java.lang.Long">
-        select count(*) from swagger_url_project
-        <if test="_parameter != null">
-            <include refid="Example_Where_Clause"/>
-        </if>
-    </select>
-    <update id="updateByExampleSelective" parameterType="map">
-        update swagger_url_project
-        <set>
-            <if test="record.id != null">
-                id = #{record.id,jdbcType=VARCHAR},
-            </if>
-            <if test="record.projectId != null">
-                project_id = #{record.projectId,jdbcType=VARCHAR},
-            </if>
-            <if test="record.swaggerUrl != null">
-                swagger_url = #{record.swaggerUrl,jdbcType=VARCHAR},
-            </if>
-            <if test="record.moduleId != null">
-                module_id = #{record.moduleId,jdbcType=VARCHAR},
-            </if>
-            <if test="record.modulePath != null">
-                module_path = #{record.modulePath,jdbcType=VARCHAR},
-            </if>
-            <if test="record.modeId != null">
-                mode_id = #{record.modeId,jdbcType=VARCHAR},
-            </if>
-        </set>
-        <if test="_parameter != null">
-            <include refid="Update_By_Example_Where_Clause"/>
-        </if>
-    </update>
-    <update id="updateByExample" parameterType="map">
-        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}
-        <if test="_parameter != null">
-            <include refid="Update_By_Example_Where_Clause"/>
-        </if>
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="io.dataease.base.domain.SwaggerUrlProject">
-        update swagger_url_project
-        <set>
-            <if test="projectId != null">
-                project_id = #{projectId,jdbcType=VARCHAR},
-            </if>
-            <if test="swaggerUrl != null">
-                swagger_url = #{swaggerUrl,jdbcType=VARCHAR},
-            </if>
-            <if test="moduleId != null">
-                module_id = #{moduleId,jdbcType=VARCHAR},
-            </if>
-            <if test="modulePath != null">
-                module_path = #{modulePath,jdbcType=VARCHAR},
-            </if>
-            <if test="modeId != null">
-                mode_id = #{modeId,jdbcType=VARCHAR},
-            </if>
-        </set>
-        where id = #{id,jdbcType=VARCHAR}
-    </update>
-    <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.SwaggerUrlProject">
-        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}
-    </update>
-</mapper>

backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.java

@@ -13,7 +13,13 @@ import java.util.List;
  */
 @Mapper
 public interface ExtDataSetTaskMapper {
-    List<DataSetTaskLogDTO> list(GridExample example);
+    List<DataSetTaskLogDTO> listTaskLog(GridExample example);
+
+    List<DataSetTaskLogDTO> listUserTaskLog(GridExample example);
 
     List<DataSetTaskDTO> taskList(GridExample example);
+
+    List<DataSetTaskDTO> userTaskList(GridExample example);
+
+    List<DataSetTaskDTO> taskWithTriggers(GridExample example);
 }

backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml

@@ -14,9 +14,9 @@
         <result column="NEXT_FIRE_TIME" jdbcType="BIGINT" property="nextExecTime"/>
     </resultMap>
 
-    <select id="list" resultMap="BaseResult" parameterType="io.dataease.base.domain.DatasetTableTaskLog">
+    <select id="listTaskLog" resultMap="BaseResult" parameterType="io.dataease.base.domain.DatasetTableTaskLog">
         SELECT dataset_table_task_log.*, dataset_table_task.name, dataset_table.name as dataset_name
-        FROM (select GET_V_AUTH_MODEL_WITH_PRIVILEGE (#{extendCondition}, 'dataset',1) cids) t, dataset_table_task_log
+        FROM dataset_table_task_log
         LEFT JOIN dataset_table_task ON dataset_table_task_log.task_id = dataset_table_task.id
         LEFT JOIN dataset_table ON dataset_table_task_log.table_id = dataset_table.id
         <if test="_parameter != null">
@@ -30,9 +30,57 @@
         </if>
     </select>
 
+    <select id="listUserTaskLog" resultMap="BaseResult" parameterType="io.dataease.base.domain.DatasetTableTaskLog">
+        SELECT dataset_table_task_log.*, dataset_table_task.name, dataset_table.name as dataset_name
+        FROM dataset_table_task_log
+        LEFT JOIN dataset_table_task ON dataset_table_task_log.task_id = dataset_table_task.id
+        LEFT JOIN dataset_table ON dataset_table_task_log.table_id = dataset_table.id
+        <if test="_parameter != null">
+            <include refid="io.dataease.base.mapper.ext.query.GridSql.taskListGridCondition" />
+        </if>
+        <if test="orderByClause != null">
+            order by ${orderByClause}
+        </if>
+        <if test="orderByClause == null">
+            ORDER BY dataset_table_task_log.create_time desc
+        </if>
+    </select>
+
     <select id="taskList" resultMap="TaskResult" parameterType="io.dataease.base.mapper.ext.query.GridExample">
         SELECT dataset_table.name as table_name, get_auths(dataset_table_task.table_id,'dataset', #{extendCondition}) as `privileges`,dataset_table_task.* , qrtz_triggers.NEXT_FIRE_TIME
-        FROM (select GET_V_AUTH_MODEL_WITH_PRIVILEGE (#{extendCondition}, 'dataset', 1) cids) t, dataset_table_task
+        FROM dataset_table_task
+        left join dataset_table on dataset_table.id=dataset_table_task.table_id
+        left join qrtz_triggers on dataset_table_task.id=qrtz_triggers.TRIGGER_NAME
+        <if test="_parameter != null">
+            <include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
+        </if>
+        <if test="orderByClause != null">
+            order by ${orderByClause}
+        </if>
+        <if test="orderByClause == null">
+            order by dataset_table_task.create_time desc
+        </if>
+    </select>
+
+    <select id="userTaskList" resultMap="TaskResult" parameterType="io.dataease.base.mapper.ext.query.GridExample">
+        SELECT dataset_table.name as table_name, get_auths(dataset_table_task.table_id,'dataset', #{extendCondition}) as `privileges`,dataset_table_task.* , qrtz_triggers.NEXT_FIRE_TIME
+        FROM dataset_table_task
+        left join dataset_table on dataset_table.id=dataset_table_task.table_id
+        left join qrtz_triggers on dataset_table_task.id=qrtz_triggers.TRIGGER_NAME
+        <if test="_parameter != null">
+            <include refid="io.dataease.base.mapper.ext.query.GridSql.taskListGridCondition" />
+        </if>
+        <if test="orderByClause != null">
+            order by ${orderByClause}
+        </if>
+        <if test="orderByClause == null">
+            order by dataset_table_task.create_time desc
+        </if>
+    </select>
+
+    <select id="taskWithTriggers" resultMap="TaskResult" parameterType="io.dataease.base.mapper.ext.query.GridExample">
+        SELECT dataset_table.name as table_name, get_auths(dataset_table_task.table_id,'dataset', #{extendCondition}) as `privileges`,dataset_table_task.* , qrtz_triggers.NEXT_FIRE_TIME
+        FROM dataset_table_task
         left join dataset_table on dataset_table.id=dataset_table_task.table_id
         left join qrtz_triggers on dataset_table_task.id=qrtz_triggers.TRIGGER_NAME
         <if test="_parameter != null">

backend/src/main/java/io/dataease/base/mapper/ext/ExtIssuesMapper.java

@@ -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<Issues> getIssues(@Param("caseId") String caseId, @Param("platform") String platform);
-}

backend/src/main/java/io/dataease/base/mapper/ext/ExtIssuesMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="io.dataease.base.mapper.ext.ExtIssuesMapper">
-
-    <select id="getIssues" resultType="io.dataease.base.domain.Issues">
-        select issues.*
-          from test_case_issues, issues
-         where test_case_issues.issues_id = issues.id
-           and test_case_issues.test_case_id = #{caseId}
-           and issues.platform = #{platform}
-          order by issues.create_time DESC
-    </select>
-</mapper>

backend/src/main/java/io/dataease/base/mapper/ext/ExtLoadTestReportDetailMapper.java

@@ -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);
-}

backend/src/main/java/io/dataease/base/mapper/ext/ExtLoadTestReportDetailMapper.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="io.dataease.base.mapper.ext.ExtLoadTestReportDetailMapper">
-    <update id="appendLine">
-        UPDATE load_test_report_detail
-        SET content = concat(content, #{line})
-        WHERE report_id = #{reportId}
-    </update>
-</mapper>

backend/src/main/java/io/dataease/base/mapper/ext/ExtOrganizationMapper.java

@@ -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);
-}

backend/src/main/java/io/dataease/base/mapper/ext/ExtOrganizationMapper.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="io.dataease.base.mapper.ext.ExtOrganizationMapper">
-
-    <select id="checkSourceRole" resultType="Integer">
-        select count(id)
-          from user_role ur
-         where ur.user_id = #{userId}
-           and ur.source_id = #{sourceId}
-           and ur.role_id = #{roleId}
-    </select>
-
-</mapper>

backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.java

@@ -2,7 +2,7 @@ package io.dataease.base.mapper.ext;
 
 import io.dataease.base.domain.SysMsgExample;
 import io.dataease.base.domain.SysMsgSetting;
-import io.dataease.controller.message.dto.MsgGridDto;
+import io.dataease.controller.sys.response.MsgGridDto;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="io.dataease.base.mapper.ext.ExtSysMsgMapper">
 
-    <resultMap id="msgGridDto" type="io.dataease.controller.message.dto.MsgGridDto" extends="io.dataease.base.mapper.SysMsgMapper.BaseResultMap">
+    <resultMap id="msgGridDto" type="io.dataease.controller.sys.response.MsgGridDto" extends="io.dataease.base.mapper.SysMsgMapper.BaseResultMap">
         <result column="router" property="router"></result>
         <result column="callback" property="callback"></result>
     </resultMap>

backend/src/main/java/io/dataease/base/mapper/ext/query/GridExample.java

@@ -114,6 +114,15 @@ public class GridExample {
             criteria.add(new Criterion(condition, value));
         }
 
+        protected void addSqlCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            Criterion criterion = new Criterion(condition, value);
+            criterion.sqlValue = true;
+            criteria.add(criterion);
+        }
+
         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");
@@ -174,6 +183,9 @@ public class GridExample {
                 case "extra":
                     addCriterion(field);
                     break;
+                case "sql in":
+                    addCriterion(field+" in ", value, field);
+                    break;
             }
             return (Criteria) this;
         }
@@ -206,6 +218,16 @@ public class GridExample {
 
         private boolean listValue;
 
+        public boolean isSqlValue() {
+            return sqlValue;
+        }
+
+        public void setSqlValue(boolean sqlValue) {
+            this.sqlValue = sqlValue;
+        }
+
+        private boolean sqlValue;
+
         private String typeHandler;
 
         public String getCondition() {

backend/src/main/java/io/dataease/base/mapper/ext/query/GridSql.xml

@@ -32,4 +32,36 @@
         </where>
     </sql>
 
+
+    <sql id="taskListGridCondition">
+        <where>
+            dataset_table.id in (SELECT `sys_auth`.`auth_source` FROM `sys_auth` LEFT JOIN `sys_auth_detail` ON `sys_auth`.`id` = `sys_auth_detail`.`auth_id` LEFT JOIN `dataset_table` ON `dataset_table`.`id` = `sys_auth`.`auth_source` WHERE `sys_auth_detail`.`privilege_type` = '1' and `sys_auth_detail`.`privilege_value` = '1'and `sys_auth`.`auth_source_type` = 'dataset' AND ((`sys_auth`.`auth_target_type` = 'dept' AND `sys_auth`.`auth_target` in ( SELECT dept_id FROM `sys_user` WHERE `sys_user`.`user_id` = #{extendCondition} )) OR (sys_auth.auth_target_type = 'user'AND sys_auth.auth_target = #{extendCondition} ) OR (sys_auth.auth_target_type = 'role' AND `sys_auth`.`auth_target` in ( SELECT role_id FROM `sys_users_roles` WHERE `sys_users_roles`.`user_id` = #{extendCondition} )) OR (1 = ( SELECT is_admin FROM `sys_user` WHERE `sys_user`.`user_id` = #{extendCondition} )))) and
+            <foreach collection="oredCriteria" item="criteria" separator="or">
+                <if test="criteria.valid">
+                    <trim prefix="(" prefixOverrides="and" suffix=")">
+                        <foreach collection="criteria.criteria" item="criterion">
+                            <choose>
+                                <when test="criterion.noValue">
+                                    and ${criterion.condition}
+                                </when>
+                                <when test="criterion.singleValue">
+                                    and ${criterion.condition} #{criterion.value}
+                                </when>
+                                <when test="criterion.betweenValue">
+                                    and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                                </when>
+                                <when test="criterion.listValue">
+                                    and ${criterion.condition}
+                                    <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                                        #{listItem}
+                                    </foreach>
+                                </when>
+                            </choose>
+                        </foreach>
+                    </trim>
+                </if>
+            </foreach>
+        </where>
+    </sql>
+
 </mapper>

backend/src/main/java/io/dataease/commons/utils/ExcelReaderUtil.java

@@ -68,6 +68,7 @@ public class ExcelReaderUtil {
     }
 
     public static void main(String[] args) throws Exception {
-        ExcelReaderUtil.readExcel("跑步数据汇总——万马奔腾版0729.xlsx", new FileInputStream("/Users/taojinlong/Desktop/跑步数据汇总——万马奔腾版0729.xlsx"));
+        String file ="全国现有确诊趋势.xlsx";
+        ExcelReaderUtil.readExcel(file, new FileInputStream("/Users/taojinlong/Desktop/" + file));
     }
 }

backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java

@@ -238,6 +238,7 @@ public class ExcelXlsReader implements HSSFListener {
                     value = sstRecord.getString(lsrec.getSSTIndex()).toString().trim();
                     value = value.equals("") ? "" : value;
                     cellList.add(thisColumn, value);
+                    checkType(value, thisColumn);
                     checkRowIsNull(value);  //如果里面某个单元格含有值，则标识该行不为空行
                 }
                 break;
@@ -259,7 +260,7 @@ public class ExcelXlsReader implements HSSFListener {
                 value = value.equals("") ? "" : value;
                 //向容器加入列值
                 cellList.add(thisColumn, value);
-                if(formatIndex == 59){
+                if(formatIndex == 59 || formatIndex== 14){
                     totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType("DATETIME");
                 }else {
                     checkType(value, thisColumn);
@@ -374,13 +375,18 @@ public class ExcelXlsReader implements HSSFListener {
             type = "TEXT";
         }
 
-        String oldType = totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).getFieldType();
-        if(type.equalsIgnoreCase("LONG") && oldType.equalsIgnoreCase("TEXT")){
+        if(curRow==1){
             totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type);
         }
-        if(type.equalsIgnoreCase("DOUBLE")){
+        if(curRow > 1) {
+            String oldType = totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).getFieldType();
+            if(type.equalsIgnoreCase("TEXT")){
                 totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type);
             }
+            if(type.equalsIgnoreCase("DOUBLE") && oldType.equalsIgnoreCase("LONG")){
+                totalSheets.get(totalSheets.size() -1).getFields().get(thisColumn).setFieldType(type);
+            }
+        }
         return type;
     }
 

backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java

@@ -246,6 +246,7 @@ public class ExcelXlsxReader extends DefaultHandler {
         } else if ("v".equals(name)) {
             //v => 单元格的值，如果单元格是字符串，则v标签的值为该字符串在SST中的索引
             String value = this.getDataValue(lastIndex.trim(), "");//根据索引值获取对应的单元格值
+
             if (preRef == null) {
                 preRef = ref;
             }
@@ -316,7 +317,7 @@ public class ExcelXlsxReader extends DefaultHandler {
         } else if ("s".equals(cellType)) { //处理字符串
             nextDataType = CellDataType.SSTINDEX;
         } else if ("str".equals(cellType)) {
-            nextDataType = CellDataType.FORMULA;
+            nextDataType = CellDataType.SSTINDEX;
         }
 
         String cellStyleStr = attributes.getValue("s"); //
@@ -413,16 +414,20 @@ public class ExcelXlsxReader extends DefaultHandler {
             if(CollectionUtils.isEmpty(this.getFields())){
                 throw new RuntimeException(Translator.get("i18n_excel_header_empty"));
             }
-            if(type.equalsIgnoreCase("LONG") && this.getFields().get(curCol).getFieldType().equalsIgnoreCase("TEXT")){
+            if(curRow==2){
+                this.getFields().get(curCol).setFieldType(type);
+            }else {
+                if(type.equalsIgnoreCase("TEXT")){
                     this.getFields().get(curCol).setFieldType(type);
                 }
-            if(type.equalsIgnoreCase("DOUBLE") && !this.getFields().get(curCol).getFieldType().equalsIgnoreCase("DATETIME")){
+                if(type.equalsIgnoreCase("DOUBLE") && this.getFields().get(curCol).getFieldType().equalsIgnoreCase("LONG")){
                     this.getFields().get(curCol).setFieldType(type);
                 }
                 if(type.equalsIgnoreCase("DATETIME")){
                     this.getFields().get(curCol).setFieldType(type);
                 }
             }
+        }
         return thisStr;
     }
 

backend/src/main/java/io/dataease/commons/utils/ScriptEngineUtils.java

@@ -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;
-        }
-    }
-}

backend/src/main/java/io/dataease/config/Knife4jConfiguration.java

@@ -0,0 +1,115 @@
+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.beans.factory.annotation.Value;
+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;
+
+    @Value("${app.version}")
+    private String version;
+
+
+    @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")
+                .description("人人可用的开源数据可视化分析工具")
+                .termsOfServiceUrl("https://dataease.io")
+                .contact(new Contact("fit2cloud","https://www.fit2cloud.com/dataease/index.html","dataease@fit2cloud.com"))
+                .version(version)
+                .build();
+    }
+
+    private Docket defaultApi(String groupName, String packageName) {
+        List<SecurityScheme> securitySchemes=new ArrayList<>();
+        securitySchemes.add(apiKey());
+        List<SecurityContext> securityContexts = new ArrayList<>();
+        securityContexts.add(securityContext());
+
+        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();
+    }
+
+    private ApiKey apiKey() {
+        return new ApiKey("Authorization", "Authorization", "header");
+    }
+
+
+    List<SecurityReference> defaultAuth() {
+        AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
+        AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
+        authorizationScopes[0] = authorizationScope;
+        return CollectionUtil.newArrayList(new SecurityReference("Authorization", authorizationScopes));
+    }
+
+}

backend/src/main/java/io/dataease/config/OpenApiConfig.java

@@ -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 {
-}

backend/src/main/java/io/dataease/controller/chart/ChartController.java

@@ -1,18 +1,24 @@
 package io.dataease.controller.chart;
 
 import com.alibaba.fastjson.JSON;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Api(tags = "视图：视图管理")
+@ApiSupport(order = 110)
 @RestController
 @RequestMapping("chart/table")
 public class ChartController {
 
 
 
+    @ApiOperation("查询")
     @PostMapping("list")
     public List<JSON> list(@RequestBody DataSetTableRequest dataSetTableRequest) {
         return new ArrayList<>();

backend/src/main/java/io/dataease/controller/chart/ChartGroupController.java

@@ -1,40 +1,51 @@
 package io.dataease.controller.chart;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.ChartGroup;
 import io.dataease.controller.request.chart.ChartGroupRequest;
 import io.dataease.dto.chart.ChartGroupDTO;
 import io.dataease.service.chart.ChartGroupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.List;
 
+@Api(tags = "视图：视图组")
+@ApiSupport(order = 120)
 @RestController
 @RequestMapping("chart/group")
 public class ChartGroupController {
     @Resource
     private ChartGroupService chartGroupService;
 
+    @ApiOperation("保存")
     @PostMapping("/save")
     public ChartGroupDTO save(@RequestBody ChartGroup ChartGroup) {
         return chartGroupService.save(ChartGroup);
     }
 
+    @ApiOperation("查询树")
     @PostMapping("/tree")
     public List<ChartGroupDTO> tree(@RequestBody ChartGroupRequest ChartGroup) {
         return chartGroupService.tree(ChartGroup);
     }
 
+    @ApiOperation("查询树节点")
     @PostMapping("/treeNode")
     public List<ChartGroupDTO> treeNode(@RequestBody ChartGroupRequest ChartGroup) {
         return chartGroupService.tree(ChartGroup);
     }
 
+    @ApiOperation("删除")
     @PostMapping("/delete/{id}")
     public void tree(@PathVariable String id) {
         chartGroupService.delete(id);
     }
 
+    @ApiIgnore
     @PostMapping("/getScene/{id}")
     public ChartGroup getScene(@PathVariable String id) {
         return chartGroupService.getScene(id);

backend/src/main/java/io/dataease/controller/chart/ChartViewController.java

@@ -1,5 +1,6 @@
 package io.dataease.controller.chart;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.controller.request.chart.ChartExtRequest;
@@ -8,7 +9,10 @@ import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.dto.chart.ChartViewDTO;
 import io.dataease.dto.dataset.DataSetTableDTO;
 import io.dataease.service.chart.ChartViewService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -18,57 +22,69 @@ import java.util.Map;
  * @Author gin
  * @Date 2021/3/1 1:17 下午
  */
+@Api(tags = "视图：视图域")
+@ApiSupport(order = 130)
 @RestController
 @RequestMapping("/chart/view")
 public class ChartViewController {
     @Resource
     private ChartViewService chartViewService;
 
+    @ApiOperation("保存")
     @PostMapping("/save")
     public ChartViewWithBLOBs save(@RequestBody ChartViewWithBLOBs chartViewWithBLOBs) {
         return chartViewService.save(chartViewWithBLOBs);
     }
 
+    @ApiOperation("查询")
     @PostMapping("/list")
     public List<ChartViewDTO> list(@RequestBody ChartViewRequest chartViewRequest) {
         return chartViewService.list(chartViewRequest);
     }
 
+    @ApiOperation("查询组")
     @PostMapping("/listAndGroup")
     public List<ChartViewDTO> listAndGroup(@RequestBody ChartViewRequest chartViewRequest) {
         return chartViewService.listAndGroup(chartViewRequest);
     }
 
+    @ApiOperation("详息")
     @PostMapping("/get/{id}")
     public ChartViewWithBLOBs get(@PathVariable String id) {
         return chartViewService.get(id);
     }
 
+    @ApiOperation("删除")
     @PostMapping("/delete/{id}")
     public void delete(@PathVariable String id) {
         chartViewService.delete(id);
     }
 
+    @ApiOperation("数据")
     @PostMapping("/getData/{id}")
     public ChartViewDTO getData(@PathVariable String id, @RequestBody ChartExtRequest requestList) throws Exception {
         return chartViewService.getData(id, requestList);
     }
 
+    @ApiOperation("视图详情")
     @PostMapping("chartDetail/{id}")
     public Map<String, Object> chartDetail(@PathVariable String id) {
         return chartViewService.getChartDetail(id);
     }
 
+    @ApiOperation("复制")
     @PostMapping("chartCopy/{id}")
     public String chartCopy(@PathVariable String id) {
         return chartViewService.chartCopy(id);
     }
 
+    @ApiIgnore
     @GetMapping("searchAdviceSceneId/{panelId}")
     public String searchAdviceSceneId(@PathVariable String panelId) {
         return chartViewService.searchAdviceSceneId(panelId);
     }
 
+    @ApiOperation("根据权限查详情")
     @PostMapping("/getOneWithPermission/{id}")
     public ChartViewDTO getOneWithPermission(@PathVariable String id, @RequestBody ChartExtRequest requestList) throws Exception {
         //如果能获取用户 则添加对应的权限
@@ -80,7 +96,7 @@ public class ChartViewController {
         return dto;
     }
 
-
+    @ApiOperation("搜索")
     @PostMapping("search")
     public List<ChartViewDTO> search(@RequestBody ChartViewRequest chartViewRequest) {
         return chartViewService.search(chartViewRequest);

backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java

@@ -1,11 +1,15 @@
 package io.dataease.controller.dataset;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.DatasetGroup;
 import io.dataease.controller.request.dataset.DataSetGroupRequest;
 import io.dataease.dto.dataset.DataSetGroupDTO;
 import io.dataease.service.dataset.DataSetGroupService;
 import io.dataease.service.dataset.ExtractDataService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -14,6 +18,8 @@ import java.util.List;
  * @Author gin
  * @Date 2021/2/20 8:29 下午
  */
+@Api(tags = "数据集：数据集组")
+@ApiSupport(order = 40)
 @RestController
 @RequestMapping("dataset/group")
 public class DataSetGroupController {
@@ -22,31 +28,37 @@ public class DataSetGroupController {
     @Resource
     private ExtractDataService extractDataService;
 
+    @ApiOperation("保存")
     @PostMapping("/save")
     public DataSetGroupDTO save(@RequestBody DatasetGroup datasetGroup) {
         return dataSetGroupService.save(datasetGroup);
     }
 
+    @ApiOperation("查询树")
     @PostMapping("/tree")
     public List<DataSetGroupDTO> tree(@RequestBody DataSetGroupRequest datasetGroup) {
         return dataSetGroupService.tree(datasetGroup);
     }
 
+    @ApiOperation("查询树节点")
     @PostMapping("/treeNode")
     public List<DataSetGroupDTO> treeNode(@RequestBody DataSetGroupRequest datasetGroup) {
         return dataSetGroupService.treeNode(datasetGroup);
     }
 
+    @ApiOperation("删除")
     @PostMapping("/delete/{id}")
     public void tree(@PathVariable String id) throws Exception {
         dataSetGroupService.delete(id);
     }
 
+    @ApiIgnore
     @PostMapping("/getScene/{id}")
     public DatasetGroup getScene(@PathVariable String id) {
         return dataSetGroupService.getScene(id);
     }
 
+    @ApiOperation("检测kettle")
     @PostMapping("/isKettleRunning")
     public boolean isKettleRunning() {
         return extractDataService.isKettleRunning();

backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java

@@ -1,5 +1,6 @@
 package io.dataease.controller.dataset;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.DatasetTable;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableIncrementalConfig;
@@ -7,6 +8,8 @@ import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.datasource.dto.TableFiled;
 import io.dataease.dto.dataset.DataSetTableDTO;
 import io.dataease.service.dataset.DataSetTableService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -18,97 +21,117 @@ import java.util.Map;
  * @Author gin
  * @Date 2021/2/20 8:29 下午
  */
+@Api(tags = "数据集：数据集表")
+@ApiSupport(order = 50)
 @RestController
 @RequestMapping("dataset/table")
 public class DataSetTableController {
     @Resource
     private DataSetTableService dataSetTableService;
 
+    @ApiOperation("批量保存")
     @PostMapping("batchAdd")
     public void batchAdd(@RequestBody List<DataSetTableRequest> datasetTable) throws Exception {
         dataSetTableService.batchInsert(datasetTable);
     }
 
+    @ApiOperation("更新")
     @PostMapping("update")
     public DatasetTable save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
         return dataSetTableService.save(datasetTable);
     }
 
+    @ApiOperation("删除")
     @PostMapping("delete/{id}")
     public void delete(@PathVariable String id) throws Exception {
         dataSetTableService.delete(id);
     }
 
+    @ApiOperation("查询")
     @PostMapping("list")
     public List<DataSetTableDTO> list(@RequestBody DataSetTableRequest dataSetTableRequest) {
         return dataSetTableService.list(dataSetTableRequest);
     }
 
+    @ApiOperation("查询组")
     @PostMapping("listAndGroup")
     public List<DataSetTableDTO> listAndGroup(@RequestBody DataSetTableRequest dataSetTableRequest) {
         return dataSetTableService.listAndGroup(dataSetTableRequest);
     }
 
+    @ApiOperation("详息")
     @PostMapping("get/{id}")
     public DatasetTable get(@PathVariable String id) {
         return dataSetTableService.get(id);
     }
 
+    @ApiOperation("带权限查询")
     @PostMapping("getWithPermission/{id}")
     public DataSetTableDTO getWithPermission(@PathVariable String id) {
         return dataSetTableService.getWithPermission(id);
     }
 
+    @ApiOperation("查询原始字段")
     @PostMapping("getFields")
     public List<TableFiled> getFields(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception {
         return dataSetTableService.getFields(dataSetTableRequest);
     }
 
+    @ApiOperation("查询生成字段")
     @PostMapping("getFieldsFromDE")
     public Map<String, List<DatasetTableField>> getFieldsFromDE(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception {
         return dataSetTableService.getFieldsFromDE(dataSetTableRequest);
     }
 
+    @ApiOperation("查询预览数据")
     @PostMapping("getPreviewData/{page}/{pageSize}")
     public Map<String, Object> getPreviewData(@RequestBody DataSetTableRequest dataSetTableRequest, @PathVariable Integer page, @PathVariable Integer pageSize) throws Exception {
         return dataSetTableService.getPreviewData(dataSetTableRequest, page, pageSize);
     }
 
+    @ApiOperation("根据sql查询预览数据")
     @PostMapping("sqlPreview")
     public Map<String, Object> getSQLPreview(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception {
         return dataSetTableService.getSQLPreview(dataSetTableRequest);
     }
 
+    @ApiOperation("客户预览数据")
     @PostMapping("customPreview")
     public Map<String, Object> customPreview(@RequestBody DataSetTableRequest dataSetTableRequest) throws Exception {
         return dataSetTableService.getCustomPreview(dataSetTableRequest);
     }
 
+    @ApiOperation("查询增量配置")
     @PostMapping("incrementalConfig")
     public DatasetTableIncrementalConfig incrementalConfig(@RequestBody DatasetTableIncrementalConfig datasetTableIncrementalConfig) throws Exception {
         return dataSetTableService.incrementalConfig(datasetTableIncrementalConfig);
     }
 
+    @ApiOperation("保存增量配置")
     @PostMapping("save/incrementalConfig")
     public void saveIncrementalConfig(@RequestBody DatasetTableIncrementalConfig datasetTableIncrementalConfig) throws Exception {
         dataSetTableService.saveIncrementalConfig(datasetTableIncrementalConfig);
     }
 
+    @ApiOperation("数据集详息")
     @PostMapping("datasetDetail/{id}")
     public Map<String, Object> datasetDetail(@PathVariable String id) {
         return dataSetTableService.getDatasetDetail(id);
     }
 
+    @ApiOperation("excel上传")
     @PostMapping("excel/upload")
     public Map<String, Object> excelUpload(@RequestParam("file") MultipartFile file, @RequestParam("tableId") String tableId) throws Exception {
         return dataSetTableService.excelSaveAndParse(file, tableId);
     }
 
+    @ApiOperation("检测doris")
     @PostMapping("checkDorisTableIsExists/{id}")
     public Boolean checkDorisTableIsExists(@PathVariable String id) throws Exception {
         return dataSetTableService.checkDorisTableIsExists(id);
     }
 
+    @ApiOperation("搜索")
     @PostMapping("search")
     public List<DataSetTableDTO> search(@RequestBody DataSetTableRequest dataSetTableRequest) {
         return dataSetTableService.search(dataSetTableRequest);

backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java

@@ -1,8 +1,11 @@
 package io.dataease.controller.dataset;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.service.dataset.DataSetFieldService;
 import io.dataease.service.dataset.DataSetTableFieldsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -15,6 +18,8 @@ import java.util.Map;
  * @Author gin
  * @Date 2021/2/24 4:28 下午
  */
+@Api(tags = "数据集：数据集字段")
+@ApiSupport(order = 60)
 @RestController
 @RequestMapping("/dataset/field")
 public class DataSetTableFieldController {
@@ -24,6 +29,7 @@ public class DataSetTableFieldController {
     @Autowired
     private DataSetFieldService dataSetFieldService;
 
+    @ApiOperation("查询表下属字段")
     @PostMapping("list/{tableId}")
     public List<DatasetTableField> list(@PathVariable String tableId) {
         DatasetTableField datasetTableField = DatasetTableField.builder().build();
@@ -31,6 +37,7 @@ public class DataSetTableFieldController {
         return dataSetTableFieldsService.list(datasetTableField);
     }
 
+    @ApiOperation("分组查询表下属字段")
     @PostMapping("listByDQ/{tableId}")
     public Map<String, List<DatasetTableField>> listByDQ(@PathVariable String tableId) {
         DatasetTableField datasetTableField = DatasetTableField.builder().build();
@@ -46,21 +53,24 @@ public class DataSetTableFieldController {
         return map;
     }
 
+    @ApiOperation("批量更新")
     @PostMapping("batchEdit")
     public void batchEdit(@RequestBody List<DatasetTableField> list) {
         dataSetTableFieldsService.batchEdit(list);
     }
 
+    @ApiOperation("保存")
     @PostMapping("save")
     public DatasetTableField save(@RequestBody DatasetTableField datasetTableField) {
         return dataSetTableFieldsService.save(datasetTableField);
     }
-
+    @ApiOperation("删除")
     @PostMapping("delete/{id}")
     public void delete(@PathVariable String id) {
         dataSetTableFieldsService.delete(id);
     }
 
+    @ApiOperation("值枚举")
     @PostMapping("fieldValues/{fieldId}")
     public List<Object> fieldValues(@PathVariable String fieldId) {
         return dataSetFieldService.fieldValues(fieldId);

backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java

@@ -2,6 +2,7 @@ package io.dataease.controller.dataset;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.DatasetTableTask;
 import io.dataease.commons.utils.PageUtils;
 import io.dataease.commons.utils.Pager;
@@ -10,6 +11,7 @@ import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.dto.dataset.DataSetTaskDTO;
 import io.dataease.service.dataset.DataSetTableTaskLogService;
 import io.dataease.service.dataset.DataSetTableTaskService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
@@ -20,6 +22,8 @@ import java.util.List;
  * @Author gin
  * @Date 2021/3/4 1:32 下午
  */
+@Api(tags = "数据集：数据集任务")
+@ApiSupport(order = 90)
 @RestController
 @RequestMapping("dataset/task")
 public class DataSetTableTaskController {
@@ -28,39 +32,45 @@ public class DataSetTableTaskController {
     @Resource
     private DataSetTableTaskLogService dataSetTableTaskLogService;
 
+    @ApiOperation("保存")
     @PostMapping("save")
     public DatasetTableTask save(@RequestBody DataSetTaskRequest dataSetTaskRequest) throws Exception {
         return dataSetTableTaskService.save(dataSetTaskRequest);
     }
 
+    @ApiOperation("删除")
     @PostMapping("delete/{id}")
     public void delete(@PathVariable String id) {
         dataSetTableTaskService.delete(id);
     }
 
+    @ApiOperation("查询")
     @PostMapping("list")
     public List<DatasetTableTask> list(@RequestBody DatasetTableTask datasetTableTask) {
         return dataSetTableTaskService.list(datasetTableTask);
     }
 
-    @ApiOperation("查看数据集任务")
+    @ApiOperation("分页查询")
     @PostMapping("/pageList/{goPage}/{pageSize}")
     public Pager<List<DataSetTaskDTO>> taskList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody BaseGridRequest request) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
 
-        return PageUtils.setPageInfo(page, dataSetTableTaskService.taskList(request));
+        return PageUtils.setPageInfo(page, dataSetTableTaskService.taskList4User(request));
     }
 
+    @ApiOperation("上次执行时间")
     @PostMapping("/lastExecStatus")
     public DataSetTaskDTO lastExecStatus(@RequestBody DataSetTaskDTO datasetTableTask) {
         return dataSetTableTaskLogService.lastExecStatus(datasetTableTask);
     }
 
+    @ApiOperation("更新状态")
     @PostMapping("/updateStatus")
     public void updateStatus(@RequestBody DatasetTableTask datasetTableTask) {
         dataSetTableTaskService.updateDatasetTableTaskStatus(datasetTableTask);
     }
 
+    @ApiOperation("执行任务")
     @PostMapping("/execTask")
     public void execTask(@RequestBody DatasetTableTask datasetTableTask) throws Exception{
         dataSetTableTaskService.execTask(datasetTableTask);

backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java

@@ -2,12 +2,15 @@ package io.dataease.controller.dataset;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.DatasetTableTaskLog;
 import io.dataease.commons.utils.PageUtils;
 import io.dataease.commons.utils.Pager;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.dto.dataset.DataSetTaskLogDTO;
 import io.dataease.service.dataset.DataSetTableTaskLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -17,26 +20,31 @@ import java.util.List;
  * @Author gin
  * @Date 2021/3/4 1:32 下午
  */
+@Api(tags = "数据集：数据集任务执行记录")
+@ApiSupport(order = 100)
 @RestController
 @RequestMapping("dataset/taskLog")
 public class DataSetTableTaskLogController {
     @Resource
     private DataSetTableTaskLogService dataSetTableTaskLogService;
 
+    @ApiOperation("保存")
     @PostMapping("save")
     public DatasetTableTaskLog save(@RequestBody DatasetTableTaskLog datasetTableTaskLog) {
         return dataSetTableTaskLogService.save(datasetTableTaskLog);
     }
 
+    @ApiOperation("删除")
     @PostMapping("delete/{id}")
     public void delete(@PathVariable String id) {
         dataSetTableTaskLogService.delete(id);
     }
 
+    @ApiOperation("分页查询")
     @PostMapping("list/{type}/{goPage}/{pageSize}")
     public Pager<List<DataSetTaskLogDTO>> list(@RequestBody BaseGridRequest request, @PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
-        return PageUtils.setPageInfo(page, dataSetTableTaskLogService.list(request, type));
+        return PageUtils.setPageInfo(page, dataSetTableTaskLogService.listTaskLog(request, type));
     }
 
 }

backend/src/main/java/io/dataease/controller/dataset/DataSetTableUnionController.java

@@ -1,8 +1,11 @@
 package io.dataease.controller.dataset;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.DatasetTableUnion;
 import io.dataease.dto.dataset.DataSetTableUnionDTO;
 import io.dataease.service.dataset.DataSetTableUnionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -12,22 +15,27 @@ import java.util.List;
  * @Author gin
  * @Date 2021/5/7 10:30 上午
  */
+@Api(tags = "数据集：数据集关联")
+@ApiSupport(order = 70)
 @RestController
 @RequestMapping("dataset/union")
 public class DataSetTableUnionController {
     @Resource
     private DataSetTableUnionService dataSetTableUnionService;
 
+    @ApiOperation("保存")
     @PostMapping("save")
     public DatasetTableUnion save(@RequestBody DatasetTableUnion datasetTableUnion) {
         return dataSetTableUnionService.save(datasetTableUnion);
     }
 
+    @ApiOperation("删除")
     @PostMapping("delete/{id}")
     public void delete(@PathVariable String id) {
         dataSetTableUnionService.delete(id);
     }
 
+    @ApiOperation("查询")
     @PostMapping("listByTableId/{tableId}")
     public List<DataSetTableUnionDTO> listByTableId(@PathVariable String tableId) {
         return dataSetTableUnionService.listByTableId(tableId);

backend/src/main/java/io/dataease/controller/dataset/DatasetFunctionController.java

@@ -1,7 +1,10 @@
 package io.dataease.controller.dataset;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.DatasetTableFunction;
 import io.dataease.service.dataset.DatasetFunctionService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -14,12 +17,15 @@ import java.util.List;
  * @Author gin
  * @Date 2021/7/29 11:58 上午
  */
+@Api(tags = "数据集：数据集方法")
+@ApiSupport(order = 80)
 @RestController
 @RequestMapping("dataset/function")
 public class DatasetFunctionController {
     @Resource
     private DatasetFunctionService datasetFunctionService;
 
+    @ApiOperation("查询")
     @PostMapping("listByTableId/{tableId}")
     public List<DatasetTableFunction> listByTableId(@PathVariable String tableId) {
         return datasetFunctionService.listByTableId(tableId);

backend/src/main/java/io/dataease/controller/panel/PanelDesignController.java

@@ -1,6 +1,9 @@
 package io.dataease.controller.panel;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.service.panel.PanelGroupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -10,6 +13,8 @@ import javax.annotation.Resource;
  * Date: 2021-03-05
  * Description:
  */
+@Api(tags = "仪表板：设计")
+@ApiSupport(order = 140)
 @RestController
 @RequestMapping("panel/design")
 public class PanelDesignController {
@@ -17,6 +22,7 @@ public class PanelDesignController {
     @Resource
     private PanelGroupService panelGroupService;
 
+    @ApiOperation("保存")
     @PostMapping("/saveDesign/{id}")
     public void deleteCircle(@PathVariable String id) {
         panelGroupService.deleteCircle(id);

backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java

@@ -1,11 +1,14 @@
 package io.dataease.controller.panel;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.PanelGroup;
 import io.dataease.base.domain.PanelGroupWithBLOBs;
 import io.dataease.controller.handler.annotation.I18n;
 import io.dataease.controller.request.panel.PanelGroupRequest;
 import io.dataease.dto.panel.PanelGroupDTO;
 import io.dataease.service.panel.PanelGroupService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -16,6 +19,8 @@ import java.util.List;
  * Date: 2021-03-05
  * Description:
  */
+@Api(tags = "仪表板：仪表板组")
+@ApiSupport(order = 150)
 @RestController
 @RequestMapping("panel/group")
 public class PanelGroupController {
@@ -23,27 +28,32 @@ public class PanelGroupController {
     @Resource
     private PanelGroupService panelGroupService;
 
+    @ApiOperation("查询树")
     @PostMapping("/tree")
     public List<PanelGroupDTO> tree(@RequestBody PanelGroupRequest request) {
         return panelGroupService.tree(request);
     }
 
+    @ApiOperation("默认树")
     @PostMapping("/defaultTree")
     public List<PanelGroupDTO> defaultTree(@RequestBody PanelGroupRequest request) {
         return panelGroupService.defaultTree(request);
     }
 
+    @ApiOperation("保存")
     @PostMapping("/save")
     @I18n
     public PanelGroup saveOrUpdate(@RequestBody PanelGroupRequest request) {
         return panelGroupService.saveOrUpdate(request);
     }
 
+    @ApiOperation("删除")
     @PostMapping("/deleteCircle/{id}")
     public void deleteCircle(@PathVariable String id) {
         panelGroupService.deleteCircle(id);
     }
 
+    @ApiOperation("详息")
     @GetMapping("/findOne/{id}")
     public PanelGroupWithBLOBs findOne(@PathVariable String id) throws Exception {
         return panelGroupService.findOne(id);

backend/src/main/java/io/dataease/controller/panel/PanelSubjectController.java

@@ -1,8 +1,11 @@
 package io.dataease.controller.panel;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.PanelSubject;
 import io.dataease.controller.request.panel.PanelSubjectRequest;
 import io.dataease.service.panel.PanelSubjectService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -13,6 +16,8 @@ import java.util.List;
  * Date: 2021-05-06
  * Description:
  */
+@Api(tags = "仪表板：主题")
+@ApiSupport(order = 160)
 @RestController
 @RequestMapping("panel/subject")
 public class PanelSubjectController {
@@ -20,22 +25,25 @@ public class PanelSubjectController {
     @Resource
     private PanelSubjectService panelSubjectService;
 
+    @ApiOperation("查询")
     @PostMapping("/query")
     public List<PanelSubject> query(@RequestBody PanelSubjectRequest request) {
         return panelSubjectService.query(request);
     }
 
+    @ApiOperation("根据仪表板查询")
     @PostMapping("/querySubjectWithGroup")
     public List<PanelSubject> querySubjectWithGroup(@RequestBody PanelSubjectRequest request) {
         return panelSubjectService.querySubjectWithGroup(request);
     }
 
+    @ApiOperation("更新")
     @PostMapping("/update")
     public void update(@RequestBody PanelSubjectRequest request) {
         panelSubjectService.update(request);
     }
 
-
+    @ApiOperation("删除")
     @DeleteMapping("/delete/{id}")
     public void update(@PathVariable String id) {
         panelSubjectService.delete(id);

backend/src/main/java/io/dataease/controller/panel/PanelTemplateController.java

@@ -1,10 +1,13 @@
 package io.dataease.controller.panel;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.PanelTemplateWithBLOBs;
 import io.dataease.controller.handler.annotation.I18n;
 import io.dataease.controller.request.panel.PanelTemplateRequest;
 import io.dataease.dto.panel.PanelTemplateDTO;
 import io.dataease.service.panel.PanelTemplateService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -15,6 +18,8 @@ import java.util.List;
  * Date: 2021-03-05
  * Description:
  */
+@Api(tags = "仪表板：模版")
+@ApiSupport(order = 170)
 @RestController
 @RequestMapping("template")
 public class PanelTemplateController {
@@ -22,33 +27,38 @@ public class PanelTemplateController {
     @Resource
     private PanelTemplateService panelTemplateService;
 
+    @ApiOperation("查询树")
     @PostMapping("/templateList")
     @I18n
     public List<PanelTemplateDTO> templateList(@RequestBody PanelTemplateRequest request) {
         return panelTemplateService.templateList(request);
     }
 
+    @ApiOperation("保存")
     @PostMapping("/save")
     public PanelTemplateDTO save(@RequestBody PanelTemplateRequest request) {
         return panelTemplateService.save(request);
     }
 
+    @ApiOperation("删除")
     @DeleteMapping("/delete/{id}")
     public void delete(@PathVariable String id) {
         panelTemplateService.delete(id);
     }
 
+    @ApiOperation("详息")
     @GetMapping("/findOne/{id}")
     public PanelTemplateWithBLOBs findOne(@PathVariable String id) throws Exception {
         return panelTemplateService.findOne(id);
     }
 
+    @ApiOperation("查询")
     @PostMapping("/find")
     public List<PanelTemplateDTO> find(@RequestBody PanelTemplateRequest request) {
         return panelTemplateService.find(request);
     }
 
-
+    @ApiOperation("名称校验")
     @PostMapping("/nameCheck")
     public String nameCheck(@RequestBody PanelTemplateRequest request) {
         return panelTemplateService.nameCheck(request);

backend/src/main/java/io/dataease/controller/panel/api/LinkApi.java

@@ -1,6 +1,7 @@
 package io.dataease.controller.panel.api;
 
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.controller.request.chart.ChartExtRequest;
 import io.dataease.controller.request.panel.link.EnablePwdRequest;
 import io.dataease.controller.request.panel.link.LinkRequest;
@@ -14,6 +15,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Map;
 
 @Api(tags = "仪表板：链接管理")
+@ApiSupport(order = 200)
 @RequestMapping("/api/link")
 public interface LinkApi {
 

backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java

@@ -1,5 +1,6 @@
 package io.dataease.controller.panel.api;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.PanelShare;
 import io.dataease.controller.request.panel.PanelShareFineDto;
 import io.dataease.controller.request.panel.PanelShareRequest;
@@ -9,6 +10,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -16,9 +18,11 @@ import java.util.List;
  * 分享API
  */
 @Api(tags = "仪表板：分享管理")
+@ApiSupport(order = 180)
 @RequestMapping("/api/share")
 public interface ShareApi {
 
+    @ApiIgnore
     @ApiOperation("创建分享")
     @PostMapping("/")
     void share(PanelShareRequest request);

backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java

@@ -1,5 +1,6 @@
 package io.dataease.controller.panel.api;
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.dto.panel.PanelStoreDto;
 import io.swagger.annotations.Api;
@@ -16,6 +17,7 @@ import java.util.List;
  */
 
 @Api(tags = "仪表板：收藏管理")
+@ApiSupport(order = 190)
 @RequestMapping("/api/store")
 public interface StoreApi {
 

backend/src/main/java/io/dataease/controller/panel/api/ViewApi.java

@@ -1,6 +1,7 @@
 package io.dataease.controller.panel.api;
 
 
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.ChartView;
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.dto.panel.PanelViewDto;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import java.util.List;
 
 @Api(tags = "仪表板：视图管理")
+@ApiSupport(order = 210)
 @RequestMapping("/api/panelView")
 public interface ViewApi {
 

backend/src/main/java/io/dataease/controller/sys/AboutController.java

@@ -1,13 +1,15 @@
-package io.dataease.controller;
+package io.dataease.controller.sys;
 
 
 import io.dataease.commons.license.F2CLicenseResponse;
 import io.dataease.service.AboutService;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.Map;
 
+@ApiIgnore
 @RequestMapping("/about")
 @RestController
 public class AboutController {

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;
@@ -6,9 +6,11 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 
+@ApiIgnore
 @RestController
 @RequestMapping("common-files")
 public class CommonFilesController {

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;
@@ -6,10 +6,12 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.io.IOException;
 
+@ApiIgnore
 @RestController
 @RequestMapping
 public class DisplayController {

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;
@@ -10,6 +10,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -17,6 +19,7 @@ import javax.servlet.http.HttpServletResponse;
 /**
  * Created by liqiang on 2019/4/1.
  */
+@ApiIgnore
 @RestController
 public class I18nController {
 

backend/src/main/java/io/dataease/controller/sys/LicenseController.java

@@ -1,17 +1,21 @@
-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;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
 import javax.annotation.Resource;
 
+@ApiIgnore
 @RestController
 @RequestMapping(headers = "Accept=application/json")
 public class LicenseController {

backend/src/main/java/io/dataease/controller/sys/MsgController.java

@@ -1,14 +1,19 @@
-package io.dataease.controller.message;
+package io.dataease.controller.sys;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.SysMsgChannel;
 import io.dataease.base.domain.SysMsgSetting;
 import io.dataease.base.domain.SysMsgType;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.PageUtils;
 import io.dataease.commons.utils.Pager;
-import io.dataease.controller.message.dto.*;
+import io.dataease.controller.sys.request.BatchSettingRequest;
+import io.dataease.controller.sys.request.MsgRequest;
+import io.dataease.controller.sys.request.MsgSettingRequest;
+import io.dataease.controller.sys.response.MsgGridDto;
+import io.dataease.controller.sys.response.SettingTreeNode;
 import io.dataease.service.message.SysMsgService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -19,6 +24,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 @Api(tags = "系统：消息管理")
+@ApiSupport(order = 230)
 @RequestMapping("/api/sys_msg")
 @RestController
 public class MsgController {
@@ -26,7 +32,7 @@ public class MsgController {
     @Resource
     private SysMsgService sysMsgService;
 
-    @ApiOperation("查询消息")
+    @ApiOperation("分页查询")
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<MsgGridDto>> messages(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody MsgRequest msgRequest) {
         Long userId = AuthUtils.getUser().getUserId();
@@ -40,50 +46,59 @@ public class MsgController {
         return listPager;
     }
 
+    @ApiOperation("设置已读")
     @PostMapping("/setReaded/{msgId}")
     public void setReaded(@PathVariable Long msgId) {
         sysMsgService.setReaded(msgId);
     }
 
 
+    @ApiOperation("批量设置已读")
     @PostMapping("/batchRead")
     public void batchRead(@RequestBody List<Long> msgIds) {
         sysMsgService.setBatchReaded(msgIds);
     }
 
+    @ApiOperation("批量删除")
     @PostMapping("/batchDelete")
     public void batchDelete(@RequestBody List<Long> msgIds) {
         sysMsgService.batchDelete(msgIds);
     }
 
-    @PostMapping("/treeNodes")
-    public List<SettingTreeNode> treeNodes() {
-
-        return sysMsgService.treeNodes();
-    }
-
-    @PostMapping("/channelList")
-    public List<SysMsgChannel> channelList() {
-        return sysMsgService.channelList();
-    }
-
-    @PostMapping("/settingList")
-    public List<SysMsgSetting> settingList() {
-        return sysMsgService.settingList();
-    }
-
-    @PostMapping("/updateSetting")
-    public void updateSetting(@RequestBody MsgSettingRequest request) {
-        Long userId = AuthUtils.getUser().getUserId();
-        sysMsgService.updateSetting(request, userId);
-    }
-
+    @ApiOperation("查询类型")
     @PostMapping("/types")
     public List<SysMsgType> allTypes() {
         List<SysMsgType> sysMsgTypes = sysMsgService.queryMsgTypes();
         return sysMsgTypes;
     }
 
+    @ApiOperation("类型树")
+    @PostMapping("/treeNodes")
+    public List<SettingTreeNode> treeNodes() {
+
+        return sysMsgService.treeNodes();
+    }
+
+    @ApiOperation("查询渠道")
+    @PostMapping("/channelList")
+    public List<SysMsgChannel> channelList() {
+        return sysMsgService.channelList();
+    }
+
+    @ApiOperation("查询订阅")
+    @PostMapping("/settingList")
+    public List<SysMsgSetting> settingList() {
+        return sysMsgService.settingList();
+    }
+
+    @ApiOperation("更新订阅")
+    @PostMapping("/updateSetting")
+    public void updateSetting(@RequestBody MsgSettingRequest request) {
+        Long userId = AuthUtils.getUser().getUserId();
+        sysMsgService.updateSetting(request, userId);
+    }
+
+    @ApiOperation("批量更新订阅")
     @PostMapping("/batchUpdate")
     public void batchUpdate(@RequestBody BatchSettingRequest request) {
         Long userId = AuthUtils.getUser().getUserId();

backend/src/main/java/io/dataease/controller/sys/SysDeptController.java

@@ -15,9 +15,12 @@ import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
 import java.util.List;
 import java.util.stream.Collectors;
 
+@ApiIgnore
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "系统：部门管理")

backend/src/main/java/io/dataease/controller/sys/SysMenuController.java

@@ -15,11 +15,13 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-
+@ApiIgnore
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "系统：菜单管理")

backend/src/main/java/io/dataease/controller/sys/SysPluginController.java

@@ -13,11 +13,12 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 import java.util.Map;
 
-
+@ApiIgnore
 @RestController
 @Api(tags = "系统：插件管理")
 @RequestMapping("/api/plugin")

backend/src/main/java/io/dataease/controller/sys/SysRoleController.java

@@ -14,9 +14,11 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
 import javax.annotation.Resource;
 import java.util.List;
-
+@ApiIgnore
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "系统：角色管理")

backend/src/main/java/io/dataease/controller/sys/SysUserController.java

@@ -3,6 +3,7 @@ package io.dataease.controller.sys;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.auth.api.dto.CurrentUserDto;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.PageUtils;
@@ -16,12 +17,15 @@ import io.dataease.service.sys.SysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Optional;
 
 @RestController
 @Api(tags = "系统：用户管理")
+@ApiSupport(order = 220)
 @RequestMapping("/api/user")
 public class SysUserController {
 

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,13 +11,14 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-
+@ApiIgnore
 @RestController
 @RequestMapping(value = "/system")
 public class SystemParameterController {
@@ -43,10 +43,7 @@ public class SystemParameterController {
         return systemParameterService.getVersion();
     }
 
-    @GetMapping("/mail/info")
-    public MailInfo mailInfo() {
-        return systemParameterService.mailInfo(ParamConstants.Classify.MAIL.getValue());
-    }
+
 
 
     @GetMapping("/base/info")

backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java

@@ -1,18 +1,32 @@
 package io.dataease.controller.sys.base;
 
 import io.dataease.base.mapper.ext.query.GridExample;
-import lombok.Data;
 import org.apache.commons.collections.CollectionUtils;
 
 import java.io.Serializable;
 import java.util.List;
 
 
-@Data
 public class BaseGridRequest implements Serializable {
 
     private List<ConditionEntity> conditions;
 
+    public List<ConditionEntity> getConditions() {
+        return conditions;
+    }
+
+    public void setConditions(List<ConditionEntity> conditions) {
+        this.conditions = conditions;
+    }
+
+    public List<String> getOrders() {
+        return orders;
+    }
+
+    public void setOrders(List<String> orders) {
+        this.orders = orders;
+    }
+
     private List<String> orders;
 
     public GridExample convertExample(){

backend/src/main/java/io/dataease/controller/sys/request/BatchSettingRequest.java

@@ -1,4 +1,4 @@
-package io.dataease.controller.message.dto;
+package io.dataease.controller.sys.request;
 
 import lombok.Data;
 

backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java

@@ -1,4 +1,4 @@
-package io.dataease.controller.message.dto;
+package io.dataease.controller.sys.request;
 
 import lombok.Data;
 

backend/src/main/java/io/dataease/controller/sys/request/MsgSettingRequest.java

@@ -1,4 +1,4 @@
-package io.dataease.controller.message.dto;
+package io.dataease.controller.sys.request;
 
 
 import lombok.Data;

backend/src/main/java/io/dataease/controller/sys/response/MsgGridDto.java

@@ -1,4 +1,4 @@
-package io.dataease.controller.message.dto;
+package io.dataease.controller.sys.response;
 
 import io.dataease.base.domain.SysMsg;
 import lombok.Data;

backend/src/main/java/io/dataease/controller/sys/response/SettingTreeNode.java

@@ -1,4 +1,4 @@
-package io.dataease.controller.message.dto;
+package io.dataease.controller.sys.response;
 
 
 import lombok.Data;

backend/src/main/java/io/dataease/controller/sys/response/SubscribeNode.java

@@ -1,4 +1,4 @@
-package io.dataease.controller.message.dto;
+package io.dataease.controller.sys.response;
 
 
 import lombok.Data;

backend/src/main/java/io/dataease/datasource/controller/DatasourceController.java

@@ -2,6 +2,7 @@ package io.dataease.datasource.controller;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
+import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import io.dataease.base.domain.Datasource;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.PageUtils;
@@ -11,11 +12,16 @@ import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.datasource.dto.DBTableDTO;
 import io.dataease.datasource.service.DatasourceService;
 import io.dataease.dto.DatasourceDTO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.List;
 
+@Api(tags = "数据源：数据源管理")
+@ApiSupport(order = 30)
 @RequestMapping("datasource")
 @RestController
 public class DatasourceController {
@@ -23,16 +29,19 @@ public class DatasourceController {
     @Resource
     private DatasourceService datasourceService;
 
+    @ApiOperation("新增数据源")
     @PostMapping("/add")
     public Datasource addDatasource(@RequestBody Datasource datasource) {
         return datasourceService.addDatasource(datasource);
     }
 
+    @ApiOperation("验证数据源")
     @PostMapping("/validate")
     public void validate(@RequestBody Datasource datasource) throws Exception {
         datasourceService.validate(datasource);
     }
 
+    @ApiOperation("查询当前用户数据源")
     @GetMapping("/list")
     public List<DatasourceDTO> getDatasourceList() throws Exception {
         DatasourceUnionRequest request = new DatasourceUnionRequest();
@@ -40,6 +49,7 @@ public class DatasourceController {
         return datasourceService.getDatasourceList(request);
     }
 
+    @ApiIgnore
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<DatasourceDTO>> getDatasourceList(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
@@ -47,21 +57,25 @@ public class DatasourceController {
         return PageUtils.setPageInfo(page, datasourceService.gridQuery(request));
     }
 
+    @ApiOperation("删除数据源")
     @PostMapping("/delete/{datasourceID}")
     public void deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception {
         datasourceService.deleteDatasource(datasourceID);
     }
 
+    @ApiOperation("更新数据源")
     @PostMapping("/update")
     public void updateDatasource(@RequestBody Datasource Datasource) {
         datasourceService.updateDatasource(Datasource);
     }
 
+    @ApiOperation("查询数据源下属所有表")
     @PostMapping("/getTables")
     public List<DBTableDTO> getTables(@RequestBody Datasource datasource) throws Exception {
         return datasourceService.getTables(datasource);
     }
 
+    @ApiIgnore
     @PostMapping("/getSchema")
     public List<String> getSchema(@RequestBody Datasource datasource) throws Exception {
        return datasourceService.getSchema(datasource);

backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java

@@ -11,7 +11,7 @@ public class MysqlConfigration extends JdbcDTO {
 
     public String getJdbc() {
         // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
-        return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8&connectTimeout=5000&socketTimeout=5000"
+        return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8&connectTimeout=5000"
                 .replace("HOSTNAME", getHost())
                 .replace("PORT", getPort().toString())
                 .replace("DATABASE", getDataBase());

backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java

@@ -132,7 +132,7 @@ public class JdbcProvider extends DatasourceProvider {
         } catch (SQLException e) {
             DataEaseException.throwException(e);
         } catch (Exception e) {
-            DataEaseException.throwException(e);
+            DataEaseException.throwException(Translator.get("i18n_datasource_connect_error") + e.getMessage());
         } finally {
             if(connection != null){
                 connection.close();
@@ -307,7 +307,7 @@ public class JdbcProvider extends DatasourceProvider {
             resultSet.close();
             ps.close();
         } catch (Exception e) {
-            DataEaseException.throwException(e);
+            DataEaseException.throwException(Translator.get("i18n_datasource_connect_error") + e.getMessage());
         } finally {
             if(con != null){con.close();}
         }
@@ -429,7 +429,7 @@ public class JdbcProvider extends DatasourceProvider {
                 driver = oracleConfigration.getDriver();
                 jdbcurl = oracleConfigration.getJdbc();
                 props.put( "oracle.net.CONNECT_TIMEOUT" , "5000") ;
-                props.put( "oracle.jdbc.ReadTimeout" , "5000" ) ;
+//                props.put( "oracle.jdbc.ReadTimeout" , "5000" ) ;
                 break;
             default:
                 break;

backend/src/main/java/io/dataease/dto/chart/ChartViewFieldDTO.java

@@ -42,4 +42,6 @@ public class ChartViewFieldDTO implements Serializable {
     private String dateStyle;
 
     private String datePattern;
+
+    private Integer extField;
 }

backend/src/main/java/io/dataease/notice/controller/NoticeController.java

@@ -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<MessageDetail> searchMessage(@PathVariable String type) {
-        return noticeService.searchMessageByType(type);
-    }
-
-    @GetMapping("/search/message/{testId}")
-    public List<MessageDetail> searchMessageSchedule(@PathVariable String testId) {
-        return noticeService.searchMessageByTestId(testId);
-    }
-
-    @GetMapping("/delete/message/{identification}")
-    public int deleteMessage(@PathVariable String identification) {
-        return noticeService.delMessage(identification);
-    }
-}
-

backend/src/main/java/io/dataease/notice/controller/request/MessageRequest.java

@@ -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> messageDetail;
-}

backend/src/main/java/io/dataease/notice/domain/Mail.java

@@ -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;
-}

backend/src/main/java/io/dataease/notice/domain/MailInfo.java

@@ -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;
-
-}

backend/src/main/java/io/dataease/notice/domain/MessageDetail.java

@@ -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<String> 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;
-}

backend/src/main/java/io/dataease/notice/domain/MessageSettingDetail.java

@@ -1,13 +0,0 @@
-package io.dataease.notice.domain;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class MessageSettingDetail {
-    private List<MessageDetail> jenkinsTask;
-    private List<MessageDetail> testCasePlanTask;
-    private List<MessageDetail> reviewTask;
-    private List<MessageDetail> defectTask;
-}

backend/src/main/java/io/dataease/notice/domain/UserDetail.java

@@ -1,9 +0,0 @@
-package io.dataease.notice.domain;
-
-import lombok.Data;
-
-@Data
-public class UserDetail {
-    private  String  email;
-    private  String  phone;
-}

backend/src/main/java/io/dataease/notice/message/LinkMessage.java

@@ -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<String, Object> items = new HashMap<String, Object>();
-        items.put("msgtype", "link");
-
-        Map<String, String> linkContent = new HashMap<String, String>();
-        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);
-    }
-}