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 72550896..d4dfbc70 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 @@ -11,10 +11,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.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.dto.response.*; import com.cdzy.ebikeoperate.model.pojo.*; import com.cdzy.ebikeoperate.service.EbikeAdministrationZoneService; import com.cdzy.ebikeoperate.service.EbikeOperationRegionService; @@ -91,7 +88,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 page = operationRegionService.pageOperationRegion(pageParam, simpleName, regionName, inOperation); + Page page = operationRegionService.pageOperationRegion(pageParam, simpleName, regionName, inOperation); return JsonResult.success(page); } @@ -194,12 +191,13 @@ public class EbikeRegionController { * @return {@code 200} 添加成功，{@code 500} 添加失败 */ @GetMapping("pageSite") - public JsonResult pageSite(@Validated PageParam pageParam, String zoneId, String siteName) { + public JsonResult pageSite(@Validated PageParam pageParam,Long operationRegionDId, 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_SITE_REGION.SITE_NAME.like(siteName, StringUtil.hasText(siteName))) + .where(EBIKE_OPERATION_REGION.OPERATION_REGION_ID.eq(operationRegionDId, Objects.nonNull(operationRegionDId))); Page page = siteRegionService.page(pageParam.getPage(), queryWrapper); return JsonResult.success(page); } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/EbikeOperationRegionPageDto.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/EbikeOperationRegionPageDto.java new file mode 100644 index 00000000..d0e5a367 --- /dev/null +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/EbikeOperationRegionPageDto.java @@ -0,0 +1,82 @@ +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; +} diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResOperationRegionInfo.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResOperationRegionInfo.java index cbf895d6..2e37bc56 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResOperationRegionInfo.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/response/ResOperationRegionInfo.java @@ -33,6 +33,8 @@ public class ResOperationRegionInfo { */ private String zoneId; + private String zoneName; + /** * 1、圆形 2、多边形 */ @@ -81,4 +83,10 @@ public class ResOperationRegionInfo { @RelationOneToMany(selfField = "operationRegionId",targetField = "regionId") private List points; + + /** + * 级别 + */ + private Integer level; + } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeOperationRegion.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeOperationRegion.java index cab695e8..96b3bcc6 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeOperationRegion.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/pojo/EbikeOperationRegion.java @@ -97,4 +97,9 @@ public class EbikeOperationRegion implements Serializable { @Column(isLogicDelete = true,onInsertValue = "0") private Integer isDelete; + /** + * 级别 + */ + private Integer level; + } diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeOperationRegionService.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeOperationRegionService.java index aebe60ba..17bb89ce 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeOperationRegionService.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeOperationRegionService.java @@ -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.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; @@ -36,7 +37,7 @@ public interface EbikeOperationRegionService extends IService pageOperationRegion(PageParam pageParam, String simpleName, String regionName, Integer inOperation); + Page pageOperationRegion(PageParam pageParam, String simpleName, String regionName, Integer inOperation); /** * 根据id查询运营区详情 diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java index f192aa2a..d133be82 100644 --- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java +++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeOperationRegionServiceImpl.java @@ -12,10 +12,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.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.dto.response.*; import com.cdzy.ebikeoperate.model.pojo.EbikeAdministrationZone; import com.cdzy.ebikeoperate.model.pojo.EbikeOperationRegion; import com.cdzy.ebikeoperate.model.pojo.EbikePoint; @@ -92,17 +89,23 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl pageOperationRegion(PageParam pageParam, String simpleName, String regionName, Integer inOperation) { + public Page pageOperationRegion(PageParam pageParam, String simpleName, String regionName, Integer inOperation) { QueryWrapper queryWrapper = QueryWrapper.create() - .where(EBIKE_OPERATION_REGION.SIMPLE_NAME.eq(simpleName, !StringUtils.isEmpty(simpleName))) - .where(EBIKE_OPERATION_REGION.OPERATION_REGION_NAME.eq(regionName, !StringUtils.isEmpty(regionName))) + .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.IN_OPERATION.eq(inOperation, Objects::nonNull)); - return this.mapper.paginate(pageParam.getPage(), queryWrapper); + return this.mapper.paginateAs(pageParam.getPage(), queryWrapper, EbikeOperationRegionPageDto.class); } @Override public ResOperationRegionInfo operationRegionInfo(Long regionId) { - return this.mapper.selectOneWithRelationsByIdAs(regionId, ResOperationRegionInfo.class); + 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); } @Override @@ -123,9 +126,9 @@ public class EbikeOperationRegionServiceImpl extends ServiceImpl 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()); }