diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpHistoryAddRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpHistoryAddRequestConvert.java index 1053b7a..93e5596 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpHistoryAddRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpHistoryAddRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpHistoryUpdateRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpHistoryUpdateRequestConvert.java index 7d32168..dc464b0 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpHistoryUpdateRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpHistoryUpdateRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpProjectAddRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpProjectAddRequestConvert.java index d7e5184..82bd0f1 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpProjectAddRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpProjectAddRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpProjectUpdateRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpProjectUpdateRequestConvert.java index 3cb900b..c3e8194 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpProjectUpdateRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpProjectUpdateRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpSqlAddRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpSqlAddRequestConvert.java index 194a5f7..7b67c62 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpSqlAddRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpSqlAddRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpSqlUpdateRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpSqlUpdateRequestConvert.java index f5dfc5c..0ed3a7b 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpSqlUpdateRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpSqlUpdateRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpTemplateAddRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpTemplateAddRequestConvert.java index f2718c7..e925a57 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpTemplateAddRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpTemplateAddRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpTemplateUpdateRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpTemplateUpdateRequestConvert.java index d548b48..7276a81 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpTemplateUpdateRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpTemplateUpdateRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceAddRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceAddRequestConvert.java index cf11832..2ead28e 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceAddRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceAddRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceConfigAddRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceConfigAddRequestConvert.java index b12f787..7b5a313 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceConfigAddRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceConfigAddRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceConfigUpdateRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceConfigUpdateRequestConvert.java index 051547e..3230bfd 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceConfigUpdateRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceConfigUpdateRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceGetDbConfigRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceGetDbConfigRequestConvert.java index 6ba6dae..cd03311 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceGetDbConfigRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceGetDbConfigRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceGetTableListRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceGetTableListRequestConvert.java index 2a4bf7c..d853faf 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceGetTableListRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceGetTableListRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceUpdateRequestConvert.java b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceUpdateRequestConvert.java index a77d831..1aa8a78 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceUpdateRequestConvert.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/convert/SdpWorkspaceUpdateRequestConvert.java @@ -2,6 +2,7 @@ import cn.mysdp.biz.domain.*; import cn.mysdp.biz.dto.request.*; +import java.util.Date; import org.springframework.beans.BeanUtils; /** diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistory.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistory.java index 2afc390..6e936e2 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistory.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistory.java @@ -18,7 +18,7 @@ @Getter @Setter public class SdpHistory implements Serializable { - private static final long serialVersionUID = 2052953730277749L; + private static final long serialVersionUID = 9000174730277749L; private Integer id; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistoryExample.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistoryExample.java index 1d77c3c..28bb4db 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistoryExample.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistoryExample.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import java.util.Date; import java.util.ArrayList; +import java.util.Date; import java.util.List; import lombok.Getter; import lombok.Setter; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistoryWithBLOBs.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistoryWithBLOBs.java index 1b86571..efaa582 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistoryWithBLOBs.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpHistoryWithBLOBs.java @@ -17,7 +17,7 @@ @Getter @Setter public class SdpHistoryWithBLOBs extends SdpHistory implements Serializable { - private static final long serialVersionUID = 20529531582510971L; + private static final long serialVersionUID = 90001741582510971L; private String content; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProject.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProject.java index b78b921..7142012 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProject.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProject.java @@ -17,7 +17,7 @@ @Getter @Setter public class SdpProject implements Serializable { - private static final long serialVersionUID = 2052953505967110L; + private static final long serialVersionUID = 9000174505967110L; private Integer id; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProjectExample.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProjectExample.java index bea8c27..b8123a2 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProjectExample.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProjectExample.java @@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import java.util.ArrayList; +import java.util.Date; import java.util.List; import lombok.Getter; import lombok.Setter; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProjectWithBLOBs.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProjectWithBLOBs.java index 4d1ba12..e909911 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProjectWithBLOBs.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpProjectWithBLOBs.java @@ -17,7 +17,7 @@ @Getter @Setter public class SdpProjectWithBLOBs extends SdpProject implements Serializable { - private static final long serialVersionUID = 2052953281193834L; + private static final long serialVersionUID = 9000174281193834L; private String tables; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSql.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSql.java index 20fd35a..4e4b8ca 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSql.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSql.java @@ -17,7 +17,7 @@ @Getter @Setter public class SdpSql implements Serializable { - private static final long serialVersionUID = 20529531822975697L; + private static final long serialVersionUID = 90001741822975697L; private Integer id; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSqlExample.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSqlExample.java index fd0e636..f26a881 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSqlExample.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSqlExample.java @@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import java.util.ArrayList; +import java.util.Date; import java.util.List; import lombok.Getter; import lombok.Setter; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSqlWithBLOBs.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSqlWithBLOBs.java index eaaab13..cf7a4e3 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSqlWithBLOBs.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpSqlWithBLOBs.java @@ -17,7 +17,7 @@ @Getter @Setter public class SdpSqlWithBLOBs extends SdpSql implements Serializable { - private static final long serialVersionUID = 20529531462889727L; + private static final long serialVersionUID = 90001741462889727L; private String parameterSql; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplate.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplate.java index b29c31c..ae7ce2e 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplate.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplate.java @@ -17,7 +17,7 @@ @Getter @Setter public class SdpTemplate implements Serializable { - private static final long serialVersionUID = 20529531172039097L; + private static final long serialVersionUID = 90001741172039097L; private Integer id; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplateExample.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplateExample.java index 800da5b..f555929 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplateExample.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplateExample.java @@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import java.util.ArrayList; +import java.util.Date; import java.util.List; import lombok.Getter; import lombok.Setter; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplateWithBLOBs.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplateWithBLOBs.java index f16a6f2..7349669 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplateWithBLOBs.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpTemplateWithBLOBs.java @@ -17,7 +17,7 @@ @Getter @Setter public class SdpTemplateWithBLOBs extends SdpTemplate implements Serializable { - private static final long serialVersionUID = 2052953133579191L; + private static final long serialVersionUID = 9000174133579191L; private String fileTemplate; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspace.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspace.java index 41f0885..6286b9c 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspace.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspace.java @@ -17,7 +17,7 @@ @Getter @Setter public class SdpWorkspace implements Serializable { - private static final long serialVersionUID = 20529531100610358L; + private static final long serialVersionUID = 90001741100610358L; private Integer id; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfig.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfig.java index 7589463..394099e 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfig.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfig.java @@ -17,7 +17,7 @@ @Getter @Setter public class SdpWorkspaceConfig implements Serializable { - private static final long serialVersionUID = 20529531210493464L; + private static final long serialVersionUID = 90001741210493464L; private Integer id; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfigExample.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfigExample.java index 690aeca..d229475 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfigExample.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfigExample.java @@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import java.util.ArrayList; +import java.util.Date; import java.util.List; import lombok.Getter; import lombok.Setter; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfigWithBLOBs.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfigWithBLOBs.java index 8ff8135..246c2c4 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfigWithBLOBs.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceConfigWithBLOBs.java @@ -17,6 +17,6 @@ @Getter @Setter public class SdpWorkspaceConfigWithBLOBs extends SdpWorkspaceConfig implements Serializable { - private static final long serialVersionUID = 2052953624363464L; + private static final long serialVersionUID = 9000174624363464L; } diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExample.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExample.java index 3af1108..13f575a 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExample.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExample.java @@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import java.util.ArrayList; +import java.util.Date; import java.util.List; import lombok.Getter; import lombok.Setter; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExampleForGetDbConfig.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExampleForGetDbConfig.java index 0ae080d..91f606d 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExampleForGetDbConfig.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExampleForGetDbConfig.java @@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import java.util.ArrayList; +import java.util.Date; import java.util.List; import lombok.Getter; import lombok.Setter; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExampleForGetTableList.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExampleForGetTableList.java index fe65a2e..c418dd4 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExampleForGetTableList.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceExampleForGetTableList.java @@ -3,6 +3,7 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import java.util.ArrayList; +import java.util.Date; import java.util.List; import lombok.Getter; import lombok.Setter; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceForGetDbConfig.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceForGetDbConfig.java index f0b31a7..6991710 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceForGetDbConfig.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceForGetDbConfig.java @@ -17,7 +17,7 @@ @Getter @Setter public class SdpWorkspaceForGetDbConfig implements Serializable { - private static final long serialVersionUID = 2052953572504285L; + private static final long serialVersionUID = 9000174572504285L; private String host; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceForGetTableList.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceForGetTableList.java index 4748854..df0cff7 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceForGetTableList.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceForGetTableList.java @@ -17,7 +17,7 @@ @Getter @Setter public class SdpWorkspaceForGetTableList implements Serializable { - private static final long serialVersionUID = 2052953482762793L; + private static final long serialVersionUID = 9000174482762793L; private String workspaceName; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceWithBLOBs.java b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceWithBLOBs.java index 5ad902f..4604af9 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceWithBLOBs.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/domain/SdpWorkspaceWithBLOBs.java @@ -17,6 +17,6 @@ @Getter @Setter public class SdpWorkspaceWithBLOBs extends SdpWorkspace implements Serializable { - private static final long serialVersionUID = 20529531340340006L; + private static final long serialVersionUID = 90001741340340006L; } diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryAddRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryAddRequest.java index bfaa252..accddb4 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryAddRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryAddRequest.java @@ -1,8 +1,14 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + +import java.util.Date; + import lombok.Getter; import lombok.Setter; @@ -19,7 +25,7 @@ @Getter @Setter public class SdpHistoryAddRequest extends BaseRequest { - private static final long serialVersionUID = 87161731134149629L; + private static final long serialVersionUID = 214742701134149629L; @JsonProperty("workspace_name") @JSONField(name = "workspace_name") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryBatchUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryBatchUpdateRequest.java index a594af0..88d4e13 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryBatchUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryBatchUpdateRequest.java @@ -1,9 +1,14 @@ package cn.mysdp.biz.dto.request; +import cn.mysdp.biz.dto.request.BaseRequest; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; + +import java.util.Date; import lombok.Getter; import lombok.Setter; @@ -21,7 +26,7 @@ @Getter @Setter public class SdpHistoryBatchUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 8716173111950655L; + private static final long serialVersionUID = 21474270111950655L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryDeleteRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryDeleteRequest.java index bfde4c0..5e9ff2f 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryDeleteRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryDeleteRequest.java @@ -1,9 +1,13 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; + +import java.util.Date; import lombok.Getter; import lombok.Setter; @@ -21,7 +25,7 @@ @Getter @Setter public class SdpHistoryDeleteRequest extends BaseRequest { - private static final long serialVersionUID = 87161731889987823L; + private static final long serialVersionUID = 214742701889987823L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryQueryRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryQueryRequest.java index e4d1e86..8770771 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryQueryRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryQueryRequest.java @@ -4,6 +4,9 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import java.util.Date; import lombok.Getter; @@ -22,7 +25,7 @@ @Getter @Setter public class SdpHistoryQueryRequest extends BaseRequest { - private static final long serialVersionUID = 87161731307937604L; + private static final long serialVersionUID = 214742701307937604L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryUpdateRequest.java index f4101f2..2f1e2ec 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpHistoryUpdateRequest.java @@ -1,8 +1,14 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + +import java.util.Date; + import lombok.Getter; import lombok.Setter; @@ -19,7 +25,7 @@ @Getter @Setter public class SdpHistoryUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 8716173598809617L; + private static final long serialVersionUID = 21474270598809617L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectAddRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectAddRequest.java index 4b9c768..f40ed30 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectAddRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectAddRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpProjectAddRequest extends BaseRequest { - private static final long serialVersionUID = 87161731220543560L; + private static final long serialVersionUID = 214742701220543560L; @JsonProperty("workspace_name") @JSONField(name = "workspace_name") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectBatchUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectBatchUpdateRequest.java index f386d77..d67fc3c 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectBatchUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectBatchUpdateRequest.java @@ -1,9 +1,12 @@ package cn.mysdp.biz.dto.request; +import cn.mysdp.biz.dto.request.BaseRequest; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +25,7 @@ @Getter @Setter public class SdpProjectBatchUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 87161732015065094L; + private static final long serialVersionUID = 214742702015065094L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectDeleteRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectDeleteRequest.java index 45d061a..d4ee3e3 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectDeleteRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectDeleteRequest.java @@ -1,9 +1,11 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +24,7 @@ @Getter @Setter public class SdpProjectDeleteRequest extends BaseRequest { - private static final long serialVersionUID = 8716173853935754L; + private static final long serialVersionUID = 21474270853935754L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectQueryRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectQueryRequest.java index 3ca0641..13c0702 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectQueryRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectQueryRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpProjectQueryRequest extends BaseRequest { - private static final long serialVersionUID = 87161731895547967L; + private static final long serialVersionUID = 214742701895547967L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectUpdateRequest.java index 5f9445e..595fa3c 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpProjectUpdateRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpProjectUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 8716173437242452L; + private static final long serialVersionUID = 21474270437242452L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlAddRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlAddRequest.java index b3b1536..d5e28ea 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlAddRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlAddRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpSqlAddRequest extends BaseRequest { - private static final long serialVersionUID = 87161731052290755L; + private static final long serialVersionUID = 214742701052290755L; @JsonProperty("is_disable") @JSONField(name = "is_disable") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlBatchUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlBatchUpdateRequest.java index 250ec52..7df6fbb 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlBatchUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlBatchUpdateRequest.java @@ -1,9 +1,12 @@ package cn.mysdp.biz.dto.request; +import cn.mysdp.biz.dto.request.BaseRequest; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +25,7 @@ @Getter @Setter public class SdpSqlBatchUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 87161731340802053L; + private static final long serialVersionUID = 214742701340802053L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlDeleteRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlDeleteRequest.java index 4f3f288..a612a0f 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlDeleteRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlDeleteRequest.java @@ -1,9 +1,11 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +24,7 @@ @Getter @Setter public class SdpSqlDeleteRequest extends BaseRequest { - private static final long serialVersionUID = 87161731006279029L; + private static final long serialVersionUID = 214742701006279029L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlQueryRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlQueryRequest.java index c29a44a..c62aca8 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlQueryRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlQueryRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpSqlQueryRequest extends BaseRequest { - private static final long serialVersionUID = 871617349028982L; + private static final long serialVersionUID = 2147427049028982L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlUpdateRequest.java index b7471d3..f733cf5 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpSqlUpdateRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpSqlUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 8716173284899177L; + private static final long serialVersionUID = 21474270284899177L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateAddRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateAddRequest.java index 2c1f5ae..fe09c37 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateAddRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateAddRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpTemplateAddRequest extends BaseRequest { - private static final long serialVersionUID = 87161731193605447L; + private static final long serialVersionUID = 214742701193605447L; @JsonProperty("workspace_name") @JSONField(name = "workspace_name") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateBatchUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateBatchUpdateRequest.java index 95f0113..5dae56b 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateBatchUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateBatchUpdateRequest.java @@ -1,9 +1,12 @@ package cn.mysdp.biz.dto.request; +import cn.mysdp.biz.dto.request.BaseRequest; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +25,7 @@ @Getter @Setter public class SdpTemplateBatchUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 87161731133053435L; + private static final long serialVersionUID = 214742701133053435L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateDeleteRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateDeleteRequest.java index 1e91798..1478c61 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateDeleteRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateDeleteRequest.java @@ -1,9 +1,11 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +24,7 @@ @Getter @Setter public class SdpTemplateDeleteRequest extends BaseRequest { - private static final long serialVersionUID = 87161731499495723L; + private static final long serialVersionUID = 214742701499495723L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateQueryRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateQueryRequest.java index 9c7f1da..3fe334d 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateQueryRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateQueryRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpTemplateQueryRequest extends BaseRequest { - private static final long serialVersionUID = 87161732013270784L; + private static final long serialVersionUID = 214742702013270784L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateUpdateRequest.java index 99a7e2d..ec2232d 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpTemplateUpdateRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpTemplateUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 8716173208317517L; + private static final long serialVersionUID = 21474270208317517L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceAddRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceAddRequest.java index d173b02..de8995b 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceAddRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceAddRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpWorkspaceAddRequest extends BaseRequest { - private static final long serialVersionUID = 87161731548216700L; + private static final long serialVersionUID = 214742701548216700L; @JsonProperty("name") @JSONField(name = "name") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceBatchUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceBatchUpdateRequest.java index 6094895..6c5507b 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceBatchUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceBatchUpdateRequest.java @@ -1,9 +1,12 @@ package cn.mysdp.biz.dto.request; +import cn.mysdp.biz.dto.request.BaseRequest; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +25,7 @@ @Getter @Setter public class SdpWorkspaceBatchUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 8716173353662398L; + private static final long serialVersionUID = 21474270353662398L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigAddRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigAddRequest.java index 924a1ab..5fd2517 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigAddRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigAddRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpWorkspaceConfigAddRequest extends BaseRequest { - private static final long serialVersionUID = 8716173827780378L; + private static final long serialVersionUID = 21474270827780378L; @JsonProperty("workspace_name") @JSONField(name = "workspace_name") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigBatchUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigBatchUpdateRequest.java index 03ac426..7704778 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigBatchUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigBatchUpdateRequest.java @@ -1,9 +1,12 @@ package cn.mysdp.biz.dto.request; +import cn.mysdp.biz.dto.request.BaseRequest; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +25,7 @@ @Getter @Setter public class SdpWorkspaceConfigBatchUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 87161731163068580L; + private static final long serialVersionUID = 214742701163068580L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigDeleteRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigDeleteRequest.java index b19fd45..e20343a 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigDeleteRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigDeleteRequest.java @@ -1,9 +1,11 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +24,7 @@ @Getter @Setter public class SdpWorkspaceConfigDeleteRequest extends BaseRequest { - private static final long serialVersionUID = 87161732130840364L; + private static final long serialVersionUID = 214742702130840364L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigQueryRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigQueryRequest.java index d96df03..240583f 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigQueryRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigQueryRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpWorkspaceConfigQueryRequest extends BaseRequest { - private static final long serialVersionUID = 87161731055136479L; + private static final long serialVersionUID = 214742701055136479L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigUpdateRequest.java index b90dfd7..f722d8c 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceConfigUpdateRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpWorkspaceConfigUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 8716173839662158L; + private static final long serialVersionUID = 21474270839662158L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceDeleteRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceDeleteRequest.java index b0d0170..e25fee4 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceDeleteRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceDeleteRequest.java @@ -1,9 +1,11 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +24,7 @@ @Getter @Setter public class SdpWorkspaceDeleteRequest extends BaseRequest { - private static final long serialVersionUID = 87161731563949774L; + private static final long serialVersionUID = 214742701563949774L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceGetDbConfigRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceGetDbConfigRequest.java index db0d844..d6af8c4 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceGetDbConfigRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceGetDbConfigRequest.java @@ -1,9 +1,11 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +24,7 @@ @Getter @Setter public class SdpWorkspaceGetDbConfigRequest extends BaseRequest { - private static final long serialVersionUID = 8716173300908719L; + private static final long serialVersionUID = 21474270300908719L; public SdpWorkspaceGetDbConfigRequest() { } diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceGetTableListRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceGetTableListRequest.java index cd74544..3e04b9a 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceGetTableListRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceGetTableListRequest.java @@ -1,9 +1,11 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +24,7 @@ @Getter @Setter public class SdpWorkspaceGetTableListRequest extends BaseRequest { - private static final long serialVersionUID = 8716173763906109L; + private static final long serialVersionUID = 21474270763906109L; public SdpWorkspaceGetTableListRequest() { } diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceQueryRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceQueryRequest.java index aebfb77..3002a3c 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceQueryRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceQueryRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpWorkspaceQueryRequest extends BaseRequest { - private static final long serialVersionUID = 8716173205565693L; + private static final long serialVersionUID = 21474270205565693L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceUpdateRequest.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceUpdateRequest.java index 94dd11b..fca14cd 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceUpdateRequest.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/request/SdpWorkspaceUpdateRequest.java @@ -1,8 +1,12 @@ package cn.mysdp.biz.dto.request; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; + import lombok.Getter; import lombok.Setter; @@ -20,7 +24,7 @@ @Getter @Setter public class SdpWorkspaceUpdateRequest extends BaseRequest { - private static final long serialVersionUID = 8716173272771568L; + private static final long serialVersionUID = 21474270272771568L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpHistoryQueryResponse.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpHistoryQueryResponse.java index 0f7688b..4371474 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpHistoryQueryResponse.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpHistoryQueryResponse.java @@ -1,9 +1,12 @@ package cn.mysdp.biz.dto.response; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import java.util.List; +import java.util.Map; import java.util.Date; @@ -23,7 +26,7 @@ @Getter @Setter public class SdpHistoryQueryResponse implements Serializable { - private static final long serialVersionUID = 130326931838426188L; + private static final long serialVersionUID = 209630341838426188L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpProjectQueryResponse.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpProjectQueryResponse.java index 8410ed3..7a0a5ab 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpProjectQueryResponse.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpProjectQueryResponse.java @@ -1,9 +1,11 @@ package cn.mysdp.biz.dto.response; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import java.util.List; import java.util.Map; @@ -23,7 +25,7 @@ @Getter @Setter public class SdpProjectQueryResponse implements Serializable { - private static final long serialVersionUID = 130326931420489039L; + private static final long serialVersionUID = 209630341420489039L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpSqlQueryResponse.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpSqlQueryResponse.java index 1c3d1b9..b1bd815 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpSqlQueryResponse.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpSqlQueryResponse.java @@ -1,9 +1,12 @@ package cn.mysdp.biz.dto.response; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +25,7 @@ @Getter @Setter public class SdpSqlQueryResponse implements Serializable { - private static final long serialVersionUID = 130326931572832314L; + private static final long serialVersionUID = 209630341572832314L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpTemplateQueryResponse.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpTemplateQueryResponse.java index 19db76a..7ed8088 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpTemplateQueryResponse.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpTemplateQueryResponse.java @@ -1,9 +1,11 @@ package cn.mysdp.biz.dto.response; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import java.util.List; import java.util.Map; @@ -23,7 +25,7 @@ @Getter @Setter public class SdpTemplateQueryResponse implements Serializable { - private static final long serialVersionUID = 130326932066049008L; + private static final long serialVersionUID = 209630342066049008L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceConfigQueryResponse.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceConfigQueryResponse.java index 04937fa..f6101cb 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceConfigQueryResponse.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceConfigQueryResponse.java @@ -1,9 +1,12 @@ package cn.mysdp.biz.dto.response; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +25,7 @@ @Getter @Setter public class SdpWorkspaceConfigQueryResponse implements Serializable { - private static final long serialVersionUID = 130326931597573647L; + private static final long serialVersionUID = 209630341597573647L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceGetDbConfigResponse.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceGetDbConfigResponse.java index 9742a82..4698b68 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceGetDbConfigResponse.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceGetDbConfigResponse.java @@ -1,9 +1,12 @@ package cn.mysdp.biz.dto.response; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +25,7 @@ @Getter @Setter public class SdpWorkspaceGetDbConfigResponse implements Serializable { - private static final long serialVersionUID = 13032693791169569L; + private static final long serialVersionUID = 20963034791169569L; @JsonProperty("host") @JSONField(name = "host") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceGetTableListResponse.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceGetTableListResponse.java index c9565de..e0adbc1 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceGetTableListResponse.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceGetTableListResponse.java @@ -1,9 +1,12 @@ package cn.mysdp.biz.dto.response; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +25,7 @@ @Getter @Setter public class SdpWorkspaceGetTableListResponse implements Serializable { - private static final long serialVersionUID = 130326932141648269L; + private static final long serialVersionUID = 209630342141648269L; @JsonProperty("workspace_name") @JSONField(name = "workspace_name") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceQueryResponse.java b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceQueryResponse.java index 23429ea..d50fd0c 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceQueryResponse.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/dto/response/SdpWorkspaceQueryResponse.java @@ -1,9 +1,12 @@ package cn.mysdp.biz.dto.response; import com.alibaba.fastjson.annotation.JSONField; +import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import java.io.Serializable; +import java.util.List; +import java.util.Map; import lombok.Getter; @@ -22,7 +25,7 @@ @Getter @Setter public class SdpWorkspaceQueryResponse implements Serializable { - private static final long serialVersionUID = 130326932130503059L; + private static final long serialVersionUID = 209630342130503059L; @JsonProperty("id") @JSONField(name = "id") diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/ProcessSQLFacadeImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/ProcessSQLFacadeImpl.java index 210725b..284a6e5 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/ProcessSQLFacadeImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/ProcessSQLFacadeImpl.java @@ -238,22 +238,6 @@ private void pringNotFoundInfo(Set infoSet, String msg) { } } - private SdpWorkspaceWithBLOBs getH2Workspace() throws Exception { - SdpWorkspaceWithBLOBs h2Workspace = null; - { - Connection connection = dataSource.getConnection(); - if (connection != null) { - String url = connection.getMetaData().getURL(); - if (url.indexOf("jdbc:h2:") == 0) { - h2Workspace = new SdpWorkspaceWithBLOBs(); - h2Workspace.setDbUsername(connection.getMetaData().getUserName()); - h2Workspace.setDbDatabase(url.split(";")[0].substring("jdbc:h2:".length())); - } - } - } - return h2Workspace; - } - @Override public Integer execute(BaseNameRequest request, Object _processInstance, Method _processBodyToken, Method _processToken) throws Exception { FileUtil.clear(); @@ -285,16 +269,6 @@ public Integer execute(BaseNameRequest request, Object _processInstance, Method SdpWorkspaceQueryResponse newItem = new SdpWorkspaceQueryResponse(); BeanUtils.copyProperties(item, newItem); sdpWorkspaceMap.put(item.getName(), newItem); - - if ("org.h2.Driver".equals(item.getDbClassname()) && getH2Workspace() != null) { - if (StringUtils.isEmpty(item.getDbDatabase())) { - item.setDbDatabase(getH2Workspace().getDbDatabase()); - if (StringUtils.isEmpty(item.getDbUsername())) { - item.setDbUsername(getH2Workspace().getDbUsername()); - } - } - } - } } @@ -446,13 +420,18 @@ public Integer execute(BaseNameRequest request, Object _processInstance, Method javaTypeResolverMap.put(workspaceName, javaTypeResolver); - ConnectionFactory connectionFactory; - connectionFactory = new JDBCConnectionFactory(jdbcConnectionConfiguration); - Connection connection = null; try { - connection = connectionFactory.getConnection(); + if ("org.h2.Driver".equals(workspace.getDbClassname()) && StringUtils.isEmpty(workspace.getDbDatabase())) { + connection = dataSource.getConnection(); + context.setConnection(connection); + } else { + ConnectionFactory connectionFactory; + connectionFactory = new JDBCConnectionFactory(jdbcConnectionConfiguration); + + connection = connectionFactory.getConnection(); + } }catch(Exception ex) { ex.printStackTrace(); if (ex instanceof SQLNonTransientConnectionException) { diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpHistoryFacadeBaseImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpHistoryFacadeBaseImpl.java index 3798898..8110071 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpHistoryFacadeBaseImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpHistoryFacadeBaseImpl.java @@ -8,6 +8,7 @@ import cn.mysdp.biz.repository.*; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpHistoryFacadeImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpHistoryFacadeImpl.java index b9064e8..09faecd 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpHistoryFacadeImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpHistoryFacadeImpl.java @@ -1,12 +1,16 @@ package cn.mysdp.biz.facade; +import java.util.ArrayList; import java.util.List; +import java.util.Set; import cn.mysdp.biz.dto.request.*; import cn.mysdp.biz.dto.response.*; +import cn.mysdp.biz.domain.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; /** * @ClassName: SdpHistoryFacadeImpl diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpProjectFacadeBaseImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpProjectFacadeBaseImpl.java index 3d4b36c..06fd941 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpProjectFacadeBaseImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpProjectFacadeBaseImpl.java @@ -8,6 +8,7 @@ import cn.mysdp.biz.repository.*; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -33,7 +34,7 @@ public class SdpProjectFacadeBaseImpl extends BaseFacadeImpl implements SdpProje public static Map initUniqueFieldMap() { HashMap map = new HashMap<>(); - map.put("unique_project_index_2", "workspace_name-name"); + map.put("unique_project_index_a", "workspace_name-name"); return map; } diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpProjectFacadeImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpProjectFacadeImpl.java index 472e233..defce0b 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpProjectFacadeImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpProjectFacadeImpl.java @@ -1,12 +1,16 @@ package cn.mysdp.biz.facade; +import java.util.ArrayList; import java.util.List; +import java.util.Set; import cn.mysdp.biz.dto.request.*; import cn.mysdp.biz.dto.response.*; +import cn.mysdp.biz.domain.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; /** * @ClassName: SdpProjectFacadeImpl diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpSqlFacadeBaseImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpSqlFacadeBaseImpl.java index acb249e..434d57e 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpSqlFacadeBaseImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpSqlFacadeBaseImpl.java @@ -8,6 +8,7 @@ import cn.mysdp.biz.repository.*; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -33,7 +34,7 @@ public class SdpSqlFacadeBaseImpl extends BaseFacadeImpl implements SdpSqlFacade public static Map initUniqueFieldMap() { HashMap map = new HashMap<>(); - map.put("unique_sql_index_9", "workspace_name-table_name-parameter_catalog-parameter_catalog_type-name"); + map.put("unique_sql_index_7", "workspace_name-table_name-parameter_catalog-parameter_catalog_type-name"); return map; } diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpSqlFacadeImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpSqlFacadeImpl.java index abd4f93..f6bb322 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpSqlFacadeImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpSqlFacadeImpl.java @@ -1,12 +1,16 @@ package cn.mysdp.biz.facade; +import java.util.ArrayList; import java.util.List; +import java.util.Set; import cn.mysdp.biz.dto.request.*; import cn.mysdp.biz.dto.response.*; +import cn.mysdp.biz.domain.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; /** * @ClassName: SdpSqlFacadeImpl diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpTemplateFacadeBaseImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpTemplateFacadeBaseImpl.java index c800e91..a90ab4d 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpTemplateFacadeBaseImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpTemplateFacadeBaseImpl.java @@ -8,6 +8,7 @@ import cn.mysdp.biz.repository.*; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -33,7 +34,7 @@ public class SdpTemplateFacadeBaseImpl extends BaseFacadeImpl implements SdpTemp public static Map initUniqueFieldMap() { HashMap map = new HashMap<>(); - map.put("unique_template_index_4", "workspace_name-project_name-name-file_type-project-package_name"); + map.put("unique_template_index_3", "workspace_name-project_name-name-file_type-project-package_name"); return map; } diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpTemplateFacadeImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpTemplateFacadeImpl.java index 5d7b763..715c433 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpTemplateFacadeImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpTemplateFacadeImpl.java @@ -1,12 +1,16 @@ package cn.mysdp.biz.facade; +import java.util.ArrayList; import java.util.List; +import java.util.Set; import cn.mysdp.biz.dto.request.*; import cn.mysdp.biz.dto.response.*; +import cn.mysdp.biz.domain.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; /** * @ClassName: SdpTemplateFacadeImpl diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceConfigFacadeBaseImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceConfigFacadeBaseImpl.java index dcdec88..a08d877 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceConfigFacadeBaseImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceConfigFacadeBaseImpl.java @@ -8,6 +8,7 @@ import cn.mysdp.biz.repository.*; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -33,7 +34,7 @@ public class SdpWorkspaceConfigFacadeBaseImpl extends BaseFacadeImpl implements public static Map initUniqueFieldMap() { HashMap map = new HashMap<>(); - map.put("unique_workspace_config_index_a", "workspace_name-name"); + map.put("unique_workspace_config_index_3", "workspace_name-name"); return map; } diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceConfigFacadeImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceConfigFacadeImpl.java index 87f5191..34ab116 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceConfigFacadeImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceConfigFacadeImpl.java @@ -1,12 +1,16 @@ package cn.mysdp.biz.facade; +import java.util.ArrayList; import java.util.List; +import java.util.Set; import cn.mysdp.biz.dto.request.*; import cn.mysdp.biz.dto.response.*; +import cn.mysdp.biz.domain.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; /** * @ClassName: SdpWorkspaceConfigFacadeImpl diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceFacadeBaseImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceFacadeBaseImpl.java index bdfb36e..7eadfc0 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceFacadeBaseImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceFacadeBaseImpl.java @@ -8,6 +8,7 @@ import cn.mysdp.biz.repository.*; import java.util.ArrayList; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -33,7 +34,7 @@ public class SdpWorkspaceFacadeBaseImpl extends BaseFacadeImpl implements SdpWor public static Map initUniqueFieldMap() { HashMap map = new HashMap<>(); - map.put("unique_workspace_index_7", "name"); + map.put("unique_workspace_index_3", "name"); return map; } diff --git a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceFacadeImpl.java b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceFacadeImpl.java index 58195f8..c3d608c 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceFacadeImpl.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/facade/SdpWorkspaceFacadeImpl.java @@ -1,12 +1,16 @@ package cn.mysdp.biz.facade; +import java.util.ArrayList; import java.util.List; +import java.util.Set; import cn.mysdp.biz.dto.request.*; import cn.mysdp.biz.dto.response.*; +import cn.mysdp.biz.domain.*; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; /** * @ClassName: SdpWorkspaceFacadeImpl diff --git a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpHistoryMapper.java b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpHistoryMapper.java index a058aa2..aeb84f2 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpHistoryMapper.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpHistoryMapper.java @@ -1,7 +1,7 @@ package cn.mysdp.biz.repository; import cn.mysdp.biz.domain.*; - +import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpProjectMapper.java b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpProjectMapper.java index 746b0ed..a2b3daf 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpProjectMapper.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpProjectMapper.java @@ -1,7 +1,7 @@ package cn.mysdp.biz.repository; import cn.mysdp.biz.domain.*; - +import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpSqlMapper.java b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpSqlMapper.java index fb5dea0..1458a92 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpSqlMapper.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpSqlMapper.java @@ -1,7 +1,7 @@ package cn.mysdp.biz.repository; import cn.mysdp.biz.domain.*; - +import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpTemplateMapper.java b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpTemplateMapper.java index 1c5f15b..2a2b1a4 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpTemplateMapper.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpTemplateMapper.java @@ -1,7 +1,7 @@ package cn.mysdp.biz.repository; import cn.mysdp.biz.domain.*; - +import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpWorkspaceConfigMapper.java b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpWorkspaceConfigMapper.java index d163b43..3493495 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpWorkspaceConfigMapper.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpWorkspaceConfigMapper.java @@ -1,7 +1,7 @@ package cn.mysdp.biz.repository; import cn.mysdp.biz.domain.*; - +import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpWorkspaceMapper.java b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpWorkspaceMapper.java index 66e0a28..579d73a 100644 --- a/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpWorkspaceMapper.java +++ b/server/sdp/src/main/java/cn/mysdp/biz/repository/SdpWorkspaceMapper.java @@ -1,7 +1,7 @@ package cn.mysdp.biz.repository; import cn.mysdp.biz.domain.*; - +import java.util.Date; import java.util.List; import org.apache.ibatis.annotations.Param; diff --git a/server/sdp/src/main/java/org/mybatis/generator/config/Context.java b/server/sdp/src/main/java/org/mybatis/generator/config/Context.java index 52c42b5..e6bf02f 100644 --- a/server/sdp/src/main/java/org/mybatis/generator/config/Context.java +++ b/server/sdp/src/main/java/org/mybatis/generator/config/Context.java @@ -33,6 +33,8 @@ public class Context extends PropertyHolder { private String id; + private Connection connection; + private JDBCConnectionConfiguration jdbcConnectionConfiguration; private ConnectionFactoryConfiguration connectionFactoryConfiguration; @@ -311,7 +313,15 @@ public int getGenerationSteps() { return steps; } + public void setConnection(Connection connection) { + this.connection = connection; + } + private Connection getConnection() throws SQLException { + if (connection != null) { + return this.connection; + } + ConnectionFactory connectionFactory; if (jdbcConnectionConfiguration != null) { connectionFactory = new JDBCConnectionFactory(jdbcConnectionConfiguration); @@ -323,6 +333,9 @@ private Connection getConnection() throws SQLException { } private void closeConnection(Connection connection) { + if (this.connection != null) { + return; + } if (connection != null) { try { connection.close();