From a0065c5bd5b6167c906732d06ddae4b2343c4dc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8A=9B?= Date: Thu, 16 Jun 2022 19:22:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ArchivesDisplayController.java | 18 +++++++++++++----- .../controller/ArchivesTypeController.java | 11 ++++++++--- .../ArchivesNoSettingRepository.java | 6 ++++-- .../service/ArchivesDictionaryService.java | 10 ---------- .../service/impl/ArchivesDictionaryImpl.java | 18 ------------------ .../service/impl/ArchivesNoSettingImpl.java | 10 +++++++--- 6 files changed, 32 insertions(+), 41 deletions(-) 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 89352fe..52fe8f0 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 @@ -7,10 +7,12 @@ import com.storeroom.annotaion.rest.AnonymousPutMapping; import com.storeroom.exception.BaseException; import com.storeroom.exception.constant.ResponseStatus; import com.storeroom.modules.dictionary.service.ArchivesDictionaryService; +import com.storeroom.modules.dictionary.service.ArchivesNoSettingService; import com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO; import com.storeroom.modules.dictionary.service.dto.ArchivesDictionarySmallDTO; import com.storeroom.modules.dictionary.service.dto.ArchivesDisplaySmallDTO; import com.storeroom.utils.ApiResponse; +import com.storeroom.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -30,6 +32,7 @@ import java.util.Set; public class ArchivesDisplayController { private final ArchivesDictionaryService archivesDictionaryService; + private final ArchivesNoSettingService archivesNoSettingService; @ApiOperation("修改门类字典排序") @AnonymousPutMapping("sort") @@ -48,10 +51,15 @@ public class ArchivesDisplayController { return ApiResponse.success(ResponseStatus.SUCCESS); } -// @ApiOperation("著录界面预览") -// @AnonymousGetMapping("field-name") -// public ApiResponse displayFieldName(@RequestParam Integer isDataType) { -// return ApiResponse.success(archivesDictionaryService.getDisplayFieldName(isDataType)); -// } + @ApiOperation("自动生成") + @AnonymousGetMapping("auto-state") + public ApiResponse getAuto(@RequestParam String dicId) { + if (!StringUtils.isEmpty(dicId)) { + boolean state = archivesNoSettingService.IsDataState(dicId); + return ApiResponse.success(state); + } + throw new BaseException("id异常"); + } + } 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 39d26fb..2ace9a1 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 @@ -17,7 +17,6 @@ import com.storeroom.utils.StringUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; -import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -98,9 +97,15 @@ public class ArchivesTypeController { @ApiOperation("门类字段管理") - @AnonymousPostMapping("manage") - public ApiResponse getFieldName(@RequestBody ArchivesDicStateDTO dto) { + @AnonymousGetMapping("manage") + public ApiResponse getFieldName(@RequestParam String categoryId, Integer isDateType) { + if (!StringUtils.isEmpty(categoryId) && isDateType != null) { + ArchivesDicStateDTO dto = new ArchivesDicStateDTO(); + dto.setCategoryId(categoryId); + dto.setIsDataType(isDateType); return ApiResponse.success(archivesDictionaryService.getAll(dto)); + } + throw new BaseException("id异常"); } @ApiOperation("通过id查询门类字典") 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 index babef63..70c9d29 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/repository/ArchivesNoSettingRepository.java @@ -7,11 +7,13 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor; public interface ArchivesNoSettingRepository extends JpaRepository, JpaSpecificationExecutor { + + /** * 根据字典id查询 * - * @param id 字典id - * @return + * @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 acd452d..178e106 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 @@ -69,18 +69,8 @@ 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/impl/ArchivesDictionaryImpl.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/impl/ArchivesDictionaryImpl.java index dfd135f..6806ce2 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 @@ -147,22 +147,4 @@ 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 index ee5f9e5..9113a04 100644 --- 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 @@ -1,6 +1,7 @@ package com.storeroom.modules.dictionary.service.impl; +import com.storeroom.modules.dictionary.domain.ArchivesNoSetting; import com.storeroom.modules.dictionary.repository.ArchivesNoSettingRepository; import com.storeroom.modules.dictionary.service.ArchivesNoSettingService; import lombok.RequiredArgsConstructor; @@ -15,8 +16,11 @@ public class ArchivesNoSettingImpl implements ArchivesNoSettingService { @Override public Boolean IsDataState(String dicId) { - - ansRepostiory.findByDictionaryId(dicId); - return null; + boolean state = false; + ArchivesNoSetting ans = ansRepostiory.findByDictionaryId(dicId); + if (ans == null) { + state = true; + } + return state; } }