diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDicSettingController.java b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDicSettingController.java index be144de..fa79cd6 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDicSettingController.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/controller/ArchivesDicSettingController.java @@ -2,9 +2,11 @@ package com.storeroom.modules.dictionary.controller; import com.storeroom.annotaion.rest.AnonymousDeleteMapping; +import com.storeroom.annotaion.rest.AnonymousGetMapping; import com.storeroom.annotaion.rest.AnonymousPostMapping; import com.storeroom.annotaion.rest.AnonymousPutMapping; import com.storeroom.exception.BaseException; +import com.storeroom.modules.dictionary.service.ArchivesDictionaryService; import com.storeroom.modules.dictionary.service.ArchivesNoSettingService; import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO; import com.storeroom.utils.ApiResponse; @@ -25,19 +27,33 @@ import java.util.Set; public class ArchivesDicSettingController { private final ArchivesNoSettingService arcSettingService; + private final ArchivesDictionaryService archivesDictionaryService; @ApiOperation("新增规则字段") @AnonymousPostMapping("create") - public ApiResponse create(@RequestBody Set archivesNoSettingDTO) { - arcSettingService.create(archivesNoSettingDTO); - return ApiResponse.success(ResponseStatus.SUCCESS); + public ApiResponse create(@RequestBody Set archivesNoSettingDTOS) { + if (archivesNoSettingDTOS.size() != 0 ) { + + archivesNoSettingDTOS.forEach(item -> { + archivesDictionaryService.updateIsDisplayFormat(item.getDictionaryId(), true); + }); + arcSettingService.create(archivesNoSettingDTOS); + return ApiResponse.success(ResponseStatus.SUCCESS); + } + throw new BaseException("数据异常"); } + + + @ApiOperation("移除规则字段") @AnonymousDeleteMapping("delete") public ApiResponse delete(@RequestBody Set archivesNoSettingDTOS) { if (archivesNoSettingDTOS.size() != 0) { + archivesNoSettingDTOS.forEach(item -> { + archivesDictionaryService.updateIsDisplayFormat(item.getDictionaryId(), false); + }); arcSettingService.delete(archivesNoSettingDTOS); return ApiResponse.success(ResponseStatus.SUCCESS); } @@ -63,4 +79,10 @@ public class ArchivesDicSettingController { } throw new BaseException("数据异常"); } + + @ApiOperation("获取规则列表") + @AnonymousGetMapping("list") + public ApiResponse getAll() { + return ApiResponse.success(arcSettingService.getAll()); + } } 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 e60610f..fb90047 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 @@ -83,11 +83,11 @@ public class ArchivesDictrionaryController { @ApiOperation("门类字段管理") @AnonymousGetMapping("manage") - public ApiResponse getFieldName(@RequestParam String categoryId, Integer isDataType,Boolean isInput) { - if (!StringUtils.isEmpty(categoryId) && isDataType != null) { + public ApiResponse getFieldName(@RequestParam String categoryId, Integer isType,Boolean isInput) { + if (!StringUtils.isEmpty(categoryId) && isType != null) { ArchivesDicStateDTO dto = new ArchivesDicStateDTO(); dto.setCategoryId(categoryId); - dto.setIsDataType(isDataType); + dto.setIsType(isType); dto.setIsInput(isInput); return ApiResponse.success(arcdicService.getAll(dto)); } 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 9e7bee9..d387cad 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 @@ -28,11 +28,11 @@ public interface ArchivesDictionaryRepository extends JpaRepository findByCategoryIdAndIsDataTypeAndIsInput(String categoryId, Integer isDateType,Boolean isInput); + List findByCategoryIdAndIsTypeAndIsInput(String categoryId, Integer isType,Boolean isInput); /** * 通过门类id和字典数据类型查询 @@ -40,7 +40,7 @@ public interface ArchivesDictionaryRepository extends JpaRepository findByCategoryIdAndIsDataType(String categoryId, Integer isDateType); + List findByCategoryIdAndIsType(String categoryId, Integer isDateType); /** * 通过名称查询 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 3e7d612..92b1962 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 @@ -103,4 +103,10 @@ public interface ArchivesDictionaryService { * @param archivesDisplaySmallDTOS */ void updateOrderBy(Set archivesDisplaySmallDTOS); + + /** + * 修改isDisplayformat状态 + * @param id / + */ + void updateIsDisplayFormat(String id,Boolean isDisplayformat); } 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 index 8e8e744..1dcf55e 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesNoSettingService.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/ArchivesNoSettingService.java @@ -3,6 +3,7 @@ package com.storeroom.modules.dictionary.service; import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO; +import java.util.List; import java.util.Set; /** @@ -13,6 +14,7 @@ public interface ArchivesNoSettingService { /** * 判断自动生成数据状态 + * * @param dicId * @return */ @@ -21,18 +23,21 @@ public interface ArchivesNoSettingService { /** * 创建规则字段 + * * @param archivesNoSettingDTO / */ void create(Set archivesNoSettingDTO); /** * 删除规则字段 + * * @param archivesNoSettingDTOS / */ void delete(Set archivesNoSettingDTOS); /** * 修改规则字段 + * * @param archivesNoSettingDTOS / */ void update(Set archivesNoSettingDTOS); @@ -40,7 +45,15 @@ public interface ArchivesNoSettingService { /** * 修改排序 + * * @param archivesNoSettingDTOS / */ void sequence(Set archivesNoSettingDTOS); + + /** + * 获取所有规则设置列表 + * + * @return / + */ + List getAll(); } 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 index a72e9ab..3b771bb 100644 --- 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 @@ -14,7 +14,7 @@ public class ArchivesDicStateDTO implements Serializable { private String categoryId; @NotNull - private Integer isDataType; + private Integer isType; @NotNull private Boolean isInput; diff --git a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesNoSettingDTO.java b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesNoSettingDTO.java index 58f7af0..e595150 100644 --- a/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesNoSettingDTO.java +++ b/archives/src/main/java/com/storeroom/modules/dictionary/service/dto/ArchivesNoSettingDTO.java @@ -14,9 +14,9 @@ public class ArchivesNoSettingDTO extends BaseDTO implements Serializable { private String id; - private String filedCnName; + private String fieldCnName; - private String filedName; + private String fieldName; private String connector; 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 3af2fb3..1c33f03 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 @@ -41,9 +41,9 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { public List getAll(ArchivesDicStateDTO archivesDicStateDTO) { List list; if (archivesDicStateDTO.getIsInput() != null) { - list = archivesDictionaryRepository.findByCategoryIdAndIsDataTypeAndIsInput(archivesDicStateDTO.getCategoryId(), archivesDicStateDTO.getIsDataType(), archivesDicStateDTO.getIsInput()); + list = archivesDictionaryRepository.findByCategoryIdAndIsTypeAndIsInput(archivesDicStateDTO.getCategoryId(), archivesDicStateDTO.getIsType(), archivesDicStateDTO.getIsInput()); } else { - list = archivesDictionaryRepository.findByCategoryIdAndIsDataType(archivesDicStateDTO.getCategoryId(), archivesDicStateDTO.getIsDataType()); + list = archivesDictionaryRepository.findByCategoryIdAndIsType(archivesDicStateDTO.getCategoryId(), archivesDicStateDTO.getIsType()); } List dtoList = new ArrayList<>(); list.forEach(item -> { @@ -219,4 +219,11 @@ public class ArchivesDictionaryImpl implements ArchivesDictionaryService { }); } + @Override + public void updateIsDisplayFormat(String id,Boolean isDisplayformat) { + ArchivesDictionary ad=archivesDictionaryRepository.findById(id).orElseGet(ArchivesDictionary::new); + ad.setIsDisplayformat(isDisplayformat); + archivesDictionaryRepository.save(ad); + } + } 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 b6d112d..e2b9b93 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 @@ -4,13 +4,17 @@ 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 com.storeroom.modules.dictionary.service.dto.ArchivesDictionaryDTO; import com.storeroom.modules.dictionary.service.dto.ArchivesNoSettingDTO; import com.storeroom.modules.dictionary.service.mapstruct.ArchivesNoSettingMapper; import com.storeroom.utils.NanoIdUtils; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import java.util.List; import java.util.Set; @Service @@ -78,4 +82,15 @@ public class ArchivesNoSettingImpl implements ArchivesNoSettingService { } }); } + + @Override + public List getAll() { + List ar = ansRepostiory.findAll(Sort.by(Sort.Direction.ASC, "sequence")); + List dtoList = new ArrayList<>(); + ar.forEach(item -> { + ArchivesNoSettingDTO dto = archivesNoSettingMapper.toDto(item); + dtoList.add(dto); + }); + return dtoList; + } }