From bf5c1b205fbfbcdee8e1ecf75381eab33bb762fa Mon Sep 17 00:00:00 2001 From: vran Date: Sat, 11 Jun 2022 12:45:42 +0800 Subject: [PATCH] feat: optimize code --- .../discussion/data/DiscussionListCondition.java | 10 ---------- .../com/databasir/dao/impl/DocumentDiscussionDao.java | 8 -------- 2 files changed, 18 deletions(-) diff --git a/core/src/main/java/com/databasir/core/domain/discussion/data/DiscussionListCondition.java b/core/src/main/java/com/databasir/core/domain/discussion/data/DiscussionListCondition.java index b912e39..065238f 100644 --- a/core/src/main/java/com/databasir/core/domain/discussion/data/DiscussionListCondition.java +++ b/core/src/main/java/com/databasir/core/domain/discussion/data/DiscussionListCondition.java @@ -15,20 +15,10 @@ public class DiscussionListCondition { @NotBlank private String tableName; - private String columnName; - public Condition toCondition(Integer projectId) { List conditions = new ArrayList<>(); Condition condition = Tables.DOCUMENT_DISCUSSION.TABLE_NAME.eq(tableName); conditions.add(condition); - - Condition columnCondition; - if (columnName != null) { - columnCondition = Tables.DOCUMENT_DISCUSSION.COLUMN_NAME.eq(columnName); - } else { - columnCondition = Tables.DOCUMENT_DISCUSSION.COLUMN_NAME.isNull(); - } - conditions.add(columnCondition); conditions.add(Tables.DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId)); return conditions.stream().reduce(Condition::and).orElse(DSL.trueCondition()); } diff --git a/dao/src/main/java/com/databasir/dao/impl/DocumentDiscussionDao.java b/dao/src/main/java/com/databasir/dao/impl/DocumentDiscussionDao.java index 650b572..e0eaffb 100644 --- a/dao/src/main/java/com/databasir/dao/impl/DocumentDiscussionDao.java +++ b/dao/src/main/java/com/databasir/dao/impl/DocumentDiscussionDao.java @@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Repository; import java.util.List; -import java.util.Optional; import static com.databasir.dao.Tables.DOCUMENT_DISCUSSION; @@ -25,13 +24,6 @@ public class DocumentDiscussionDao extends BaseDao { super(DOCUMENT_DISCUSSION, DocumentDiscussion.class); } - public Optional selectByProjectIdAndId(Integer projectId, Integer id) { - return this.getDslContext() - .selectFrom(DOCUMENT_DISCUSSION).where(DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId) - .and(DOCUMENT_DISCUSSION.ID.eq(id))) - .fetchOptionalInto(DocumentDiscussion.class); - } - public List selectAllDiscussionCount(Integer projectId) { return this.selectDiscussionCount(DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId)); }