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

Compare commits

base: attiya:6bab79843e18ef7f7138212d756799d057d67495
Branches Tags
attiya:main
..
compare: attiya:543efcb87a9f813552977b81e5ff77e6ab76afa4
Branches Tags
attiya:main

No commits in common. "6bab79843e18ef7f7138212d756799d057d67495" and "543efcb87a9f813552977b81e5ff77e6ab76afa4" have entirely different histories.
6bab79843e ... 543efcb87a

7 changed files with 10 additions and 35 deletions
Show Stats Expand all files Collapse all files

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

@ -18,7 +18,6 @@ import com.cdzy.ebikeoperate.model.pojo.*;
import com.cdzy.ebikeoperate.service.EbikeAdministrationZoneService;
import com.cdzy.ebikeoperate.service.EbikeOperationRegionService;
import com.cdzy.ebikeoperate.service.EbikeSiteRegionService;
import com.cdzy.ebikeoperate.utils.MinioUtil;
import com.ebike.feign.clients.StaffFeignClient;
import com.ebike.feign.model.rsp.RspBikeInfo;
import com.ebike.feign.model.rsp.StaffFeign;
@ -30,7 +29,6 @@ import jakarta.annotation.Resource;
import jakarta.validation.constraints.NotNull;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.Objects;
@ -72,9 +70,6 @@ public class EbikeRegionController {
@Resource
private EbikeRegionLevelMapper levelMapper;
@Resource
private MinioUtil minioUtil;
/**
* 添加运营区。
*
@ -188,8 +183,8 @@ public class EbikeRegionController {
* @return {@code 200} 添加成功，{@code 500} 添加失败
*/
@PostMapping("saveSite")
public JsonResult<?> saveSite(@RequestBody @Validated ReqSiteRegionDto regionDto, List<MultipartFile> files) throws Exception {
siteRegionService.createSiteRegion(regionDto,files);
public JsonResult<?> saveSite(@RequestBody @Validated ReqSiteRegionDto regionDto) {
siteRegionService.createSiteRegion(regionDto);
return JsonResult.success();
}
@ -254,7 +249,7 @@ public class EbikeRegionController {
*/
@GetMapping("getRegion")
public JsonResult<?> getRegion(@RequestParam(value = "regionId", required = false) Long regionId) {
List<ResEbikeSiteRegionPageDto> list = siteRegionService.listByToken(regionId);
List<EbikeSiteRegion> list = siteRegionService.listByToken(regionId);
return JsonResult.success(list);
}

2
ebike-operate/src/main/java/com/cdzy/ebikeoperate/model/dto/request/ReqSiteRegionDto.java
View File

@ -26,8 +26,6 @@ public class ReqSiteRegionDto {
*/
private String siteName;
private String describe;
/**
* 站点地址
*/

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

@ -103,6 +103,4 @@ public class EbikeOperationRegion implements Serializable {
*/
private Integer operationLevel;
private String describe;
}

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

@ -8,7 +8,6 @@ import com.cdzy.ebikeoperate.model.dto.response.ResEbikeSiteRegionPageDto;
import com.cdzy.ebikeoperate.model.pojo.EbikeSiteRegion;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
@ -24,7 +23,7 @@ public interface EbikeSiteRegionService extends IService<EbikeSiteRegion> {
* 生成站点
* @param regionDto 站点信息
*/
void createSiteRegion(ReqSiteRegionDto regionDto,List<MultipartFile> files) throws Exception;
void createSiteRegion(ReqSiteRegionDto regionDto);
/**
* 修改站点
@ -43,7 +42,7 @@ public interface EbikeSiteRegionService extends IService<EbikeSiteRegion> {
* @param regionId 运营区ID
* @return 站点列表
*/
List<ResEbikeSiteRegionPageDto> listByToken(Long regionId);
List<EbikeSiteRegion> listByToken(Long regionId);
/**
* 获取站点详情

16
ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java
View File

@ -16,7 +16,6 @@ import com.cdzy.ebikeoperate.model.pojo.EbikeOperationRegion;
import com.cdzy.ebikeoperate.model.pojo.EbikePoint;
import com.cdzy.ebikeoperate.model.pojo.EbikeSiteRegion;
import com.cdzy.ebikeoperate.service.EbikeSiteRegionService;
import com.cdzy.ebikeoperate.utils.MinioUtil;
import com.cdzy.ebikeoperate.utils.RedisUtil;
import com.ebike.feign.clients.StaffFeignClient;
import com.ebike.feign.model.rsp.StaffFeign;
@ -28,9 +27,7 @@ import jakarta.annotation.Resource;
import org.locationtech.jts.geom.Coordinate;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import java.io.InputStream;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
@ -64,12 +61,9 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
@Resource
private EbikeOperationRegionMapper operationRegionMapper;
@Resource
private MinioUtil minioUtil;
@Override
public void createSiteRegion(ReqSiteRegionDto regionDto,List<MultipartFile> files) throws Exception {
public void createSiteRegion(ReqSiteRegionDto regionDto) {
Long operationRegionId = regionDto.getOperationRegionId();
EbikeOperationRegion operationRegion = operationRegionMapper.selectOneById(operationRegionId);
if (Objects.isNull(operationRegion)) {
@ -81,10 +75,6 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
siteRegion.setCreatedStaff(staffFeign.getStaffId());
siteRegion.setOrgId(staffFeign.getOrgId());
List<ReqEbikePointDto> points = regionDto.getPoints();
for (MultipartFile file : files) {
InputStream inputStream = file.getInputStream();
minioUtil.uploadFile(inputStream,MinioUtil.BUCKET_SIT,"");
}
this.mapper.insert(siteRegion);
savePoints(points, operationRegionId, siteRegion.getSiteRegionId());
}
@ -118,14 +108,14 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
}
@Override
public List<ResEbikeSiteRegionPageDto> listByToken(Long regionId) {
public List<EbikeSiteRegion> listByToken(Long regionId) {
StaffFeign staffFeign = getStaff();
QueryWrapper queryWrapper = QueryWrapper.create()
.leftJoin(EBIKE_OPERATION_REGION).on(EBIKE_SITE_REGION.OPERATION_REGION_ID.eq(EBIKE_OPERATION_REGION.OPERATION_REGION_ID))
.leftJoin(EBIKE_STAFF_REGION).on(EBIKE_STAFF_REGION.REGION_ID.eq(EBIKE_OPERATION_REGION.OPERATION_REGION_ID))
.where(EBIKE_STAFF_REGION.STAFF_ID.eq(staffFeign.getStaffId()))
.where(EBIKE_STAFF_REGION.REGION_ID.eq(regionId, regionId != null));
return this.mapper.selectListWithRelationsByQueryAs(queryWrapper,ResEbikeSiteRegionPageDto.class);
return this.mapper.selectListByQuery(queryWrapper);
}
@Override

5
ebike-operate/src/main/java/com/cdzy/ebikeoperate/utils/MinioUtil.java
View File

@ -18,11 +18,6 @@ public class MinioUtil {
*/
public final static String BUCKET_OPERATE = "operate-bucket";
/**
*站点附件
*/
public final static String BUCKET_SIT = "site-images";
@Resource
private MinioClient minioClient;

2
ebike-operate/src/test/java/com/cdzy/ebikeoperate/MybatisFlexGenCode.java
View File

@ -20,7 +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_region_level"
"ebike_site_type"
};
@Test