站点详情
This commit is contained in:
parent
7facc70f15
commit
13c5ab59ed
@ -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.ReqBatchRegionDto;
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeOperationRegionDto;
|
import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeOperationRegionDto;
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqSiteRegionDto;
|
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.ResOperationRegionInfo;
|
||||||
import com.cdzy.ebikeoperate.model.dto.response.ZoneDto;
|
import com.cdzy.ebikeoperate.model.dto.response.ZoneDto;
|
||||||
import com.cdzy.ebikeoperate.model.pojo.EbikeAdministrationZone;
|
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.update.UpdateChain;
|
||||||
import com.mybatisflex.core.util.StringUtil;
|
import com.mybatisflex.core.util.StringUtil;
|
||||||
import jakarta.annotation.Resource;
|
import jakarta.annotation.Resource;
|
||||||
|
import jakarta.validation.constraints.NotBlank;
|
||||||
import jakarta.validation.constraints.NotNull;
|
import jakarta.validation.constraints.NotNull;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@ -190,6 +192,18 @@ public class EbikeRegionController {
|
|||||||
return JsonResult.success(page);
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改站点。
|
* 修改站点。
|
||||||
*
|
*
|
||||||
|
|||||||
@ -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<EbikePoint> points;
|
||||||
|
|
||||||
|
}
|
||||||
@ -2,6 +2,7 @@ package com.cdzy.ebikeoperate.service;
|
|||||||
|
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqBatchRegionDto;
|
import com.cdzy.ebikeoperate.model.dto.request.ReqBatchRegionDto;
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqSiteRegionDto;
|
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.cdzy.ebikeoperate.model.pojo.EbikeSiteRegion;
|
||||||
import com.mybatisflex.core.service.IService;
|
import com.mybatisflex.core.service.IService;
|
||||||
|
|
||||||
@ -39,4 +40,11 @@ public interface EbikeSiteRegionService extends IService<EbikeSiteRegion> {
|
|||||||
* @return 站点列表
|
* @return 站点列表
|
||||||
*/
|
*/
|
||||||
List<EbikeSiteRegion> listByToken(Long regionId);
|
List<EbikeSiteRegion> listByToken(Long regionId);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取站点详情
|
||||||
|
* @param siteRegionId 站点ID
|
||||||
|
* @return 详情
|
||||||
|
*/
|
||||||
|
ResEbikeSiteRegionInfoDto siteInfo(Long siteRegionId);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -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.ReqBatchRegionDto;
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqEbikePointDto;
|
import com.cdzy.ebikeoperate.model.dto.request.ReqEbikePointDto;
|
||||||
import com.cdzy.ebikeoperate.model.dto.request.ReqSiteRegionDto;
|
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.EbikeOperationRegion;
|
||||||
import com.cdzy.ebikeoperate.model.pojo.EbikePoint;
|
import com.cdzy.ebikeoperate.model.pojo.EbikePoint;
|
||||||
import com.cdzy.ebikeoperate.model.pojo.EbikeSiteRegion;
|
import com.cdzy.ebikeoperate.model.pojo.EbikeSiteRegion;
|
||||||
@ -110,6 +111,11 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
|
|||||||
return this.mapper.selectListByQuery(queryWrapper);
|
return this.mapper.selectListByQuery(queryWrapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ResEbikeSiteRegionInfoDto siteInfo(Long siteRegionId) {
|
||||||
|
return this.mapper.selectOneWithRelationsByIdAs(siteRegionId,ResEbikeSiteRegionInfoDto.class);
|
||||||
|
}
|
||||||
|
|
||||||
void savePoints(List<ReqEbikePointDto> points, Long areaId, Long siteRegionId) {
|
void savePoints(List<ReqEbikePointDto> points, Long areaId, Long siteRegionId) {
|
||||||
List<EbikePoint> list = new ArrayList<>();
|
List<EbikePoint> list = new ArrayList<>();
|
||||||
List<Coordinate> vertices = new ArrayList<>();
|
List<Coordinate> vertices = new ArrayList<>();
|
||||||
|
|||||||
@ -20,11 +20,7 @@ public class MybatisFlexGenCode {
|
|||||||
private static final String mapperPath="D:/Project/克能单车/resources/mapper";
|
private static final String mapperPath="D:/Project/克能单车/resources/mapper";
|
||||||
private static final String packageName ="com.cdzy.ebikeoperate";
|
private static final String packageName ="com.cdzy.ebikeoperate";
|
||||||
private static final String[] tables= new String[]{
|
private static final String[] tables= new String[]{
|
||||||
"ebike_sys_roperateset",
|
"ebike_site_type"
|
||||||
"ebike_sys_rusecondset",
|
|
||||||
"ebike_sys_rlockset",
|
|
||||||
"ebike_sys_rbackset",
|
|
||||||
"ebike_sys_linktel",
|
|
||||||
};
|
};
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user