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

Compare commits

base: attiya:749672efff05d93a09aaf55741be19e59170c8b2
Branches Tags
attiya:main
..
compare: attiya:3bf604ccd11012d0c0741d80535e8a365792300e
Branches Tags
attiya:main

No commits in common. "749672efff05d93a09aaf55741be19e59170c8b2" and "3bf604ccd11012d0c0741d80535e8a365792300e" have entirely different histories.
749672efff ... 3bf604ccd1

3 changed files with 13 additions and 11 deletions
Show Stats Expand all files Collapse all files

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

@ -29,6 +29,7 @@ import jakarta.annotation.Resource;
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.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
@ -182,9 +183,9 @@ public class EbikeRegionController {
* @param regionDto 创建区域参数 * @param regionDto 创建区域参数
* @return {@code 200} 添加成功，{@code 500} 添加失败 * @return {@code 200} 添加成功，{@code 500} 添加失败
*/ */
@PostMapping(value = "saveSite") @PostMapping("saveSite")
public JsonResult<?> saveSite(@RequestBody @Validated ReqSiteRegionDto regionDto) throws Exception { public JsonResult<?> saveSite(@RequestBody @Validated ReqSiteRegionDto regionDto, List<MultipartFile> files) throws Exception {
siteRegionService.createSiteRegion(regionDto); siteRegionService.createSiteRegion(regionDto,files);
return JsonResult.success(); return JsonResult.success();
} }
@ -218,8 +219,8 @@ public class EbikeRegionController {
* @return {@code 200} 添加成功，{@code 500} 添加失败 * @return {@code 200} 添加成功，{@code 500} 添加失败
*/ */
@PostMapping("updateSite") @PostMapping("updateSite")
public JsonResult<?> updateSite(@RequestBody @Validated ReqSiteRegionDto regionDto) throws Exception { public JsonResult<?> updateSite(@RequestBody @Validated ReqSiteRegionDto regionDto,List<MultipartFile> files) throws Exception {
siteRegionService.updateSiteRegion(regionDto); siteRegionService.updateSiteRegion(regionDto,files);
return JsonResult.success(); return JsonResult.success();
} }

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

@ -8,6 +8,7 @@ import com.cdzy.ebikeoperate.model.dto.response.ResEbikeSiteRegionPageDto;
import com.cdzy.ebikeoperate.model.pojo.EbikeSiteRegion; import com.cdzy.ebikeoperate.model.pojo.EbikeSiteRegion;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService; import com.mybatisflex.core.service.IService;
import org.springframework.web.multipart.MultipartFile;
import java.util.List; import java.util.List;
@ -23,13 +24,13 @@ public interface EbikeSiteRegionService extends IService<EbikeSiteRegion> {
* 生成站点 * 生成站点
* @param regionDto 站点信息 * @param regionDto 站点信息
*/ */
void createSiteRegion(ReqSiteRegionDto regionDto) throws Exception; void createSiteRegion(ReqSiteRegionDto regionDto,List<MultipartFile> files) throws Exception;
/** /**
* 修改站点 * 修改站点
* @param regionDto 站点信息 * @param regionDto 站点信息
*/ */
void updateSiteRegion(ReqSiteRegionDto regionDto) throws Exception; void updateSiteRegion(ReqSiteRegionDto regionDto,List<MultipartFile> files) throws Exception;
/** /**
* 批量删除站点 * 批量删除站点

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

@ -76,7 +76,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
@Override @Override
public void createSiteRegion(ReqSiteRegionDto regionDto) throws Exception { public void createSiteRegion(ReqSiteRegionDto regionDto, List<MultipartFile> files) throws Exception {
Long operationRegionId = regionDto.getOperationRegionId(); Long operationRegionId = regionDto.getOperationRegionId();
EbikeOperationRegion operationRegion = operationRegionMapper.selectOneById(operationRegionId); EbikeOperationRegion operationRegion = operationRegionMapper.selectOneById(operationRegionId);
if (Objects.isNull(operationRegion)) { if (Objects.isNull(operationRegion)) {
@ -89,7 +89,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
siteRegion.setOrgId(staffFeign.getOrgId()); siteRegion.setOrgId(staffFeign.getOrgId());
List<ReqEbikePointDto> points = regionDto.getPoints(); List<ReqEbikePointDto> points = regionDto.getPoints();
this.mapper.insert(siteRegion); this.mapper.insert(siteRegion);
// saveImages(files, siteRegion.getSiteRegionId()); saveImages(files, siteRegion.getSiteRegionId());
savePoints(points, operationRegionId, siteRegion.getSiteRegionId()); savePoints(points, operationRegionId, siteRegion.getSiteRegionId());
} }
@ -133,7 +133,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
} }
@Override @Override
public void updateSiteRegion(ReqSiteRegionDto regionDto) throws Exception { public void updateSiteRegion(ReqSiteRegionDto regionDto, List<MultipartFile> files) throws Exception {
Long operationRegionId = regionDto.getOperationRegionId(); Long operationRegionId = regionDto.getOperationRegionId();
EbikeOperationRegion operationRegion = operationRegionMapper.selectOneById(operationRegionId); EbikeOperationRegion operationRegion = operationRegionMapper.selectOneById(operationRegionId);
if (Objects.isNull(operationRegion)) { if (Objects.isNull(operationRegion)) {
@ -149,7 +149,7 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
if (points != null && !points.isEmpty()) { if (points != null && !points.isEmpty()) {
updatePoints(points, operationRegionId, regionDto.getSiteRegionId()); updatePoints(points, operationRegionId, regionDto.getSiteRegionId());
} }
// updateImages(files,regionDto.getSiteRegionId()); updateImages(files,regionDto.getSiteRegionId());
} }
@Override @Override