attiya/ebike-share
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

运营区查询、站点类型

Browse Source
This commit is contained in:
attiya 2025-05-06 16:42:59 +08:00
parent 13c5ab59ed
commit b56aa73aa1
6 changed files with 159 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java
View File

@ -6,17 +6,16 @@ import com.cdzy.common.model.JsonResult;
import com.cdzy.common.model.PageParam;
import com.cdzy.ebikeoperate.enums.EbikeRegionInOperation;
import com.cdzy.ebikeoperate.mapper.EbikeRegionoperationMapper;
import com.cdzy.ebikeoperate.mapper.EbikeSiteTypeMapper;
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.ResEbikeOperationRegionDto;
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;
import com.cdzy.ebikeoperate.model.pojo.EbikeOperationRegion;
import com.cdzy.ebikeoperate.model.pojo.EbikeRegionoperation;
import com.cdzy.ebikeoperate.model.pojo.EbikeSiteRegion;
import com.cdzy.ebikeoperate.model.pojo.*;
import com.cdzy.ebikeoperate.service.EbikeAdministrationZoneService;
import com.cdzy.ebikeoperate.service.EbikeOperationRegionService;
import com.cdzy.ebikeoperate.service.EbikeSiteRegionService;
@ -29,7 +28,6 @@ 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.*;
@ -68,6 +66,9 @@ public class EbikeRegionController {
@Resource
private EbikeSiteRegionService siteRegionService;
@Resource
private EbikeSiteTypeMapper siteTypeMapper;
/**
* 添加运营区。
*
@ -158,10 +159,21 @@ public class EbikeRegionController {
*/
@GetMapping("getOperation")
public JsonResult<?> getOperation(@RequestParam(value = "zoneId", required = false) String zoneId) {
List<EbikeOperationRegion> list = operationRegionService.getOperation(zoneId);
List<ResEbikeOperationRegionDto> list = operationRegionService.getOperation(zoneId);
return JsonResult.success(list);
}
/**
* 站点类型列表；
*
* @return {@code 200} 添加成功，{@code 500} 添加失败
*/
@GetMapping("siteType")
public JsonResult<?> siteType() {
List<EbikeSiteType> ebikeSiteTypes = siteTypeMapper.selectAll();
return JsonResult.success(ebikeSiteTypes);
}
/**
* 添加站点。

14
ebike-operate/src/main/java/com/cdzy/ebikeoperate/mapper/EbikeSiteTypeMapper.java Normal file
View File

@ -0,0 +1,14 @@
package com.cdzy.ebikeoperate.mapper;
import com.mybatisflex.core.BaseMapper;
import com.cdzy.ebikeoperate.model.pojo.EbikeSiteType;
/**
* 映射层。
*
* @author attiya
* @since 2025-05-06
*/
public interface EbikeSiteTypeMapper extends BaseMapper<EbikeSiteType> {
}

76
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResEbikeOperationRegionDto.java Normal file
View File

@ -0,0 +1,76 @@
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 ResEbikeOperationRegionDto {
private Long operationRegionId;
/**
* 区域名称
*/
private String operationRegionName;
/**
* 简称
*/
private String simpleName;
/**
* 行政区id
*/
private String zoneId;
/**
* 1、圆形 2、多边形
*/
private Integer shapeType;
/**
* 半径
*/
private Float radius;
/**
* 组织id（运营商id
*/
private Long orgId;
/**
* 创建员工id
*/
private Long createdStaff;
/**
* 创建时间
*/
private LocalDateTime createdTime;
/**
* 修改时间
*/
private LocalDateTime updateTime;
/**
* 修改人
*/
private Long updateStaff;
/**
* 运营区是否运营中：1-是，0-否
*/
private Integer inOperation;
@RelationOneToMany(selfField = "operationRegionId",targetField = "regionId")
private List<EbikePoint> points;
}

46
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeSiteType.java Normal file
View File

@ -0,0 +1,46 @@
package com.cdzy.ebikeoperate.model.pojo;
import com.mybatisflex.annotation.Id;
import com.mybatisflex.annotation.Table;
import java.io.Serializable;
import java.io.Serial;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 实体类。
*
* @author attiya
* @since 2025-05-06
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Table("ebike_site_type")
public class EbikeSiteType implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
/**
* 类型id
*/
@Id
private Long siteTypeId;
/**
* 类型名称
*/
private String siteTypeName;
/**
* 类型值
*/
private Integer siteTypeValue;
}

3
ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeOperationRegionService.java
View File

@ -4,6 +4,7 @@ import com.cdzy.common.model.PageParam;
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.response.ResEbikeOperationRegionDto;
import com.cdzy.ebikeoperate.model.dto.response.ResOperationRegionInfo;
import com.cdzy.ebikeoperate.model.dto.response.ZoneDto;
import com.ebike.feign.model.rsp.RspBikeInfo;
@ -61,7 +62,7 @@ public interface EbikeOperationRegionService extends IService<EbikeOperationRegi
* @param zoneId 行政区域id
* @return 列表
*/
List<EbikeOperationRegion> getOperation(String zoneId);
List<ResEbikeOperationRegionDto> getOperation(String zoneId);
/**
* 获取当前登录用户所有行政区

5
ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java
View File

@ -13,6 +13,7 @@ import com.cdzy.ebikeoperate.model.dto.request.ReqBatchRegionDto;
import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeOperationRegionDto;
import com.cdzy.ebikeoperate.model.dto.request.ReqEbikePointDto;
import com.cdzy.ebikeoperate.model.dto.response.RedisPoint;
import com.cdzy.ebikeoperate.model.dto.response.ResEbikeOperationRegionDto;
import com.cdzy.ebikeoperate.model.dto.response.ResOperationRegionInfo;
import com.cdzy.ebikeoperate.model.dto.response.ZoneDto;
import com.cdzy.ebikeoperate.model.pojo.EbikeAdministrationZone;
@ -128,13 +129,13 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl<EbikeOperationR
}
@Override
public List<EbikeOperationRegion> getOperation(String zoneId) {
public List<ResEbikeOperationRegionDto> getOperation(String zoneId) {
StaffFeign staffFeign = getStaff();
QueryWrapper queryWrapper = QueryWrapper.create()
.leftJoin(EBIKE_STAFF_REGION).on(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(EBIKE_STAFF_REGION.REGION_ID))
.where(EBIKE_STAFF_REGION.STAFF_ID.eq(staffFeign.getStaffId()))
.where(EBIKE_OPERATION_REGION.ZONE_ID.eq(zoneId, StringUtil.hasText(zoneId)));
return this.mapper.selectListByQuery(queryWrapper);
return this.mapper.selectListWithRelationsByQueryAs(queryWrapper,ResEbikeOperationRegionDto.class);
}
@Override