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 fa79cd6..71f3ef1 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 @@ -10,12 +10,14 @@ 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; +import com.storeroom.utils.StringUtils; import com.storeroom.utils.enums.ResponseStatus; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; 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.Set; @@ -82,7 +84,10 @@ public class ArchivesDicSettingController { @ApiOperation("获取规则列表") @AnonymousGetMapping("list") - public ApiResponse getAll() { - return ApiResponse.success(arcSettingService.getAll()); + public ApiResponse getAll(@RequestParam String categoryId) { + if (!StringUtils.isEmpty(categoryId)) { + return ApiResponse.success(arcSettingService.findByCategoryId(categoryId)); + } + throw new BaseException("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 0caf3c7..73467b5 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 @@ -5,6 +5,8 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; import org.springframework.data.jpa.repository.Query; +import java.util.List; + public interface ArchivesNoSettingRepository extends JpaRepository, JpaSpecificationExecutor { @@ -21,4 +23,7 @@ public interface ArchivesNoSettingRepository extends JpaRepository findByCategoryId(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 index 1dcf55e..4a5075b 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 @@ -55,5 +55,5 @@ public interface ArchivesNoSettingService { * * @return / */ - List getAll(); + List findByCategoryId(String categoryId); } 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 45525e6..a49dcdc 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 @@ -91,8 +91,8 @@ public class ArchivesNoSettingImpl implements ArchivesNoSettingService { } @Override - public List getAll() { - List ar = ansRepostiory.findAll(Sort.by(Sort.Direction.ASC, "sequence")); + public List findByCategoryId(String categoryId) { + List ar = ansRepostiory.findByCategoryId(categoryId); List dtoList = new ArrayList<>(); ar.forEach(item -> { ArchivesNoSettingDTO dto = archivesNoSettingMapper.toDto(item);