diff --git a/src/main/java/cn/lihongjie/coal/base/mapper/CommonMapper.java b/src/main/java/cn/lihongjie/coal/base/mapper/CommonMapper.java index e9cbfae4..323fd6be 100644 --- a/src/main/java/cn/lihongjie/coal/base/mapper/CommonMapper.java +++ b/src/main/java/cn/lihongjie/coal/base/mapper/CommonMapper.java @@ -11,6 +11,8 @@ import cn.lihongjie.coal.dictionary.entity.DictionaryItemEntity; import cn.lihongjie.coal.file.entity.FileEntity; import cn.lihongjie.coal.meter.entity.MeterEntity; import cn.lihongjie.coal.meterLog.entity.MeterLogEntity; +import cn.lihongjie.coal.noteBook.entity.NoteBookEntity; +import cn.lihongjie.coal.noteBookChapter.entity.NoteBookChapterEntity; import cn.lihongjie.coal.organization.entity.OrganizationEntity; import cn.lihongjie.coal.permission.entity.PermissionEntity; import cn.lihongjie.coal.resource.entity.ResourceEntity; @@ -214,6 +216,28 @@ public interface CommonMapper { e.setId(id); return e; } + + default NoteBookChapterEntity createNoteBookChapter(String id) { + + if (StringUtils.isEmpty(id)) { + + return null; + } + var e = new NoteBookChapterEntity(); + e.setId(id); + return e; + } + + default NoteBookEntity createNoteBook(String id) { + + if (StringUtils.isEmpty(id)) { + + return null; + } + var e = new NoteBookEntity(); + e.setId(id); + return e; + } default String toString(Object o) { if (o == null) { diff --git a/src/main/java/cn/lihongjie/coal/noteBook/controller/NoteBookController.java b/src/main/java/cn/lihongjie/coal/noteBook/controller/NoteBookController.java new file mode 100644 index 00000000..eb758e8e --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBook/controller/NoteBookController.java @@ -0,0 +1,60 @@ +package cn.lihongjie.coal.noteBook.controller; + +import cn.lihongjie.coal.annotation.SysLog; +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.noteBook.dto.CreateNoteBookDto; +import cn.lihongjie.coal.noteBook.dto.NoteBookDto; +import cn.lihongjie.coal.noteBook.dto.UpdateNoteBookDto; +import cn.lihongjie.coal.noteBook.service.NoteBookService; + +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/noteBook") +@SysLog( + module = "文档管理" +) +@Slf4j +public class NoteBookController { + @Autowired + private NoteBookService service; + + @PostMapping("/create") + public NoteBookDto create(@RequestBody CreateNoteBookDto request) { + return this.service.create(request) + ; + } + + @PostMapping("/update") + public NoteBookDto update(@RequestBody UpdateNoteBookDto request) { + return this.service.update(request) + ; + } + + @PostMapping("/delete") + public Object delete(@RequestBody IdRequest request) { + this.service.delete(request); + return true + ; + } + + @PostMapping("/getById") + public NoteBookDto getById(@RequestBody IdRequest request) { + return this.service.getById(request.getId()) + ; + } + + @PostMapping("/list") + public Page list(@RequestBody CommonQuery request) { + return this.service.list(request) + ; + } +} diff --git a/src/main/java/cn/lihongjie/coal/noteBook/dto/CreateNoteBookDto.java b/src/main/java/cn/lihongjie/coal/noteBook/dto/CreateNoteBookDto.java new file mode 100644 index 00000000..b6efb90b --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBook/dto/CreateNoteBookDto.java @@ -0,0 +1,9 @@ +package cn.lihongjie.coal.noteBook.dto; + +import cn.lihongjie.coal.base.dto.CommonDto; + +import lombok.Data; + +@Data +public class CreateNoteBookDto extends CommonDto { +} diff --git a/src/main/java/cn/lihongjie/coal/noteBook/dto/NoteBookDto.java b/src/main/java/cn/lihongjie/coal/noteBook/dto/NoteBookDto.java new file mode 100644 index 00000000..d054e8e9 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBook/dto/NoteBookDto.java @@ -0,0 +1,19 @@ +package cn.lihongjie.coal.noteBook.dto; + +import cn.lihongjie.coal.base.dto.CommonDto; +import cn.lihongjie.coal.noteBookChapter.dto.NoteBookChapterDto; + +import jakarta.persistence.OneToMany; + +import lombok.Data; + +import org.hibernate.annotations.FilterJoinTable; + +import java.util.List; + +@Data +public class NoteBookDto extends CommonDto { + @OneToMany + @FilterJoinTable(name = "root", condition = "parent_id is null") + private List chapters; +} diff --git a/src/main/java/cn/lihongjie/coal/noteBook/dto/UpdateNoteBookDto.java b/src/main/java/cn/lihongjie/coal/noteBook/dto/UpdateNoteBookDto.java new file mode 100644 index 00000000..523cee3e --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBook/dto/UpdateNoteBookDto.java @@ -0,0 +1,9 @@ +package cn.lihongjie.coal.noteBook.dto; + +import cn.lihongjie.coal.base.dto.CommonDto; + +import lombok.Data; + +@Data +public class UpdateNoteBookDto extends CommonDto { +} diff --git a/src/main/java/cn/lihongjie/coal/noteBook/entity/NoteBookEntity.java b/src/main/java/cn/lihongjie/coal/noteBook/entity/NoteBookEntity.java new file mode 100644 index 00000000..dd49840f --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBook/entity/NoteBookEntity.java @@ -0,0 +1,20 @@ +package cn.lihongjie.coal.noteBook.entity; + +import cn.lihongjie.coal.base.entity.CommonEntity; +import cn.lihongjie.coal.noteBookChapter.entity.NoteBookChapterEntity; + +import jakarta.persistence.Entity; +import jakarta.persistence.OneToMany; + +import lombok.Data; + +import java.util.List; + +@Data +@Entity +public class NoteBookEntity extends CommonEntity { + + + @OneToMany(mappedBy = "noteBook") + private List chapters; +} diff --git a/src/main/java/cn/lihongjie/coal/noteBook/mapper/NoteBookMapper.java b/src/main/java/cn/lihongjie/coal/noteBook/mapper/NoteBookMapper.java new file mode 100644 index 00000000..3f39647a --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBook/mapper/NoteBookMapper.java @@ -0,0 +1,19 @@ +package cn.lihongjie.coal.noteBook.mapper; + +import cn.lihongjie.coal.base.mapper.BaseMapper; +import cn.lihongjie.coal.base.mapper.CommonMapper; +import cn.lihongjie.coal.noteBook.dto.CreateNoteBookDto; +import cn.lihongjie.coal.noteBook.dto.NoteBookDto; +import cn.lihongjie.coal.noteBook.dto.UpdateNoteBookDto; +import cn.lihongjie.coal.noteBook.entity.NoteBookEntity; + +import org.mapstruct.Mapper; +import org.mapstruct.control.DeepClone; + +@Mapper( + componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING, + uses = {CommonMapper.class}, + mappingControl = DeepClone.class +) +public interface NoteBookMapper extends BaseMapper { +} diff --git a/src/main/java/cn/lihongjie/coal/noteBook/repository/NoteBookRepository.java b/src/main/java/cn/lihongjie/coal/noteBook/repository/NoteBookRepository.java new file mode 100644 index 00000000..fca96b1a --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBook/repository/NoteBookRepository.java @@ -0,0 +1,10 @@ +package cn.lihongjie.coal.noteBook.repository; + +import cn.lihongjie.coal.base.dao.BaseRepository; +import cn.lihongjie.coal.noteBook.entity.NoteBookEntity; + +import org.springframework.stereotype.Repository; + +@Repository +public interface NoteBookRepository extends BaseRepository { +} diff --git a/src/main/java/cn/lihongjie/coal/noteBook/service/NoteBookService.java b/src/main/java/cn/lihongjie/coal/noteBook/service/NoteBookService.java new file mode 100644 index 00000000..155f4a2d --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBook/service/NoteBookService.java @@ -0,0 +1,79 @@ +package cn.lihongjie.coal.noteBook.service; + +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.base.service.BaseService; +import cn.lihongjie.coal.noteBook.dto.CreateNoteBookDto; +import cn.lihongjie.coal.noteBook.dto.NoteBookDto; +import cn.lihongjie.coal.noteBook.dto.UpdateNoteBookDto; +import cn.lihongjie.coal.noteBook.entity.NoteBookEntity; +import cn.lihongjie.coal.noteBook.mapper.NoteBookMapper; +import cn.lihongjie.coal.noteBook.repository.NoteBookRepository; + +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.convert.ConversionService; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Slf4j +@Transactional +public class NoteBookService extends BaseService { + @Autowired + private NoteBookRepository repository; + + @Autowired + private NoteBookMapper mapper; + + @Autowired + private ConversionService conversionService; + + + + + + public NoteBookDto create(CreateNoteBookDto request) { + NoteBookEntity entity = mapper.toEntity(request); + + + this.repository.save(entity); + return getById(entity.getId()) + ; + } + + public NoteBookDto update(UpdateNoteBookDto request) { + NoteBookEntity entity = this.repository.get(request.getId()); + this.mapper.updateEntity(entity, request); + + this.repository.save(entity); + + return getById(entity.getId()) + ; + } + + public void delete(IdRequest request) { + this.repository.deleteAllById(request.getIds()) + ; + } + + public NoteBookDto getById(String id) { + NoteBookEntity entity = repository.get(id); + + + return mapper.toDto(entity) + ; + } + + public Page list(CommonQuery query) { + Page page = repository.findAll(query.specification(conversionService), PageRequest.of(query.getPageNo(), query.getPageSize(), Sort.by(query.getOrders()))); + + + return page.map(this.mapper::toDto) + ; + } +} diff --git a/src/main/java/cn/lihongjie/coal/noteBookChapter/controller/NoteBookChapterController.java b/src/main/java/cn/lihongjie/coal/noteBookChapter/controller/NoteBookChapterController.java new file mode 100644 index 00000000..446e30ba --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBookChapter/controller/NoteBookChapterController.java @@ -0,0 +1,61 @@ +package cn.lihongjie.coal.noteBookChapter.controller; + +import cn.lihongjie.coal.annotation.SysLog; +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.noteBookChapter.dto.CreateNoteBookChapterDto; +import cn.lihongjie.coal.noteBookChapter.dto.NoteBookChapterDto; +import cn.lihongjie.coal.noteBookChapter.dto.NoteBookChapterTreeDto; +import cn.lihongjie.coal.noteBookChapter.dto.UpdateNoteBookChapterDto; +import cn.lihongjie.coal.noteBookChapter.service.NoteBookChapterService; + +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Page; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/noteBookChapter") +@SysLog( + module = "章节管理" +) +@Slf4j +public class NoteBookChapterController { + @Autowired + private NoteBookChapterService service; + + @PostMapping("/create") + public NoteBookChapterDto create(@RequestBody CreateNoteBookChapterDto request) { + return this.service.create(request) + ; + } + + @PostMapping("/update") + public NoteBookChapterDto update(@RequestBody UpdateNoteBookChapterDto request) { + return this.service.update(request) + ; + } + + @PostMapping("/delete") + public Object delete(@RequestBody IdRequest request) { + this.service.delete(request); + return true + ; + } + + @PostMapping("/getById") + public NoteBookChapterDto getById(@RequestBody IdRequest request) { + return this.service.getById(request.getId()) + ; + } + + @PostMapping("/list") + public Page list(@RequestBody CommonQuery request) { + return this.service.list(request) + ; + } +} diff --git a/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/CreateNoteBookChapterDto.java b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/CreateNoteBookChapterDto.java new file mode 100644 index 00000000..9ec2bf6f --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/CreateNoteBookChapterDto.java @@ -0,0 +1,39 @@ +package cn.lihongjie.coal.noteBookChapter.dto; + +import cn.lihongjie.coal.base.dto.CommonDto; + +import lombok.Data; + +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Formula; + +@Data +public class CreateNoteBookChapterDto extends CommonDto { + @Comment("标题") + private String title; + + + @Comment("内容类型 0 html 1 markdown") + private String contentType; + + @Formula( + "(select i.name\n" + + "from t_dictionary d,\n" + + " t_dictionary_item i\n" + + "where d.id = i.dictionary_id\n" + + " and d.code = 'notebook.contentType'\n" + + " and i.code = content_type)") + private String contentTypeName; + + @Comment("内容") + private String content; + + + + + @Comment("父节点") + private String parent; + + + private String noteBook; +} diff --git a/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/NoteBookChapterDto.java b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/NoteBookChapterDto.java new file mode 100644 index 00000000..cac5ef16 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/NoteBookChapterDto.java @@ -0,0 +1,26 @@ +package cn.lihongjie.coal.noteBookChapter.dto; + +import cn.lihongjie.coal.base.dto.CommonDto; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +@Data +public class NoteBookChapterDto extends CommonDto { + @Comment("标题") + private String title; + + + @Comment("内容类型 0 html 1 markdown") + private String contentType; + + private String contentTypeName; + + @Comment("内容") + private String content; + + + + +} diff --git a/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/NoteBookChapterTreeDto.java b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/NoteBookChapterTreeDto.java new file mode 100644 index 00000000..64a78fca --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/NoteBookChapterTreeDto.java @@ -0,0 +1,30 @@ +package cn.lihongjie.coal.noteBookChapter.dto; + +import cn.lihongjie.coal.base.dto.CommonDto; + +import lombok.Data; + +import org.hibernate.annotations.Comment; + +import java.util.List; + +@Data +public class NoteBookChapterTreeDto extends CommonDto { + @Comment("标题") + private String title; + + + @Comment("内容类型 0 html 1 markdown") + private String contentType; + + private String contentTypeName; + + @Comment("内容") + private String content; + + private List children; + + + + +} diff --git a/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/UpdateNoteBookChapterDto.java b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/UpdateNoteBookChapterDto.java new file mode 100644 index 00000000..dbb28815 --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBookChapter/dto/UpdateNoteBookChapterDto.java @@ -0,0 +1,36 @@ +package cn.lihongjie.coal.noteBookChapter.dto; + +import cn.lihongjie.coal.base.dto.CommonDto; + +import lombok.Data; + +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Formula; + +@Data +public class UpdateNoteBookChapterDto extends CommonDto { + @Comment("标题") + private String title; + + + @Comment("内容类型 0 html 1 markdown") + private String contentType; + + @Formula( + "(select i.name\n" + + "from t_dictionary d,\n" + + " t_dictionary_item i\n" + + "where d.id = i.dictionary_id\n" + + " and d.code = 'notebook.contentType'\n" + + " and i.code = content_type)") + private String contentTypeName; + + @Comment("内容") + private String content; + + + + + @Comment("父节点") + private String parent; +} diff --git a/src/main/java/cn/lihongjie/coal/noteBookChapter/entity/NoteBookChapterEntity.java b/src/main/java/cn/lihongjie/coal/noteBookChapter/entity/NoteBookChapterEntity.java new file mode 100644 index 00000000..f887f04f --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBookChapter/entity/NoteBookChapterEntity.java @@ -0,0 +1,57 @@ +package cn.lihongjie.coal.noteBookChapter.entity; + +import cn.lihongjie.coal.base.entity.CommonEntity; +import cn.lihongjie.coal.noteBook.entity.NoteBookEntity; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; + +import lombok.Data; + +import org.hibernate.annotations.Comment; +import org.hibernate.annotations.Formula; + +import java.util.List; + +@Data +@Entity +public class NoteBookChapterEntity extends CommonEntity { + @Comment("标题") + private String title; + + + @Comment("内容类型 0 html 1 markdown") + private String contentType; + + @Formula( + "(select i.name\n" + + "from t_dictionary d,\n" + + " t_dictionary_item i\n" + + "where d.id = i.dictionary_id\n" + + " and d.code = 'notebook.contentType'\n" + + " and i.code = content_type)") + private String contentTypeName; + + @Comment("内容") + private String content; + + + @Comment("子节点") + @OneToMany(cascade = {CascadeType.REMOVE}, mappedBy = "parent") + private List children; + + + + @ManyToOne + @Comment("父节点") + private NoteBookChapterEntity parent; + + + @ManyToOne + private NoteBookEntity noteBook; + + + +} diff --git a/src/main/java/cn/lihongjie/coal/noteBookChapter/mapper/NoteBookChapterMapper.java b/src/main/java/cn/lihongjie/coal/noteBookChapter/mapper/NoteBookChapterMapper.java new file mode 100644 index 00000000..cd72bf5d --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBookChapter/mapper/NoteBookChapterMapper.java @@ -0,0 +1,21 @@ +package cn.lihongjie.coal.noteBookChapter.mapper; + +import cn.lihongjie.coal.base.mapper.BaseMapper; +import cn.lihongjie.coal.base.mapper.CommonMapper; +import cn.lihongjie.coal.noteBookChapter.dto.CreateNoteBookChapterDto; +import cn.lihongjie.coal.noteBookChapter.dto.NoteBookChapterDto; +import cn.lihongjie.coal.noteBookChapter.dto.NoteBookChapterTreeDto; +import cn.lihongjie.coal.noteBookChapter.dto.UpdateNoteBookChapterDto; +import cn.lihongjie.coal.noteBookChapter.entity.NoteBookChapterEntity; + +import org.mapstruct.Mapper; +import org.mapstruct.control.DeepClone; + +@Mapper( + componentModel = org.mapstruct.MappingConstants.ComponentModel.SPRING, + uses = {CommonMapper.class}, + mappingControl = DeepClone.class +) +public interface NoteBookChapterMapper extends BaseMapper { + NoteBookChapterTreeDto toTreeDto(NoteBookChapterEntity noteBookChapterEntity); +} diff --git a/src/main/java/cn/lihongjie/coal/noteBookChapter/repository/NoteBookChapterRepository.java b/src/main/java/cn/lihongjie/coal/noteBookChapter/repository/NoteBookChapterRepository.java new file mode 100644 index 00000000..6382536d --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBookChapter/repository/NoteBookChapterRepository.java @@ -0,0 +1,10 @@ +package cn.lihongjie.coal.noteBookChapter.repository; + +import cn.lihongjie.coal.base.dao.BaseRepository; +import cn.lihongjie.coal.noteBookChapter.entity.NoteBookChapterEntity; + +import org.springframework.stereotype.Repository; + +@Repository +public interface NoteBookChapterRepository extends BaseRepository { +} diff --git a/src/main/java/cn/lihongjie/coal/noteBookChapter/service/NoteBookChapterService.java b/src/main/java/cn/lihongjie/coal/noteBookChapter/service/NoteBookChapterService.java new file mode 100644 index 00000000..675bab3f --- /dev/null +++ b/src/main/java/cn/lihongjie/coal/noteBookChapter/service/NoteBookChapterService.java @@ -0,0 +1,74 @@ +package cn.lihongjie.coal.noteBookChapter.service; + +import cn.lihongjie.coal.base.dto.CommonQuery; +import cn.lihongjie.coal.base.dto.IdRequest; +import cn.lihongjie.coal.base.service.BaseService; +import cn.lihongjie.coal.noteBookChapter.dto.CreateNoteBookChapterDto; +import cn.lihongjie.coal.noteBookChapter.dto.NoteBookChapterDto; +import cn.lihongjie.coal.noteBookChapter.dto.NoteBookChapterTreeDto; +import cn.lihongjie.coal.noteBookChapter.dto.UpdateNoteBookChapterDto; +import cn.lihongjie.coal.noteBookChapter.entity.NoteBookChapterEntity; +import cn.lihongjie.coal.noteBookChapter.mapper.NoteBookChapterMapper; +import cn.lihongjie.coal.noteBookChapter.repository.NoteBookChapterRepository; + +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.convert.ConversionService; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Sort; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Slf4j +@Transactional +public class NoteBookChapterService + extends BaseService { + @Autowired private NoteBookChapterRepository repository; + + @Autowired private NoteBookChapterMapper mapper; + + @Autowired private ConversionService conversionService; + + public NoteBookChapterDto create(CreateNoteBookChapterDto request) { + NoteBookChapterEntity entity = mapper.toEntity(request); + + this.repository.save(entity); + return getById(entity.getId()); + } + + public NoteBookChapterDto update(UpdateNoteBookChapterDto request) { + NoteBookChapterEntity entity = this.repository.get(request.getId()); + this.mapper.updateEntity(entity, request); + + this.repository.save(entity); + + return getById(entity.getId()); + } + + public void delete(IdRequest request) { + this.repository.deleteAll(this.repository.findAllById(request.getIds())); + + this.repository.deleteAllById(request.getIds()); + } + + public NoteBookChapterDto getById(String id) { + NoteBookChapterEntity entity = repository.get(id); + + return mapper.toDto(entity); + } + + public Page list(CommonQuery query) { + Page page = + repository.findAll( + query.specification(conversionService), + PageRequest.of( + query.getPageNo(), + query.getPageSize(), + Sort.by(query.getOrders()))); + + return page.map(this.mapper::toTreeDto); + } +} diff --git a/src/main/resources/config/dictionary.json b/src/main/resources/config/dictionary.json index 33086dcf..79bdf1bf 100644 --- a/src/main/resources/config/dictionary.json +++ b/src/main/resources/config/dictionary.json @@ -1675,6 +1675,20 @@ } ] }, + { + "code": "notebook.contentType", + "name": "章节内容类型", + "item": [ + { + "code": "0", + "name": "HTML" + }, + { + "code": "1", + "name": "MarkDown" + } + ] + }, { "code": "cronJob.execStatus", "name": "定时任务执行状态",