diff --git a/src/main/java/com/youlai/boot/mini/controller/HomePageController.java b/src/main/java/com/youlai/boot/mini/controller/HomePageController.java index 7070ee7..5bc8304 100644 --- a/src/main/java/com/youlai/boot/mini/controller/HomePageController.java +++ b/src/main/java/com/youlai/boot/mini/controller/HomePageController.java @@ -2,7 +2,7 @@ package com.youlai.boot.mini.controller; import com.youlai.boot.common.result.Result; -import com.youlai.boot.mini.model.dto.MapSearch; +import com.youlai.boot.mini.model.dto.MapSearchDTO; import com.youlai.boot.mini.service.StrayAnimalService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -19,7 +19,7 @@ public class HomePageController { @Operation(summary = "根据地图边界获取流浪动物信息(不需要登录)") @RequestMapping(value = "/listByBounds", method = RequestMethod.GET) - public Result listByMapBounds(MapSearch mapSearch) { + public Result listByMapBounds(MapSearchDTO mapSearch) { return Result.success(strayAnimalService.listByMapBounds(mapSearch)); } diff --git a/src/main/java/com/youlai/boot/mini/mapper/MiniStrayAnimalMapper.java b/src/main/java/com/youlai/boot/mini/mapper/MiniStrayAnimalMapper.java index dcb5bd1..65440d5 100644 --- a/src/main/java/com/youlai/boot/mini/mapper/MiniStrayAnimalMapper.java +++ b/src/main/java/com/youlai/boot/mini/mapper/MiniStrayAnimalMapper.java @@ -2,7 +2,7 @@ package com.youlai.boot.mini.mapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.youlai.boot.mini.model.dto.MapSearch; +import com.youlai.boot.mini.model.dto.MapSearchDTO; import com.youlai.boot.mini.model.entity.MiniStrayAnimal; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.youlai.boot.mini.model.query.OwnStrayAnimalQuery; @@ -29,5 +29,5 @@ public interface MiniStrayAnimalMapper extends BaseMapper { StrayAnimalDetailsVO getStrayAnimalDetails(@Param("animalUuid") String animalUuid, @Param("miniUserId") Long miniUserId); - List listByMapBounds(MapSearch mapSearch); + List listByMapBounds(MapSearchDTO mapSearch); } diff --git a/src/main/java/com/youlai/boot/mini/model/dto/MapBoundsRequest.java b/src/main/java/com/youlai/boot/mini/model/dto/MapBoundsDTO.java similarity index 94% rename from src/main/java/com/youlai/boot/mini/model/dto/MapBoundsRequest.java rename to src/main/java/com/youlai/boot/mini/model/dto/MapBoundsDTO.java index 4916f23..88f4ef4 100644 --- a/src/main/java/com/youlai/boot/mini/model/dto/MapBoundsRequest.java +++ b/src/main/java/com/youlai/boot/mini/model/dto/MapBoundsDTO.java @@ -7,7 +7,7 @@ import lombok.Data; * 地图视口边界请求参数 DTO */ @Data -public class MapBoundsRequest { +public class MapBoundsDTO { @Schema(description = "地图窗口左下角经度") private Double southWestLng; diff --git a/src/main/java/com/youlai/boot/mini/model/dto/MapSearch.java b/src/main/java/com/youlai/boot/mini/model/dto/MapSearchDTO.java similarity index 88% rename from src/main/java/com/youlai/boot/mini/model/dto/MapSearch.java rename to src/main/java/com/youlai/boot/mini/model/dto/MapSearchDTO.java index e386e22..cb17c31 100644 --- a/src/main/java/com/youlai/boot/mini/model/dto/MapSearch.java +++ b/src/main/java/com/youlai/boot/mini/model/dto/MapSearchDTO.java @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; */ @EqualsAndHashCode(callSuper = true) @Data -public class MapSearch extends MapBoundsRequest{ +public class MapSearchDTO extends MapBoundsDTO{ @Schema(description = "动物类型,cat-猫,dog-狗,other-其他", example = "cat") private String animalType; diff --git a/src/main/java/com/youlai/boot/mini/service/StrayAnimalService.java b/src/main/java/com/youlai/boot/mini/service/StrayAnimalService.java index d97ea4e..9629cbd 100644 --- a/src/main/java/com/youlai/boot/mini/service/StrayAnimalService.java +++ b/src/main/java/com/youlai/boot/mini/service/StrayAnimalService.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.youlai.boot.mini.model.dto.DeleteStrayAnimalDTO; import com.youlai.boot.mini.model.dto.DeleteStrayAnimalNoteMediaDTO; import com.youlai.boot.mini.model.dto.EditVisibilityDTO; -import com.youlai.boot.mini.model.dto.MapSearch; +import com.youlai.boot.mini.model.dto.MapSearchDTO; import com.youlai.boot.mini.model.entity.MiniStrayAnimal; import com.youlai.boot.mini.model.form.StrayAnimalForm; import com.youlai.boot.mini.model.query.OwnStrayAnimalQuery; @@ -37,6 +37,6 @@ public interface StrayAnimalService extends IService { IPage getOthersCreatedPage(String authorUuid, OwnStrayAnimalQuery queryParams); - List listByMapBounds(MapSearch mapSearch); + List listByMapBounds(MapSearchDTO mapSearch); } diff --git a/src/main/java/com/youlai/boot/mini/service/impl/StrayAnimalServiceImpl.java b/src/main/java/com/youlai/boot/mini/service/impl/StrayAnimalServiceImpl.java index fa81f14..23fabd9 100644 --- a/src/main/java/com/youlai/boot/mini/service/impl/StrayAnimalServiceImpl.java +++ b/src/main/java/com/youlai/boot/mini/service/impl/StrayAnimalServiceImpl.java @@ -24,7 +24,7 @@ import com.youlai.boot.mini.mapper.MiniStrayAnimalNoteMediaMapper; import com.youlai.boot.mini.model.dto.DeleteStrayAnimalDTO; import com.youlai.boot.mini.model.dto.DeleteStrayAnimalNoteMediaDTO; import com.youlai.boot.mini.model.dto.EditVisibilityDTO; -import com.youlai.boot.mini.model.dto.MapSearch; +import com.youlai.boot.mini.model.dto.MapSearchDTO; import com.youlai.boot.mini.model.enums.AnimalNoteMediaTypeEnum; import com.youlai.boot.mini.model.entity.MiniStrayAnimal; import com.youlai.boot.mini.model.entity.MiniStrayAnimalNote; @@ -530,7 +530,7 @@ public class StrayAnimalServiceImpl extends ServiceImpl listByMapBounds(MapSearch mapSearch) { + public List listByMapBounds(MapSearchDTO mapSearch) { if (mapSearch.getNorthEastLng() == null || mapSearch.getNorthEastLat() == null || mapSearch.getSouthWestLng() == null || mapSearch.getSouthWestLat() == null) { throw new MsgException("地图边界参数未完整填写");