|
|
@@ -46,8 +46,8 @@ public class BaseFileController {
|
|
|
value = "like参数,可选值:name",
|
|
|
dataType = "String"
|
|
|
)
|
|
|
- @GetMapping(value = "/getAll")
|
|
|
- public RestResult<?> getAllBaseFilesAndLike(String param, PageForm page, String like) {
|
|
|
+ @GetMapping(value = "/getAllAndLike")
|
|
|
+ public RestResult<?> getAllBaseFilesAndLike(String param, PageForm page, @RequestParam String like) {
|
|
|
Page<BaseFileDTO> BaseFileDTOPage = baseFileService.getAllAndLike(param, page, like);
|
|
|
if (BaseFileDTOPage == null) {
|
|
|
throw new DefinitionException(HttpStatus.INTERNAL_SERVER_ERROR, "获取所有待检测文件失败");
|
|
|
@@ -62,7 +62,7 @@ public class BaseFileController {
|
|
|
dataType = "String"
|
|
|
)
|
|
|
@GetMapping(value = "/getByUserId")
|
|
|
- public RestResult<?> getBaseFiles(String param, PageForm page, @Validated @NotNull @RequestParam Long userId) {
|
|
|
+ public RestResult<?> getBaseFilesByUserId(String param, PageForm page, @Validated @NotNull @RequestParam Long userId) {
|
|
|
Page<BaseFileDTO> BaseFileDTOPage = baseFileService.getByUserId(param, page, userId);
|
|
|
if (BaseFileDTOPage == null) {
|
|
|
throw new DefinitionException(HttpStatus.INTERNAL_SERVER_ERROR, "获取该用户待检测文件失败");
|
|
|
@@ -77,8 +77,8 @@ public class BaseFileController {
|
|
|
value = "like参数,可选值:name",
|
|
|
dataType = "String"
|
|
|
)
|
|
|
- @GetMapping(value = "/getByUserId")
|
|
|
- public RestResult<?> getBaseFilesAndLike(String param, PageForm page, String like, @Validated @NotNull @RequestParam Long userId) {
|
|
|
+ @GetMapping(value = "/getByUserIdAndLike")
|
|
|
+ public RestResult<?> getBaseFilesByUserIdAndLike(String param, PageForm page, String like, @Validated @NotNull @RequestParam Long userId) {
|
|
|
Page<BaseFileDTO> BaseFileDTOPage = baseFileService.getByUserIdAndLike(param, page, userId, like);
|
|
|
if (BaseFileDTOPage == null) {
|
|
|
throw new DefinitionException(HttpStatus.INTERNAL_SERVER_ERROR, "获取所有待检测文件失败");
|