From 319e455428e984786f802f1d9e7c85b303cc00e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Tue, 21 Jun 2022 14:40:13 +0800 Subject: [PATCH] fix bug --- .../ArchivesDictrionaryController.java | 6 ++-- .../ArchivesListSortController.java | 15 ++++++++-- .../ArchivesDictionaryRepository.java | 2 +- .../service/ArchivesDictionaryService.java | 8 +++-- .../service/impl/ArchivesDictionaryImpl.java | 30 ++++++++++++++----- .../service/impl/ArchivesTypeServiceImpl.java | 1 - 6 files changed, 44 insertions(+), 18 deletions(-) diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java index b4f4e36..1ec6a19 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDictrionaryController.java @@ -30,10 +30,10 @@ public class ArchivesDictrionaryController { @ApiOperation("获取隐藏状态字典") - @AnonymousGetMapping("isdispaly") - public ApiResponse getIsDisPlayState(@RequestParam Boolean isDisPlayState) { + @AnonymousGetMapping("is-dispaly") + public ApiResponse getIsDisPlayState(@RequestParam Boolean isDisPlayState,@RequestParam String categoryId) { if (isDisPlayState != null) { - return ApiResponse.success(arcdicService.getIsDisPlayState(isDisPlayState)); + return ApiResponse.success(arcdicService.getIsDisPlayState(isDisPlayState,categoryId)); } throw new BaseException("状态异常"); } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesListSortController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesListSortController.java index 27a22ad..84a01e1 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesListSortController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesListSortController.java @@ -25,13 +25,22 @@ public class ArchivesListSortController { private final ArchivesDictionaryService archivesDictionaryService; - @ApiOperation("修改queue序列排序") @AnonymousPutMapping("update-queue") public ApiResponse updateArcQueue(@RequestBody Set archivesDisplaySmallDTOS) { if (archivesDisplaySmallDTOS.size() != 0 && archivesDisplaySmallDTOS.size() > 1) { - archivesDictionaryService.updateQueue(archivesDisplaySmallDTOS); - return ApiResponse.success(ResponseStatus.SUCCESS); + archivesDictionaryService.updateQueue(archivesDisplaySmallDTOS); + return ApiResponse.success(ResponseStatus.SUCCESS); + } + throw new BaseException("数据异常"); + } + + @ApiOperation("升序降序") + @AnonymousPutMapping("orderby") + public ApiResponse updateOrderBy(@RequestBody Set archivesDisplaySmallDTOS) { + if (archivesDisplaySmallDTOS.size() != 0) { + archivesDictionaryService.updateOrderBy(archivesDisplaySmallDTOS); + return ApiResponse.success(ResponseStatus.SUCCESS); } throw new BaseException("数据异常"); } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java index 50502e8..9e7bee9 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesDictionaryRepository.java @@ -62,7 +62,7 @@ public interface ArchivesDictionaryRepository extends JpaRepository findByIsDisplay(Boolean state); + List findByIsDisplayAndCategoryId(Boolean state,String categoryId); } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesDictionaryService.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesDictionaryService.java index c284ede..55203eb 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesDictionaryService.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesDictionaryService.java @@ -75,7 +75,7 @@ public interface ArchivesDictionaryService { * @param isDisPlayState * @return */ - List getIsDisPlayState(Boolean isDisPlayState); + List getIsDisPlayState(Boolean isDisPlayState,String categoryId); /** @@ -98,5 +98,9 @@ public interface ArchivesDictionaryService { */ void updateQueue(Set archivesDisplaySmallDTO); - + /** + * 修改升序降序状态 + * @param archivesDisplaySmallDTOS + */ + void updateOrderBy(Set archivesDisplaySmallDTOS); } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java index 30d88f2..7259a9f 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java @@ -110,6 +110,7 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { List arc1 = archivesDictionaryRepository.querybyName(arc.getFieldName(), arc.getFieldCnName()); if (arc1.size() == 0) { arc.setId(NanoIdUtils.randomNanoId()); + arc.setIsInput(true); archivesDictionaryRepository.save(arc); } else { throw new BaseException("字段名称不能重复"); @@ -151,8 +152,8 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { } @Override - public List getIsDisPlayState(Boolean isDisPlayState) { - List list = archivesDictionaryRepository.findByIsDisplay(isDisPlayState); + public List getIsDisPlayState(Boolean isDisPlayState, String categoryId) { + List list = archivesDictionaryRepository.findByIsDisplayAndCategoryId(isDisPlayState, categoryId); List list1 = new ArrayList<>(); list.forEach(item -> { ArchivesDictionaryDTO ar = archivesDictionaryMapper.toDto(item); @@ -181,12 +182,12 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { @Override public void updateDisplaryOrder(Set archivesDisplaySmallDTO) { - archivesDisplaySmallDTO.forEach(item->{ + archivesDisplaySmallDTO.forEach(item -> { ArchivesDictionary archivesDictionary = archivesDictionaryRepository.findById(item.getId()).orElseGet(ArchivesDictionary::new); - if (archivesDictionary!=null){ + if (archivesDictionary != null) { archivesDictionary.setDisplayOrder(item.getDisplayOrder()); archivesDictionaryRepository.save(archivesDictionary); - }else { + } else { throw new BaseException("没有找到数据"); } }); @@ -194,12 +195,25 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { @Override public void updateQueue(Set archivesDisplaySmallDTO) { - archivesDisplaySmallDTO.forEach(item->{ + archivesDisplaySmallDTO.forEach(item -> { ArchivesDictionary archivesDictionary = archivesDictionaryRepository.findById(item.getId()).orElseGet(ArchivesDictionary::new); - if (archivesDictionary!=null){ + if (archivesDictionary != null) { archivesDictionary.setQueue(item.getQueue()); archivesDictionaryRepository.save(archivesDictionary); - }else { + } else { + throw new BaseException("没有找到数据"); + } + }); + } + + @Override + public void updateOrderBy(Set archivesDisplaySmallDTOS) { + archivesDisplaySmallDTOS.forEach(item -> { + ArchivesDictionary archivesDictionary = archivesDictionaryRepository.findById(item.getId()).orElseGet(ArchivesDictionary::new); + if (archivesDictionary != null) { + archivesDictionary.setDisplayOrderBy(item.getDisplayOrderBy()); + archivesDictionaryRepository.save(archivesDictionary); + } else { throw new BaseException("没有找到数据"); } }); diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java index 773b744..80ebd43 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesTypeServiceImpl.java @@ -46,7 +46,6 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService { if (archivesType.getPid() == null) { archivesType.setPid("0"); } - archivesType.setPid("0"); archivesType.setId(NanoIdUtils.randomNanoId()); archivesType.setEnName(tableName); archivesTypeRepository.save(archivesType);