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

Compare commits

base: attiya:08da7c2895018aa110d32981fed4a78b4f287326
Branches Tags
attiya:main
..
compare: attiya:e00c55728baf26d0bd9673cbd3ca4510bad1f7fb
Branches Tags
attiya:main

No commits in common. "08da7c2895018aa110d32981fed4a78b4f287326" and "e00c55728baf26d0bd9673cbd3ca4510bad1f7fb" have entirely different histories.
08da7c2895 ... e00c55728b

6 changed files with 20 additions and 117 deletions
Show Stats Expand all files Collapse all files

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

@ -11,7 +11,10 @@ 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.*;
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.*;
import com.cdzy.ebikeoperate.service.EbikeAdministrationZoneService;
import com.cdzy.ebikeoperate.service.EbikeOperationRegionService;
@ -88,7 +91,7 @@ public class EbikeRegionController {
@RequestParam(required = false, name = "simpleName") String simpleName,
@RequestParam(required = false, name = "regionName") String regionName,
@RequestParam(required = false, name = "inOperation") Integer inOperation) {
Page<EbikeOperationRegionPageDto> page = operationRegionService.pageOperationRegion(pageParam, simpleName, regionName, inOperation);
Page<EbikeOperationRegion> page = operationRegionService.pageOperationRegion(pageParam, simpleName, regionName, inOperation);
return JsonResult.success(page);
}
@ -191,13 +194,12 @@ public class EbikeRegionController {
* @return {@code 200} 添加成功，{@code 500} 添加失败
*/
@GetMapping("pageSite")
public JsonResult<?> pageSite(@Validated PageParam pageParam,Long operationRegionDId, String zoneId, String siteName) {
public JsonResult<?> pageSite(@Validated PageParam pageParam, String zoneId, String siteName) {
QueryWrapper queryWrapper = QueryWrapper.create()
.leftJoin(EBIKE_OPERATION_REGION).on(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(EBIKE_SITE_REGION.OPERATION_REGION_ID))
.leftJoin(EBIKE_ADMINISTRATION_ZONE).on(EBIKE_ADMINISTRATION_ZONE.ID.eq(EBIKE_OPERATION_REGION.ZONE_ID))
.where(EBIKE_ADMINISTRATION_ZONE.ID.eq(zoneId,StringUtil.hasText(zoneId)))
.where(EBIKE_SITE_REGION.SITE_NAME.like(siteName, StringUtil.hasText(siteName)))
.where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(operationRegionDId, Objects.nonNull(operationRegionDId)));
.where(EBIKE_SITE_REGION.SITE_NAME.like(siteName, StringUtil.hasText(siteName)));
Page<EbikeSiteRegion> page = siteRegionService.page(pageParam.getPage(), queryWrapper);
return JsonResult.success(page);
}

82
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/EbikeOperationRegionPageDto.java
View File

@ -1,82 +0,0 @@
package com.cdzy.ebikeoperate.model.dto.response;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @author attiya
* @since 2025-05-07
*/
@Data
public class EbikeOperationRegionPageDto {
private Long operationRegionId;
/**
* 区域名称
*/
private String operationRegionName;
/**
* 简称
*/
private String simpleName;
/**
* 行政区id
*/
private String zoneId;
private String zoneName;
/**
* 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;
/**
* 逻辑删除
*/
private Integer isDelete;
/**
* 级别
*/
private Integer level;
}

8
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResOperationRegionInfo.java
View File

@ -33,8 +33,6 @@ public class ResOperationRegionInfo {
*/
private String zoneId;
private String zoneName;
/**
* 1、圆形 2、多边形
*/
@ -83,10 +81,4 @@ public class ResOperationRegionInfo {
@RelationOneToMany(selfField = "operationRegionId",targetField = "regionId")
private List<EbikePoint> points;
/**
* 级别
*/
private Integer level;
}

5
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeOperationRegion.java
View File

@ -97,9 +97,4 @@ public class EbikeOperationRegion implements Serializable {
@Column(isLogicDelete = true,onInsertValue = "0")
private Integer isDelete;
/**
* 级别
*/
private Integer level;
}

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

@ -4,7 +4,6 @@ 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.EbikeOperationRegionPageDto;
import com.cdzy.ebikeoperate.model.dto.response.ResEbikeOperationRegionDto;
import com.cdzy.ebikeoperate.model.dto.response.ResOperationRegionInfo;
import com.cdzy.ebikeoperate.model.dto.response.ZoneDto;
@ -37,7 +36,7 @@ public interface EbikeOperationRegionService extends IService<EbikeOperationRegi
* @param inOperation 是否运营
* @return 分页数据
*/
Page<EbikeOperationRegionPageDto> pageOperationRegion(PageParam pageParam, String simpleName, String regionName, Integer inOperation);
Page<EbikeOperationRegion> pageOperationRegion(PageParam pageParam, String simpleName, String regionName, Integer inOperation);
/**
* 根据id查询运营区详情

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

@ -12,7 +12,10 @@ 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.ReqEbikePointDto;
import com.cdzy.ebikeoperate.model.dto.response.*;
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;
import com.cdzy.ebikeoperate.model.pojo.EbikeOperationRegion;
import com.cdzy.ebikeoperate.model.pojo.EbikePoint;
@ -89,23 +92,17 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl<EbikeOperationR
}
@Override
public Page<EbikeOperationRegionPageDto> pageOperationRegion(PageParam pageParam, String simpleName, String regionName, Integer inOperation) {
public Page<EbikeOperationRegion> pageOperationRegion(PageParam pageParam, String simpleName, String regionName, Integer inOperation) {
QueryWrapper queryWrapper = QueryWrapper.create()
.select(EBIKE_OPERATION_REGION.ALL_COLUMNS,EBIKE_ADMINISTRATION_ZONE.NAME.as(ResOperationRegionInfo::getZoneName))
.leftJoin(EBIKE_ADMINISTRATION_ZONE).on(EBIKE_ADMINISTRATION_ZONE.ID.eq(EBIKE_OPERATION_REGION.ZONE_ID))
.where(EBIKE_OPERATION_REGION.SIMPLE_NAME.eq(simpleName, StringUtils.hasText(simpleName)))
.where(EBIKE_OPERATION_REGION.OPERATION_REGION_NAME.eq(regionName, StringUtils.hasText(regionName)))
.where(EBIKE_OPERATION_REGION.SIMPLE_NAME.eq(simpleName, !StringUtils.isEmpty(simpleName)))
.where(EBIKE_OPERATION_REGION.OPERATION_REGION_NAME.eq(regionName, !StringUtils.isEmpty(regionName)))
.where(EBIKE_OPERATION_REGION.IN_OPERATION.eq(inOperation, Objects::nonNull));
return this.mapper.paginateAs(pageParam.getPage(), queryWrapper, EbikeOperationRegionPageDto.class);
return this.mapper.paginate(pageParam.getPage(), queryWrapper);
}
@Override
public ResOperationRegionInfo operationRegionInfo(Long regionId) {
QueryWrapper queryWrapper = QueryWrapper.create()
.select(EBIKE_OPERATION_REGION.ALL_COLUMNS,EBIKE_ADMINISTRATION_ZONE.NAME.as(ResOperationRegionInfo::getZoneName))
.leftJoin(EBIKE_ADMINISTRATION_ZONE).on(EBIKE_ADMINISTRATION_ZONE.ID.eq(EBIKE_OPERATION_REGION.ZONE_ID))
.where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(regionId));
return this.mapper.selectOneWithRelationsByQueryAs(queryWrapper, ResOperationRegionInfo.class);
return this.mapper.selectOneWithRelationsByIdAs(regionId, ResOperationRegionInfo.class);
}
@Override
@ -126,9 +123,9 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl<EbikeOperationR
@Override
public void delOperation(ReqBatchRegionDto delRegionDto) {
List<EbikeOperationRegion> ebikeOperationRegions = this.mapper.selectListByIds(delRegionDto.getIds());
ebikeOperationRegions.forEach(region ->
delPoints(region.getOrgId(), region.getOperationRegionId())
);
ebikeOperationRegions.forEach(region -> {
delPoints(region.getOrgId(), region.getOperationRegionId());
});
this.mapper.deleteBatchByIds(delRegionDto.getIds());
}