From 13c5ab59ed03c97fda813a8445a3f43bd992a686 Mon Sep 17 00:00:00 2001 From: attiya <2413103649@qq.com> Date: Tue, 6 May 2025 16:27:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AB=99=E7=82=B9=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EbikeRegionController.java | 14 +++ .../response/ResEbikeSiteRegionInfoDto.java | 108 ++++++++++++++++++ .../service/EbikeSiteRegionService.java | 8 ++ .../impl/EbikeSiteRegionServiceImpl.java | 6 + .../cdzy/ebikeoperate/MybatisFlexGenCode.java | 6 +- 5 files changed, 137 insertions(+), 5 deletions(-) create mode 100644 ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java index 269ba36a..4c2021bf 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java @@ -10,6 +10,7 @@ import com.cdzy.ebikeoperate.model.dto.request.ReqAuthorizeOperationDto; import com.cdzy.ebikeoperate.model.dto.request.ReqBatchRegionDto; import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeOperationRegionDto; import com.cdzy.ebikeoperate.model.dto.request.ReqSiteRegionDto; +import com.cdzy.ebikeoperate.model.dto.response.ResEbikeSiteRegionInfoDto; import com.cdzy.ebikeoperate.model.dto.response.ResOperationRegionInfo; import com.cdzy.ebikeoperate.model.dto.response.ZoneDto; import com.cdzy.ebikeoperate.model.pojo.EbikeAdministrationZone; @@ -28,6 +29,7 @@ import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.core.update.UpdateChain; import com.mybatisflex.core.util.StringUtil; import jakarta.annotation.Resource; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -190,6 +192,18 @@ public class EbikeRegionController { return JsonResult.success(page); } + /** + * 站点详情。 + * + * @param siteRegionId 站点ID + * @return {@code 200} 添加成功，{@code 500} 添加失败 + */ + @GetMapping("siteInfo") + public JsonResult siteInfo(@NotNull(message = "站点ID不能为空") Long siteRegionId) { + ResEbikeSiteRegionInfoDto info = siteRegionService.siteInfo(siteRegionId); + return JsonResult.success(info); + } + /** * 修改站点。 * diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java new file mode 100644 index 00000000..4a049995 --- /dev/null +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeSiteRegionInfoDto.java @@ -0,0 +1,108 @@ +package com.cdzy.ebikeoperate.model.dto.response; + +import com.cdzy.ebikeoperate.model.pojo.EbikePoint; +import com.mybatisflex.annotation.RelationOneToMany; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +/** + * @author attiya + * @since 2025-05-06 + */ +@Data +public class ResEbikeSiteRegionInfoDto { + + /** + * 站点ID + */ + private Long siteRegionId; + + /** + * 运营区ID + */ + private Long operationRegionId; + + /** + * 站点名称 + */ + private String siteName; + + /** + * 站点地址 + */ + private String siteAdress; + + /** + * 站点类型 + */ + private Integer siteType; + + /** + * 站点级别 + */ + private Integer siteLevel; + + /** + * 经度 + */ + private Double siteLng; + + /** + * 纬度 + */ + private Double siteLat; + + /** + * 1、圆形 2、多边形 + */ + private Integer shapeType; + + /** + * 半径 + */ + private Float radius; + + /** + * 可停数量 + */ + private Integer allowedParkingNum; + + /** + * 最大可停 + */ + private Integer allowedParkingMax; + + /** + * 组织id（运营商id + */ + private Long orgId; + + /** + * 创建员工id + */ + private Long createdStaff; + + /** + * 创建时间 + */ + private LocalDateTime createdTime; + + /** + * 修改时间 + */ + private LocalDateTime updateTime; + + /** + * 修改人 + */ + private Long updateStaff; + + /** + * 边缘点列表 + */ + @RelationOneToMany(selfField = "siteRegionId",targetField = "regionId") + private List points; + +} diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSiteRegionService.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSiteRegionService.java index b611c8ca..605fb0ea 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSiteRegionService.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSiteRegionService.java @@ -2,6 +2,7 @@ package com.cdzy.ebikeoperate.service; import com.cdzy.ebikeoperate.model.dto.request.ReqBatchRegionDto; import com.cdzy.ebikeoperate.model.dto.request.ReqSiteRegionDto; +import com.cdzy.ebikeoperate.model.dto.response.ResEbikeSiteRegionInfoDto; import com.cdzy.ebikeoperate.model.pojo.EbikeSiteRegion; import com.mybatisflex.core.service.IService; @@ -39,4 +40,11 @@ public interface EbikeSiteRegionService extends IService { * @return 站点列表 */ List listByToken(Long regionId); + + /** + * 获取站点详情 + * @param siteRegionId 站点ID + * @return 详情 + */ + ResEbikeSiteRegionInfoDto siteInfo(Long siteRegionId); } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java index dd307681..7c4aa119 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java @@ -8,6 +8,7 @@ import com.cdzy.ebikeoperate.mapper.EbikeSiteRegionMapper; import com.cdzy.ebikeoperate.model.dto.request.ReqBatchRegionDto; import com.cdzy.ebikeoperate.model.dto.request.ReqEbikePointDto; import com.cdzy.ebikeoperate.model.dto.request.ReqSiteRegionDto; +import com.cdzy.ebikeoperate.model.dto.response.ResEbikeSiteRegionInfoDto; import com.cdzy.ebikeoperate.model.pojo.EbikeOperationRegion; import com.cdzy.ebikeoperate.model.pojo.EbikePoint; import com.cdzy.ebikeoperate.model.pojo.EbikeSiteRegion; @@ -110,6 +111,11 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl points, Long areaId, Long siteRegionId) { List list = new ArrayList<>(); List vertices = new ArrayList<>(); diff --git a/ebike-operate/src/test/java/com/cdzy/ebikeoperate/MybatisFlexGenCode.java b/ebike-operate/src/test/java/com/cdzy/ebikeoperate/MybatisFlexGenCode.java index 8d6098cc..e6b2cf35 100644 --- a/ebike-operate/src/test/java/com/cdzy/ebikeoperate/MybatisFlexGenCode.java +++ b/ebike-operate/src/test/java/com/cdzy/ebikeoperate/MybatisFlexGenCode.java @@ -20,11 +20,7 @@ public class MybatisFlexGenCode { private static final String mapperPath="D:/Project/克能单车/resources/mapper"; private static final String packageName ="com.cdzy.ebikeoperate"; private static final String[] tables= new String[]{ - "ebike_sys_roperateset", - "ebike_sys_rusecondset", - "ebike_sys_rlockset", - "ebike_sys_rbackset", - "ebike_sys_linktel", + "ebike_site_type" }; @Test