diff --git a/core/src/main/java/com/databasir/core/domain/database/converter/DatabaseTypePojoConverter.java b/core/src/main/java/com/databasir/core/domain/database/converter/DatabaseTypePojoConverter.java index 6e94b64..4a51244 100644 --- a/core/src/main/java/com/databasir/core/domain/database/converter/DatabaseTypePojoConverter.java +++ b/core/src/main/java/com/databasir/core/domain/database/converter/DatabaseTypePojoConverter.java @@ -6,10 +6,14 @@ import com.databasir.core.domain.database.data.DatabaseTypePageResponse; import com.databasir.core.domain.database.data.DatabaseTypeUpdateRequest; import com.databasir.dao.tables.pojos.DatabaseTypePojo; import org.mapstruct.Mapper; +import org.mapstruct.Mapping; @Mapper(componentModel = "spring") public interface DatabaseTypePojoConverter { + @Mapping(target = "id", ignore = true) + @Mapping(target = "updateAt", ignore = true) + @Mapping(target = "createAt", ignore = true) DatabaseTypePojo of(DatabaseTypeCreateRequest request); DatabaseTypePojo of(DatabaseTypeUpdateRequest request); diff --git a/core/src/main/java/com/databasir/core/domain/remark/converter/DiscussionResponseConverter.java b/core/src/main/java/com/databasir/core/domain/remark/converter/DiscussionResponseConverter.java index c860416..1aafc2a 100644 --- a/core/src/main/java/com/databasir/core/domain/remark/converter/DiscussionResponseConverter.java +++ b/core/src/main/java/com/databasir/core/domain/remark/converter/DiscussionResponseConverter.java @@ -1,7 +1,7 @@ package com.databasir.core.domain.remark.converter; import com.databasir.core.domain.remark.data.DiscussionResponse; -import com.databasir.dao.tables.pojos.DocumentRemarkPojo; +import com.databasir.dao.tables.pojos.DocumentDiscussionPojo; import com.databasir.dao.tables.pojos.UserPojo; import org.mapstruct.Mapper; import org.mapstruct.Mapping; @@ -9,9 +9,9 @@ import org.mapstruct.Mapping; @Mapper(componentModel = "spring") public interface DiscussionResponseConverter { - @Mapping(target = "id", source = "remark.id") - @Mapping(target = "createAt", source = "remark.createAt") - @Mapping(target = "content", source = "remark.remark") - DiscussionResponse of(DocumentRemarkPojo remark, + @Mapping(target = "id", source = "discussion.id") + @Mapping(target = "createAt", source = "discussion.createAt") + @Mapping(target = "content", source = "discussion.content") + DiscussionResponse of(DocumentDiscussionPojo discussion, UserPojo discussBy); } diff --git a/core/src/main/java/com/databasir/core/domain/remark/data/DiscussionListCondition.java b/core/src/main/java/com/databasir/core/domain/remark/data/DiscussionListCondition.java index 2c79b32..5748201 100644 --- a/core/src/main/java/com/databasir/core/domain/remark/data/DiscussionListCondition.java +++ b/core/src/main/java/com/databasir/core/domain/remark/data/DiscussionListCondition.java @@ -19,17 +19,17 @@ public class DiscussionListCondition { public Condition toCondition(Integer projectId) { List conditions = new ArrayList<>(); - Condition condition = Tables.DOCUMENT_REMARK.TABLE_NAME.eq(tableName); + Condition condition = Tables.DOCUMENT_DISCUSSION.TABLE_NAME.eq(tableName); conditions.add(condition); Condition columnCondition; if (columnName != null) { - columnCondition = Tables.DOCUMENT_REMARK.COLUMN_NAME.eq(columnName); + columnCondition = Tables.DOCUMENT_DISCUSSION.COLUMN_NAME.eq(columnName); } else { - columnCondition = Tables.DOCUMENT_REMARK.COLUMN_NAME.isNull(); + columnCondition = Tables.DOCUMENT_DISCUSSION.COLUMN_NAME.isNull(); } conditions.add(columnCondition); - conditions.add(Tables.DOCUMENT_REMARK.PROJECT_ID.eq(projectId)); + conditions.add(Tables.DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId)); return conditions.stream().reduce(Condition::and).orElse(DSL.trueCondition()); } } diff --git a/core/src/main/java/com/databasir/core/domain/remark/service/DocumentDiscussionService.java b/core/src/main/java/com/databasir/core/domain/remark/service/DocumentDiscussionService.java index f64a08c..08dfc79 100644 --- a/core/src/main/java/com/databasir/core/domain/remark/service/DocumentDiscussionService.java +++ b/core/src/main/java/com/databasir/core/domain/remark/service/DocumentDiscussionService.java @@ -8,7 +8,7 @@ import com.databasir.core.domain.remark.data.DiscussionResponse; import com.databasir.dao.impl.DocumentDiscussionDao; import com.databasir.dao.impl.ProjectDao; import com.databasir.dao.impl.UserDao; -import com.databasir.dao.tables.pojos.DocumentRemarkPojo; +import com.databasir.dao.tables.pojos.DocumentDiscussionPojo; import com.databasir.dao.tables.pojos.UserPojo; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; @@ -47,18 +47,18 @@ public class DocumentDiscussionService { Pageable pageable, DiscussionListCondition condition) { if (projectDao.exists(groupId, projectId)) { - Page data = documentDiscussionDao.selectByPage(pageable, condition.toCondition(projectId)); + Page data = documentDiscussionDao.selectByPage(pageable, condition.toCondition(projectId)); Set userIdList = data.getContent() .stream() - .map(DocumentRemarkPojo::getUserId) + .map(DocumentDiscussionPojo::getUserId) .collect(Collectors.toSet()); Map userMapById = userDao.selectUserIdIn(userIdList) .stream() .collect(Collectors.toMap(UserPojo::getId, Function.identity())); return data - .map(remarkPojo -> { - UserPojo userPojo = userMapById.get(remarkPojo.getUserId()); - return discussionResponseConverter.of(remarkPojo, userPojo); + .map(dicussionPojo -> { + UserPojo userPojo = userMapById.get(dicussionPojo.getUserId()); + return discussionResponseConverter.of(dicussionPojo, userPojo); }); } else { throw new Forbidden(); @@ -67,10 +67,10 @@ public class DocumentDiscussionService { public void create(Integer groupId, Integer projectId, Integer userId, DiscussionCreateRequest request) { if (projectDao.exists(groupId, projectId)) { - DocumentRemarkPojo pojo = new DocumentRemarkPojo(); + DocumentDiscussionPojo pojo = new DocumentDiscussionPojo(); pojo.setUserId(userId); pojo.setProjectId(projectId); - pojo.setRemark(request.getContent()); + pojo.setContent(request.getContent()); pojo.setTableName(request.getTableName()); pojo.setColumnName(request.getColumnName()); documentDiscussionDao.insertAndReturnId(pojo); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/Databasir.java b/dao/generated-src/jooq/main/java/com/databasir/dao/Databasir.java index 9324667..22dba22 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/Databasir.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/Databasir.java @@ -8,7 +8,7 @@ import com.databasir.dao.tables.DataSource; import com.databasir.dao.tables.DataSourceProperty; import com.databasir.dao.tables.DatabaseDocument; import com.databasir.dao.tables.DatabaseType; -import com.databasir.dao.tables.DocumentRemark; +import com.databasir.dao.tables.DocumentDiscussion; import com.databasir.dao.tables.Group; import com.databasir.dao.tables.Login; import com.databasir.dao.tables.OauthApp; @@ -67,9 +67,9 @@ public class Databasir extends SchemaImpl { public final DatabaseType DATABASE_TYPE = DatabaseType.DATABASE_TYPE; /** - * The table databasir.document_remark. + * The table databasir.document_discussion. */ - public final DocumentRemark DOCUMENT_REMARK = DocumentRemark.DOCUMENT_REMARK; + public final DocumentDiscussion DOCUMENT_DISCUSSION = DocumentDiscussion.DOCUMENT_DISCUSSION; /** * The table databasir.group. @@ -166,7 +166,7 @@ public class Databasir extends SchemaImpl { DataSourceProperty.DATA_SOURCE_PROPERTY, DatabaseDocument.DATABASE_DOCUMENT, DatabaseType.DATABASE_TYPE, - DocumentRemark.DOCUMENT_REMARK, + DocumentDiscussion.DOCUMENT_DISCUSSION, Group.GROUP, Login.LOGIN, OauthApp.OAUTH_APP, diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/Indexes.java b/dao/generated-src/jooq/main/java/com/databasir/dao/Indexes.java index 623d696..9f46d75 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/Indexes.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/Indexes.java @@ -6,7 +6,7 @@ package com.databasir.dao; import com.databasir.dao.tables.DataSourceProperty; import com.databasir.dao.tables.DatabaseDocument; -import com.databasir.dao.tables.DocumentRemark; +import com.databasir.dao.tables.DocumentDiscussion; import com.databasir.dao.tables.TableColumnDocument; import com.databasir.dao.tables.TableDocument; import com.databasir.dao.tables.TableIndexDocument; @@ -34,7 +34,7 @@ public class Indexes { public static final Index TABLE_INDEX_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableIndexDocument.TABLE_INDEX_DOCUMENT, new OrderField[] { TableIndexDocument.TABLE_INDEX_DOCUMENT.DATABASE_DOCUMENT_ID }, false); public static final Index TABLE_TRIGGER_DOCUMENT_IDX_DATABASE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_database_document_id"), TableTriggerDocument.TABLE_TRIGGER_DOCUMENT, new OrderField[] { TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.DATABASE_DOCUMENT_ID }, false); public static final Index DATABASE_DOCUMENT_IDX_PROJECT_ID = Internal.createIndex(DSL.name("idx_project_id"), DatabaseDocument.DATABASE_DOCUMENT, new OrderField[] { DatabaseDocument.DATABASE_DOCUMENT.PROJECT_ID }, false); - public static final Index DOCUMENT_REMARK_IDX_PROJECT_ID = Internal.createIndex(DSL.name("idx_project_id"), DocumentRemark.DOCUMENT_REMARK, new OrderField[] { DocumentRemark.DOCUMENT_REMARK.PROJECT_ID }, false); + public static final Index DOCUMENT_DISCUSSION_IDX_PROJECT_ID = Internal.createIndex(DSL.name("idx_project_id"), DocumentDiscussion.DOCUMENT_DISCUSSION, new OrderField[] { DocumentDiscussion.DOCUMENT_DISCUSSION.PROJECT_ID }, false); public static final Index TABLE_COLUMN_DOCUMENT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_table_document_id"), TableColumnDocument.TABLE_COLUMN_DOCUMENT, new OrderField[] { TableColumnDocument.TABLE_COLUMN_DOCUMENT.TABLE_DOCUMENT_ID }, false); public static final Index TABLE_INDEX_DOCUMENT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_table_document_id"), TableIndexDocument.TABLE_INDEX_DOCUMENT, new OrderField[] { TableIndexDocument.TABLE_INDEX_DOCUMENT.TABLE_DOCUMENT_ID }, false); public static final Index TABLE_TRIGGER_DOCUMENT_IDX_TABLE_DOCUMENT_ID = Internal.createIndex(DSL.name("idx_table_document_id"), TableTriggerDocument.TABLE_TRIGGER_DOCUMENT, new OrderField[] { TableTriggerDocument.TABLE_TRIGGER_DOCUMENT.TABLE_DOCUMENT_ID }, false); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/Keys.java b/dao/generated-src/jooq/main/java/com/databasir/dao/Keys.java index d3f4c34..1d0581d 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/Keys.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/Keys.java @@ -8,7 +8,7 @@ import com.databasir.dao.tables.DataSource; import com.databasir.dao.tables.DataSourceProperty; import com.databasir.dao.tables.DatabaseDocument; import com.databasir.dao.tables.DatabaseType; -import com.databasir.dao.tables.DocumentRemark; +import com.databasir.dao.tables.DocumentDiscussion; import com.databasir.dao.tables.Group; import com.databasir.dao.tables.Login; import com.databasir.dao.tables.OauthApp; @@ -28,7 +28,7 @@ import com.databasir.dao.tables.records.DataSourcePropertyRecord; import com.databasir.dao.tables.records.DataSourceRecord; import com.databasir.dao.tables.records.DatabaseDocumentRecord; import com.databasir.dao.tables.records.DatabaseTypeRecord; -import com.databasir.dao.tables.records.DocumentRemarkRecord; +import com.databasir.dao.tables.records.DocumentDiscussionRecord; import com.databasir.dao.tables.records.GroupRecord; import com.databasir.dao.tables.records.LoginRecord; import com.databasir.dao.tables.records.OauthAppRecord; @@ -68,7 +68,7 @@ public class Keys { public static final UniqueKey KEY_DATABASE_DOCUMENT_PRIMARY = Internal.createUniqueKey(DatabaseDocument.DATABASE_DOCUMENT, DSL.name("KEY_database_document_PRIMARY"), new TableField[] { DatabaseDocument.DATABASE_DOCUMENT.ID }, true); public static final UniqueKey KEY_DATABASE_TYPE_PRIMARY = Internal.createUniqueKey(DatabaseType.DATABASE_TYPE, DSL.name("KEY_database_type_PRIMARY"), new TableField[] { DatabaseType.DATABASE_TYPE.ID }, true); public static final UniqueKey KEY_DATABASE_TYPE_UK_DATABASE_TYPE_DELETED_DELETED_TOKEN = Internal.createUniqueKey(DatabaseType.DATABASE_TYPE, DSL.name("KEY_database_type_uk_database_type_deleted_deleted_token"), new TableField[] { DatabaseType.DATABASE_TYPE.DATABASE_TYPE_, DatabaseType.DATABASE_TYPE.DELETED, DatabaseType.DATABASE_TYPE.DELETED_TOKEN }, true); - public static final UniqueKey KEY_DOCUMENT_REMARK_PRIMARY = Internal.createUniqueKey(DocumentRemark.DOCUMENT_REMARK, DSL.name("KEY_document_remark_PRIMARY"), new TableField[] { DocumentRemark.DOCUMENT_REMARK.ID }, true); + public static final UniqueKey KEY_DOCUMENT_DISCUSSION_PRIMARY = Internal.createUniqueKey(DocumentDiscussion.DOCUMENT_DISCUSSION, DSL.name("KEY_document_discussion_PRIMARY"), new TableField[] { DocumentDiscussion.DOCUMENT_DISCUSSION.ID }, true); public static final UniqueKey KEY_GROUP_PRIMARY = Internal.createUniqueKey(Group.GROUP, DSL.name("KEY_group_PRIMARY"), new TableField[] { Group.GROUP.ID }, true); public static final UniqueKey KEY_LOGIN_PRIMARY = Internal.createUniqueKey(Login.LOGIN, DSL.name("KEY_login_PRIMARY"), new TableField[] { Login.LOGIN.ID }, true); public static final UniqueKey KEY_LOGIN_UK_USER_ID = Internal.createUniqueKey(Login.LOGIN, DSL.name("KEY_login_uk_user_id"), new TableField[] { Login.LOGIN.USER_ID }, true); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/Tables.java b/dao/generated-src/jooq/main/java/com/databasir/dao/Tables.java index 104b0c5..0d8be9b 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/Tables.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/Tables.java @@ -8,7 +8,7 @@ import com.databasir.dao.tables.DataSource; import com.databasir.dao.tables.DataSourceProperty; import com.databasir.dao.tables.DatabaseDocument; import com.databasir.dao.tables.DatabaseType; -import com.databasir.dao.tables.DocumentRemark; +import com.databasir.dao.tables.DocumentDiscussion; import com.databasir.dao.tables.Group; import com.databasir.dao.tables.Login; import com.databasir.dao.tables.OauthApp; @@ -53,9 +53,9 @@ public class Tables { public static final DatabaseType DATABASE_TYPE = DatabaseType.DATABASE_TYPE; /** - * The table databasir.document_remark. + * The table databasir.document_discussion. */ - public static final DocumentRemark DOCUMENT_REMARK = DocumentRemark.DOCUMENT_REMARK; + public static final DocumentDiscussion DOCUMENT_DISCUSSION = DocumentDiscussion.DOCUMENT_DISCUSSION; /** * The table databasir.group. diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseDocument.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseDocument.java index 60aafbf..18ff589 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseDocument.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DatabaseDocument.java @@ -8,15 +8,27 @@ import com.databasir.dao.Databasir; import com.databasir.dao.Indexes; import com.databasir.dao.Keys; import com.databasir.dao.tables.records.DatabaseDocumentRecord; -import org.jooq.*; -import org.jooq.impl.DSL; -import org.jooq.impl.SQLDataType; -import org.jooq.impl.TableImpl; import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Identity; +import org.jooq.Index; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row10; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + /** * This class is generated by jOOQ. diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDiscussion.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDiscussion.java new file mode 100644 index 0000000..a548660 --- /dev/null +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentDiscussion.java @@ -0,0 +1,178 @@ +/* + * This file is generated by jOOQ. + */ +package com.databasir.dao.tables; + + +import com.databasir.dao.Databasir; +import com.databasir.dao.Indexes; +import com.databasir.dao.Keys; +import com.databasir.dao.tables.records.DocumentDiscussionRecord; + +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.List; + +import org.jooq.Field; +import org.jooq.ForeignKey; +import org.jooq.Identity; +import org.jooq.Index; +import org.jooq.Name; +import org.jooq.Record; +import org.jooq.Row7; +import org.jooq.Schema; +import org.jooq.Table; +import org.jooq.TableField; +import org.jooq.TableOptions; +import org.jooq.UniqueKey; +import org.jooq.impl.DSL; +import org.jooq.impl.SQLDataType; +import org.jooq.impl.TableImpl; + + +/** + * This class is generated by jOOQ. + */ +@SuppressWarnings({ "all", "unchecked", "rawtypes" }) +public class DocumentDiscussion extends TableImpl { + + private static final long serialVersionUID = 1L; + + /** + * The reference instance of databasir.document_discussion + */ + public static final DocumentDiscussion DOCUMENT_DISCUSSION = new DocumentDiscussion(); + + /** + * The class holding records for this type + */ + @Override + public Class getRecordType() { + return DocumentDiscussionRecord.class; + } + + /** + * The column databasir.document_discussion.id. + */ + public final TableField ID = createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false).identity(true), this, ""); + + /** + * The column databasir.document_discussion.content. + */ + public final TableField CONTENT = createField(DSL.name("content"), SQLDataType.CLOB.nullable(false), this, ""); + + /** + * The column databasir.document_discussion.user_id. user.id + */ + public final TableField USER_ID = createField(DSL.name("user_id"), SQLDataType.INTEGER.nullable(false), this, "user.id"); + + /** + * The column databasir.document_discussion.project_id. + */ + public final TableField PROJECT_ID = createField(DSL.name("project_id"), SQLDataType.INTEGER.nullable(false), this, ""); + + /** + * The column databasir.document_discussion.table_name. + */ + public final TableField TABLE_NAME = createField(DSL.name("table_name"), SQLDataType.VARCHAR(255).nullable(false), this, ""); + + /** + * The column databasir.document_discussion.column_name. + */ + public final TableField COLUMN_NAME = createField(DSL.name("column_name"), SQLDataType.VARCHAR(255), this, ""); + + /** + * The column databasir.document_discussion.create_at. + */ + public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); + + private DocumentDiscussion(Name alias, Table aliased) { + this(alias, aliased, null); + } + + private DocumentDiscussion(Name alias, Table aliased, Field[] parameters) { + super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); + } + + /** + * Create an aliased databasir.document_discussion table + * reference + */ + public DocumentDiscussion(String alias) { + this(DSL.name(alias), DOCUMENT_DISCUSSION); + } + + /** + * Create an aliased databasir.document_discussion table + * reference + */ + public DocumentDiscussion(Name alias) { + this(alias, DOCUMENT_DISCUSSION); + } + + /** + * Create a databasir.document_discussion table reference + */ + public DocumentDiscussion() { + this(DSL.name("document_discussion"), null); + } + + public DocumentDiscussion(Table child, ForeignKey key) { + super(child, key, DOCUMENT_DISCUSSION); + } + + @Override + public Schema getSchema() { + return aliased() ? null : Databasir.DATABASIR; + } + + @Override + public List getIndexes() { + return Arrays.asList(Indexes.DOCUMENT_DISCUSSION_IDX_PROJECT_ID); + } + + @Override + public Identity getIdentity() { + return (Identity) super.getIdentity(); + } + + @Override + public UniqueKey getPrimaryKey() { + return Keys.KEY_DOCUMENT_DISCUSSION_PRIMARY; + } + + @Override + public DocumentDiscussion as(String alias) { + return new DocumentDiscussion(DSL.name(alias), this); + } + + @Override + public DocumentDiscussion as(Name alias) { + return new DocumentDiscussion(alias, this); + } + + /** + * Rename this table + */ + @Override + public DocumentDiscussion rename(String name) { + return new DocumentDiscussion(DSL.name(name), null); + } + + /** + * Rename this table + */ + @Override + public DocumentDiscussion rename(Name name) { + return new DocumentDiscussion(name, null); + } + + // ------------------------------------------------------------------------- + // Row7 type methods + // ------------------------------------------------------------------------- + + @Override + public Row7 fieldsRow() { + return (Row7) super.fieldsRow(); + } +} diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentRemark.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentRemark.java deleted file mode 100644 index 302f01a..0000000 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/DocumentRemark.java +++ /dev/null @@ -1,176 +0,0 @@ -/* - * This file is generated by jOOQ. - */ -package com.databasir.dao.tables; - - -import com.databasir.dao.Databasir; -import com.databasir.dao.Indexes; -import com.databasir.dao.Keys; -import com.databasir.dao.tables.records.DocumentRemarkRecord; - -import java.time.LocalDateTime; -import java.util.Arrays; -import java.util.List; - -import org.jooq.Field; -import org.jooq.ForeignKey; -import org.jooq.Identity; -import org.jooq.Index; -import org.jooq.Name; -import org.jooq.Record; -import org.jooq.Row7; -import org.jooq.Schema; -import org.jooq.Table; -import org.jooq.TableField; -import org.jooq.TableOptions; -import org.jooq.UniqueKey; -import org.jooq.impl.DSL; -import org.jooq.impl.SQLDataType; -import org.jooq.impl.TableImpl; - - -/** - * This class is generated by jOOQ. - */ -@SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DocumentRemark extends TableImpl { - - private static final long serialVersionUID = 1L; - - /** - * The reference instance of databasir.document_remark - */ - public static final DocumentRemark DOCUMENT_REMARK = new DocumentRemark(); - - /** - * The class holding records for this type - */ - @Override - public Class getRecordType() { - return DocumentRemarkRecord.class; - } - - /** - * The column databasir.document_remark.id. - */ - public final TableField ID = createField(DSL.name("id"), SQLDataType.INTEGER.nullable(false).identity(true), this, ""); - - /** - * The column databasir.document_remark.remark. - */ - public final TableField REMARK = createField(DSL.name("remark"), SQLDataType.CLOB.nullable(false), this, ""); - - /** - * The column databasir.document_remark.user_id. user.id - */ - public final TableField USER_ID = createField(DSL.name("user_id"), SQLDataType.INTEGER.nullable(false), this, "user.id"); - - /** - * The column databasir.document_remark.project_id. - */ - public final TableField PROJECT_ID = createField(DSL.name("project_id"), SQLDataType.INTEGER.nullable(false), this, ""); - - /** - * The column databasir.document_remark.table_name. - */ - public final TableField TABLE_NAME = createField(DSL.name("table_name"), SQLDataType.VARCHAR(255).nullable(false), this, ""); - - /** - * The column databasir.document_remark.column_name. - */ - public final TableField COLUMN_NAME = createField(DSL.name("column_name"), SQLDataType.VARCHAR(255), this, ""); - - /** - * The column databasir.document_remark.create_at. - */ - public final TableField CREATE_AT = createField(DSL.name("create_at"), SQLDataType.LOCALDATETIME(0).nullable(false).defaultValue(DSL.field("CURRENT_TIMESTAMP", SQLDataType.LOCALDATETIME)), this, ""); - - private DocumentRemark(Name alias, Table aliased) { - this(alias, aliased, null); - } - - private DocumentRemark(Name alias, Table aliased, Field[] parameters) { - super(alias, null, aliased, parameters, DSL.comment(""), TableOptions.table()); - } - - /** - * Create an aliased databasir.document_remark table reference - */ - public DocumentRemark(String alias) { - this(DSL.name(alias), DOCUMENT_REMARK); - } - - /** - * Create an aliased databasir.document_remark table reference - */ - public DocumentRemark(Name alias) { - this(alias, DOCUMENT_REMARK); - } - - /** - * Create a databasir.document_remark table reference - */ - public DocumentRemark() { - this(DSL.name("document_remark"), null); - } - - public DocumentRemark(Table child, ForeignKey key) { - super(child, key, DOCUMENT_REMARK); - } - - @Override - public Schema getSchema() { - return aliased() ? null : Databasir.DATABASIR; - } - - @Override - public List getIndexes() { - return Arrays.asList(Indexes.DOCUMENT_REMARK_IDX_PROJECT_ID); - } - - @Override - public Identity getIdentity() { - return (Identity) super.getIdentity(); - } - - @Override - public UniqueKey getPrimaryKey() { - return Keys.KEY_DOCUMENT_REMARK_PRIMARY; - } - - @Override - public DocumentRemark as(String alias) { - return new DocumentRemark(DSL.name(alias), this); - } - - @Override - public DocumentRemark as(Name alias) { - return new DocumentRemark(alias, this); - } - - /** - * Rename this table - */ - @Override - public DocumentRemark rename(String name) { - return new DocumentRemark(DSL.name(name), null); - } - - /** - * Rename this table - */ - @Override - public DocumentRemark rename(Name name) { - return new DocumentRemark(name, null); - } - - // ------------------------------------------------------------------------- - // Row7 type methods - // ------------------------------------------------------------------------- - - @Override - public Row7 fieldsRow() { - return (Row7) super.fieldsRow(); - } -} diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentRemarkPojo.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDiscussionPojo.java similarity index 62% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentRemarkPojo.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDiscussionPojo.java index b504413..153b480 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentRemarkPojo.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/pojos/DocumentDiscussionPojo.java @@ -12,23 +12,23 @@ import java.time.LocalDateTime; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DocumentRemarkPojo implements Serializable { +public class DocumentDiscussionPojo implements Serializable { private static final long serialVersionUID = 1L; private Integer id; - private String remark; + private String content; private Integer userId; private Integer projectId; private String tableName; private String columnName; private LocalDateTime createAt; - public DocumentRemarkPojo() {} + public DocumentDiscussionPojo() {} - public DocumentRemarkPojo(DocumentRemarkPojo value) { + public DocumentDiscussionPojo(DocumentDiscussionPojo value) { this.id = value.id; - this.remark = value.remark; + this.content = value.content; this.userId = value.userId; this.projectId = value.projectId; this.tableName = value.tableName; @@ -36,9 +36,9 @@ public class DocumentRemarkPojo implements Serializable { this.createAt = value.createAt; } - public DocumentRemarkPojo( + public DocumentDiscussionPojo( Integer id, - String remark, + String content, Integer userId, Integer projectId, String tableName, @@ -46,7 +46,7 @@ public class DocumentRemarkPojo implements Serializable { LocalDateTime createAt ) { this.id = id; - this.remark = remark; + this.content = content; this.userId = userId; this.projectId = projectId; this.tableName = tableName; @@ -55,98 +55,98 @@ public class DocumentRemarkPojo implements Serializable { } /** - * Getter for databasir.document_remark.id. + * Getter for databasir.document_discussion.id. */ public Integer getId() { return this.id; } /** - * Setter for databasir.document_remark.id. + * Setter for databasir.document_discussion.id. */ public void setId(Integer id) { this.id = id; } /** - * Getter for databasir.document_remark.remark. + * Getter for databasir.document_discussion.content. */ - public String getRemark() { - return this.remark; + public String getContent() { + return this.content; } /** - * Setter for databasir.document_remark.remark. + * Setter for databasir.document_discussion.content. */ - public void setRemark(String remark) { - this.remark = remark; + public void setContent(String content) { + this.content = content; } /** - * Getter for databasir.document_remark.user_id. user.id + * Getter for databasir.document_discussion.user_id. user.id */ public Integer getUserId() { return this.userId; } /** - * Setter for databasir.document_remark.user_id. user.id + * Setter for databasir.document_discussion.user_id. user.id */ public void setUserId(Integer userId) { this.userId = userId; } /** - * Getter for databasir.document_remark.project_id. + * Getter for databasir.document_discussion.project_id. */ public Integer getProjectId() { return this.projectId; } /** - * Setter for databasir.document_remark.project_id. + * Setter for databasir.document_discussion.project_id. */ public void setProjectId(Integer projectId) { this.projectId = projectId; } /** - * Getter for databasir.document_remark.table_name. + * Getter for databasir.document_discussion.table_name. */ public String getTableName() { return this.tableName; } /** - * Setter for databasir.document_remark.table_name. + * Setter for databasir.document_discussion.table_name. */ public void setTableName(String tableName) { this.tableName = tableName; } /** - * Getter for databasir.document_remark.column_name. + * Getter for databasir.document_discussion.column_name. */ public String getColumnName() { return this.columnName; } /** - * Setter for databasir.document_remark.column_name. + * Setter for databasir.document_discussion.column_name. */ public void setColumnName(String columnName) { this.columnName = columnName; } /** - * Getter for databasir.document_remark.create_at. + * Getter for databasir.document_discussion.create_at. */ public LocalDateTime getCreateAt() { return this.createAt; } /** - * Setter for databasir.document_remark.create_at. + * Setter for databasir.document_discussion.create_at. */ public void setCreateAt(LocalDateTime createAt) { this.createAt = createAt; @@ -154,10 +154,10 @@ public class DocumentRemarkPojo implements Serializable { @Override public String toString() { - StringBuilder sb = new StringBuilder("DocumentRemarkPojo ("); + StringBuilder sb = new StringBuilder("DocumentDiscussionPojo ("); sb.append(id); - sb.append(", ").append(remark); + sb.append(", ").append(content); sb.append(", ").append(userId); sb.append(", ").append(projectId); sb.append(", ").append(tableName); diff --git a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DocumentRemarkRecord.java b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DocumentDiscussionRecord.java similarity index 62% rename from dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DocumentRemarkRecord.java rename to dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DocumentDiscussionRecord.java index 0d93e24..40f9062 100644 --- a/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DocumentRemarkRecord.java +++ b/dao/generated-src/jooq/main/java/com/databasir/dao/tables/records/DocumentDiscussionRecord.java @@ -4,8 +4,8 @@ package com.databasir.dao.tables.records; -import com.databasir.dao.tables.DocumentRemark; -import com.databasir.dao.tables.pojos.DocumentRemarkPojo; +import com.databasir.dao.tables.DocumentDiscussion; +import com.databasir.dao.tables.pojos.DocumentDiscussionPojo; import java.time.LocalDateTime; @@ -20,103 +20,103 @@ import org.jooq.impl.UpdatableRecordImpl; * This class is generated by jOOQ. */ @SuppressWarnings({ "all", "unchecked", "rawtypes" }) -public class DocumentRemarkRecord extends UpdatableRecordImpl implements Record7 { +public class DocumentDiscussionRecord extends UpdatableRecordImpl implements Record7 { private static final long serialVersionUID = 1L; /** - * Setter for databasir.document_remark.id. + * Setter for databasir.document_discussion.id. */ public void setId(Integer value) { set(0, value); } /** - * Getter for databasir.document_remark.id. + * Getter for databasir.document_discussion.id. */ public Integer getId() { return (Integer) get(0); } /** - * Setter for databasir.document_remark.remark. + * Setter for databasir.document_discussion.content. */ - public void setRemark(String value) { + public void setContent(String value) { set(1, value); } /** - * Getter for databasir.document_remark.remark. + * Getter for databasir.document_discussion.content. */ - public String getRemark() { + public String getContent() { return (String) get(1); } /** - * Setter for databasir.document_remark.user_id. user.id + * Setter for databasir.document_discussion.user_id. user.id */ public void setUserId(Integer value) { set(2, value); } /** - * Getter for databasir.document_remark.user_id. user.id + * Getter for databasir.document_discussion.user_id. user.id */ public Integer getUserId() { return (Integer) get(2); } /** - * Setter for databasir.document_remark.project_id. + * Setter for databasir.document_discussion.project_id. */ public void setProjectId(Integer value) { set(3, value); } /** - * Getter for databasir.document_remark.project_id. + * Getter for databasir.document_discussion.project_id. */ public Integer getProjectId() { return (Integer) get(3); } /** - * Setter for databasir.document_remark.table_name. + * Setter for databasir.document_discussion.table_name. */ public void setTableName(String value) { set(4, value); } /** - * Getter for databasir.document_remark.table_name. + * Getter for databasir.document_discussion.table_name. */ public String getTableName() { return (String) get(4); } /** - * Setter for databasir.document_remark.column_name. + * Setter for databasir.document_discussion.column_name. */ public void setColumnName(String value) { set(5, value); } /** - * Getter for databasir.document_remark.column_name. + * Getter for databasir.document_discussion.column_name. */ public String getColumnName() { return (String) get(5); } /** - * Setter for databasir.document_remark.create_at. + * Setter for databasir.document_discussion.create_at. */ public void setCreateAt(LocalDateTime value) { set(6, value); } /** - * Getter for databasir.document_remark.create_at. + * Getter for databasir.document_discussion.create_at. */ public LocalDateTime getCreateAt() { return (LocalDateTime) get(6); @@ -147,37 +147,37 @@ public class DocumentRemarkRecord extends UpdatableRecordImpl field1() { - return DocumentRemark.DOCUMENT_REMARK.ID; + return DocumentDiscussion.DOCUMENT_DISCUSSION.ID; } @Override public Field field2() { - return DocumentRemark.DOCUMENT_REMARK.REMARK; + return DocumentDiscussion.DOCUMENT_DISCUSSION.CONTENT; } @Override public Field field3() { - return DocumentRemark.DOCUMENT_REMARK.USER_ID; + return DocumentDiscussion.DOCUMENT_DISCUSSION.USER_ID; } @Override public Field field4() { - return DocumentRemark.DOCUMENT_REMARK.PROJECT_ID; + return DocumentDiscussion.DOCUMENT_DISCUSSION.PROJECT_ID; } @Override public Field field5() { - return DocumentRemark.DOCUMENT_REMARK.TABLE_NAME; + return DocumentDiscussion.DOCUMENT_DISCUSSION.TABLE_NAME; } @Override public Field field6() { - return DocumentRemark.DOCUMENT_REMARK.COLUMN_NAME; + return DocumentDiscussion.DOCUMENT_DISCUSSION.COLUMN_NAME; } @Override public Field field7() { - return DocumentRemark.DOCUMENT_REMARK.CREATE_AT; + return DocumentDiscussion.DOCUMENT_DISCUSSION.CREATE_AT; } @Override @@ -187,7 +187,7 @@ public class DocumentRemarkRecord extends UpdatableRecordImpl { +public class DocumentDiscussionDao extends BaseDao { @Autowired @Getter private DSLContext dslContext; public DocumentDiscussionDao() { - super(DOCUMENT_REMARK, DocumentRemarkPojo.class); + super(DOCUMENT_DISCUSSION, DocumentDiscussionPojo.class); } - public Optional selectByProjectIdAndId(Integer projectId, Integer id) { + public Optional selectByProjectIdAndId(Integer projectId, Integer id) { return this.getDslContext() - .selectFrom(DOCUMENT_REMARK).where(DOCUMENT_REMARK.PROJECT_ID.eq(projectId) - .and(DOCUMENT_REMARK.ID.eq(id))) - .fetchOptionalInto(DocumentRemarkPojo.class); + .selectFrom(DOCUMENT_DISCUSSION).where(DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId) + .and(DOCUMENT_DISCUSSION.ID.eq(id))) + .fetchOptionalInto(DocumentDiscussionPojo.class); } public List selectTableDiscussionCount(Integer projectId) { - return this.selectDiscussionCount(DOCUMENT_REMARK.PROJECT_ID.eq(projectId) - .and(DOCUMENT_REMARK.COLUMN_NAME.isNull())); + return this.selectDiscussionCount(DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId) + .and(DOCUMENT_DISCUSSION.COLUMN_NAME.isNull())); } public List selectAllDiscussionCount(Integer projectId) { - return this.selectDiscussionCount(DOCUMENT_REMARK.PROJECT_ID.eq(projectId)); + return this.selectDiscussionCount(DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId)); } public List selectDiscussionCount(Condition condition) { return this.getDslContext() - .select(DSL.count(), DOCUMENT_REMARK.TABLE_NAME, DOCUMENT_REMARK.COLUMN_NAME) - .from(DOCUMENT_REMARK) + .select(DSL.count(), DOCUMENT_DISCUSSION.TABLE_NAME, DOCUMENT_DISCUSSION.COLUMN_NAME) + .from(DOCUMENT_DISCUSSION) .where(condition) - .groupBy(DOCUMENT_REMARK.TABLE_NAME, DOCUMENT_REMARK.COLUMN_NAME) + .groupBy(DOCUMENT_DISCUSSION.TABLE_NAME, DOCUMENT_DISCUSSION.COLUMN_NAME) .fetchInto(DocumentDiscussionCountPojo.class); } } diff --git a/dao/src/main/resources/db/migration/V1__init.sql b/dao/src/main/resources/db/migration/V1__init.sql index d1ee209..41bbc5b 100644 --- a/dao/src/main/resources/db/migration/V1__init.sql +++ b/dao/src/main/resources/db/migration/V1__init.sql @@ -211,10 +211,10 @@ CREATE TABLE IF NOT EXISTS login ) CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci; -CREATE TABLE IF NOT EXISTS document_remark +CREATE TABLE IF NOT EXISTS document_discussion ( id INT PRIMARY KEY AUTO_INCREMENT, - remark TEXT NOT NULL, + content TEXT NOT NULL, user_id INT NOT NULL COMMENT 'user.id', project_id INT NOT NULL, table_name VARCHAR(255) NOT NULL,