From 61cc60a0f657c2e47477fb7df482444a3b053755 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Thu, 16 Jun 2022 17:19:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArchivesDisplayController.java | 9 +++++- .../controller/ArchivesTypeController.java | 13 +++----- .../ArchivesDictionaryRepository.java | 20 +++++++++++- .../ArchivesNoSettingRepository.java | 17 ++++++++++ .../service/ArchivesDictionaryService.java | 19 ++++++++++-- .../service/ArchivesNoSettingService.java | 16 ++++++++++ .../service/dto/ArchivesDicStateDTO.java | 18 +++++++++++ .../dto/ArchivesDictionarySmallDTO.java | 2 +- .../service/impl/ArchivesDictionaryImpl.java | 27 ++++++++++++++-- .../service/impl/ArchivesNoSettingImpl.java | 22 +++++++++++++ .../service/impl/ArchivesTypeServiceImpl.java | 31 ------------------- 11 files changed, 146 insertions(+), 48 deletions(-) create mode 100644 archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java create mode 100644 archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesNoSettingService.java create mode 100644 archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDicStateDTO.java create mode 100644 archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesNoSettingImpl.java diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDisplayController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDisplayController.java index 8cee4de..89352fe 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDisplayController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDisplayController.java @@ -1,6 +1,7 @@ package com.storeroom.modules.dictionary.controller; +import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping; import com.storeroom.annotaion.rest.AnonymousPutMapping; import com.storeroom.exception.BaseException; @@ -16,6 +17,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -37,7 +39,6 @@ public class ArchivesDisplayController { return ApiResponse.success(ResponseStatus.SUCCESS); } throw new BaseException("数据异常"); - } @ApiOperation("修改界面浏览设置状态") @@ -47,4 +48,10 @@ public class ArchivesDisplayController { return ApiResponse.success(ResponseStatus.SUCCESS); } +// @ApiOperation("著录界面预览") +// @AnonymousGetMapping("field-name") +// public ApiResponse displayFieldName(@RequestParam Integer isDataType) { +// return ApiResponse.success(archivesDictionaryService.getDisplayFieldName(isDataType)); +// } + } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java index 8548763..39d26fb 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesTypeController.java @@ -11,9 +11,7 @@ import com.storeroom.modules.common.ArchivesTypeEnum; import com.storeroom.modules.dictionary.service.ArchivesDictionaryService; import com.storeroom.modules.dictionary.service.ArchivesTypeService; import com.storeroom.modules.dictionary.service.DictionaryService; -import com.storeroom.modules.dictionary.service.dto.ArcTypeSmallDTO; -import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO; -import com.storeroom.modules.dictionary.service.dto.ArchivesTypeDTO; +import com.storeroom.modules.dictionary.service.dto.*; import com.storeroom.utils.ApiResponse; import com.storeroom.utils.StringUtils; import io.swagger.annotations.Api; @@ -100,12 +98,9 @@ public class ArchivesTypeController { @ApiOperation("门类字段管理") - @AnonymousGetMapping("manage") - public ApiResponse getFieldName(String categoryId) { - if (!StringUtils.isEmpty(categoryId)) { - return ApiResponse.success(archivesDictionaryService.getAll(categoryId)); - } - throw new BaseException("id异常"); + @AnonymousPostMapping("manage") + public ApiResponse getFieldName(@RequestBody ArchivesDicStateDTO dto) { + return ApiResponse.success(archivesDictionaryService.getAll(dto)); } @ApiOperation("通过id查询门类字典") 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 3a60962..7e7f33c 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 @@ -31,6 +31,15 @@ public interface ArchivesDictionaryRepository extends JpaRepository findByCategoryId(String categoryId); + /** + * 通过门类id 和字典数据类型查询 + * + * @param categoryId + * @param isDateType + * @return + */ + List findByCategoryIdAndIsDataType(String categoryId, Integer isDateType); + /** * 通过名称查询 * @@ -40,7 +49,16 @@ public interface ArchivesDictionaryRepository extends JpaRepository querybyName(String fName,String fcName); + List querybyName(String fName, String fcName); + + + /** + * 通过数据类型查询 + * + * @param type + * @return + */ + List findByIsDataType(Integer type); } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java new file mode 100644 index 0000000..babef63 --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java @@ -0,0 +1,17 @@ +package com.storeroom.modules.dictionary.repository; + +import com.storeroom.modules.dictionary.domain.ArchivesNoSetting; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.JpaSpecificationExecutor; + +public interface ArchivesNoSettingRepository extends JpaRepository, JpaSpecificationExecutor { + + + /** + * 根据字典id查询 + * + * @param id 字典id + * @return + */ + ArchivesNoSetting findByDictionaryId(String id); +} 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 0c9b874..acd452d 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 @@ -1,7 +1,7 @@ package com.storeroom.modules.dictionary.service; -import com.storeroom.modules.dictionary.domain.ArchivesDictionary; +import com.storeroom.modules.dictionary.service.dto.ArchivesDicStateDTO; import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO; import com.storeroom.modules.dictionary.service.dto.ArchivesDictionarySmallDTO; import com.storeroom.modules.dictionary.service.dto.ArchivesDisplaySmallDTO; @@ -20,10 +20,10 @@ public interface ArchivesDictionaryService { /** - * 获取所有门类字典字段 + * 获取所有门类常用字段 * @return */ - List getAll(String categoryId); + List getAll(ArchivesDicStateDTO archivesDicStateDTO); /** @@ -69,6 +69,19 @@ public interface ArchivesDictionaryService { */ void ChangeDisplayState(Set archivesDictionarySmallDTOS); +// /** +// * 著录界面预览字段显示 +// * @return +// */ +// List getDisplayFieldName(Integer isDataType); + + + /** + * 判断自动生成 + * @return + */ + Boolean isAutomatic(String id); + diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesNoSettingService.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesNoSettingService.java new file mode 100644 index 0000000..82e705b --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesNoSettingService.java @@ -0,0 +1,16 @@ +package com.storeroom.modules.dictionary.service; + + +/** + * 档案配置规则服务 + */ +public interface ArchivesNoSettingService { + + + /** + * 判断自动生成数据状态 + * @param dicId + * @return + */ + Boolean IsDataState(String dicId); +} diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDicStateDTO.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDicStateDTO.java new file mode 100644 index 0000000..9afc2cc --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDicStateDTO.java @@ -0,0 +1,18 @@ +package com.storeroom.modules.dictionary.service.dto; + + +import lombok.Data; + + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +@Data +public class ArchivesDicStateDTO implements Serializable { + + @NotNull + private String categoryId; + + @NotNull + private Integer isDataType; +} diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionarySmallDTO.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionarySmallDTO.java index 042508e..905df04 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionarySmallDTO.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesDictionarySmallDTO.java @@ -14,6 +14,6 @@ public class ArchivesDictionarySmallDTO implements Serializable { @NotNull private String id; - @NotNull + private Integer sort; } 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 8ceeeb7..dfd135f 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 @@ -4,7 +4,9 @@ package com.storeroom.modules.dictionary.service.impl; import com.storeroom.exception.BaseException; import com.storeroom.modules.dictionary.domain.ArchivesDictionary; import com.storeroom.modules.dictionary.repository.ArchivesDictionaryRepository; +import com.storeroom.modules.dictionary.repository.ArchivesNoSettingRepository; import com.storeroom.modules.dictionary.service.ArchivesDictionaryService; +import com.storeroom.modules.dictionary.service.dto.ArchivesDicStateDTO; import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO; import com.storeroom.modules.dictionary.service.dto.ArchivesDictionarySmallDTO; import com.storeroom.modules.dictionary.service.dto.ArchivesDisplaySmallDTO; @@ -41,8 +43,14 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { } @Override - public List getAll(String categoryId) { - return archivesDictionaryMapper.toDto(archivesDictionaryRepository.findByCategoryId(categoryId)); + public List getAll(ArchivesDicStateDTO archivesDicStateDTO) { + List list= archivesDictionaryRepository.findByCategoryIdAndIsDataType(archivesDicStateDTO.getCategoryId(),archivesDicStateDTO.getIsDataType()); + List dtoList=new ArrayList<>(); + list.forEach(item-> { + ArchivesDictionaryDTO dto=archivesDictionaryMapper.toDto(item); + dtoList.add(dto); + }); + return dtoList; } @Override @@ -139,7 +147,22 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { archivesDictionaryRepository.saveAll(list); } +// @Override +// public List getDisplayFieldName(Integer isDataType) { +// List listDto = new ArrayList<>(); +// List list = archivesDictionaryRepository.findByIsDataType(isDataType); +// list.forEach(item -> { +// ArchivesDictionaryDTO ad = archivesDictionaryMapper.toDto(item); +// listDto.add(ad); +// }); +// return listDto; +// } + @Override + public Boolean isAutomatic(String id) { + + return null; + } } diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesNoSettingImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesNoSettingImpl.java new file mode 100644 index 0000000..ee5f9e5 --- /dev/null +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesNoSettingImpl.java @@ -0,0 +1,22 @@ +package com.storeroom.modules.dictionary.service.impl; + + +import com.storeroom.modules.dictionary.repository.ArchivesNoSettingRepository; +import com.storeroom.modules.dictionary.service.ArchivesNoSettingService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ArchivesNoSettingImpl implements ArchivesNoSettingService { + + private final ArchivesNoSettingRepository ansRepostiory; + + + @Override + public Boolean IsDataState(String dicId) { + + ansRepostiory.findByDictionaryId(dicId); + return null; + } +} 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 fd5001c..8b9b633 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 @@ -55,37 +55,6 @@ public class ArchivesTypeServiceImpl implements ArchivesTypeService { } } -// @Override -// public List buildTree() { -// List arcList = archivesTypeRepository.findAll(); -// List archivesTypeDTOS = archivesTypeMapper.toDto(arcList); -// List trees = new ArrayList<>(); -// Set ids = new HashSet<>(); -// for (ArchivesTypeDTO archivesTypeDTO : archivesTypeDTOS) { -// //如果父节点id为空就是一级菜单 -// if (archivesTypeDTO.getPid() == null) { -// //直接加入树列表 -// trees.add(archivesTypeDTO); -// } -// for (ArchivesTypeDTO at : archivesTypeDTOS) { -// if (archivesTypeDTO.getId().equals(at.getPid())) { -// if (archivesTypeDTO.getChildren() == null) { -// archivesTypeDTO.setChildren(new ArrayList<>()); -// } -// archivesTypeDTO.getChildren().add(at); -// ids.add(at.getId()); -// } -// } -// if (archivesTypeDTO.getChildren() != null && archivesTypeDTO.getCategorySeq() != null) { -// archivesTypeDTO.getChildren().sort(Comparator.reverseOrder()); -// } -// } -// if (trees.size() == 0) { -// trees = archivesTypeDTOS.stream().filter(s -> !ids.contains(s.getId())).collect(Collectors.toList()); -// } -// trees.sort(Comparator.reverseOrder()); -// return trees; -// } @Override public List buildTree() {