7x31
/
databasir
mirror of https://github.com/vran-dev/databasir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: optimize code

This commit is contained in:
vran 2022-06-11 12:45:42 +08:00
parent 0eb91630c2
commit bf5c1b205f
2 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/com/databasir/core/domain/discussion/data/DiscussionListCondition.java
View File

@ -15,20 +15,10 @@ public class DiscussionListCondition {
@NotBlank @NotBlank
private String tableName; private String tableName;
private String columnName;
public Condition toCondition(Integer projectId) { public Condition toCondition(Integer projectId) {
List<Condition> conditions = new ArrayList<>(); List<Condition> conditions = new ArrayList<>();
Condition condition = Tables.DOCUMENT_DISCUSSION.TABLE_NAME.eq(tableName); Condition condition = Tables.DOCUMENT_DISCUSSION.TABLE_NAME.eq(tableName);
conditions.add(condition); 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)); conditions.add(Tables.DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId));
return conditions.stream().reduce(Condition::and).orElse(DSL.trueCondition()); return conditions.stream().reduce(Condition::and).orElse(DSL.trueCondition());
} }

8
dao/src/main/java/com/databasir/dao/impl/DocumentDiscussionDao.java
View File

@ -10,7 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import java.util.List; import java.util.List;
import java.util.Optional;
import static com.databasir.dao.Tables.DOCUMENT_DISCUSSION; import static com.databasir.dao.Tables.DOCUMENT_DISCUSSION;
@ -25,13 +24,6 @@ public class DocumentDiscussionDao extends BaseDao<DocumentDiscussion> {
super(DOCUMENT_DISCUSSION, DocumentDiscussion.class); super(DOCUMENT_DISCUSSION, DocumentDiscussion.class);
} }
public Optional<DocumentDiscussion> 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<DocumentDiscussionCountPojo> selectAllDiscussionCount(Integer projectId) { public List<DocumentDiscussionCountPojo> selectAllDiscussionCount(Integer projectId) {
return this.selectDiscussionCount(DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId)); return this.selectDiscussionCount(DOCUMENT_DISCUSSION.PROJECT_ID.eq(projectId));
} }