diff --git a/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java b/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java index 9a21763..bd7d17b 100644 --- a/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java +++ b/admin/src/main/java/com/multictrl/common/constant/BusinessConstant.java @@ -77,4 +77,5 @@ public interface BusinessConstant { String TCP_PROTOCOL = "tcp://"; String DRC = "drc_"; String FILE_PATH = "file/"; + String IMAGE_PATH = "image/"; } diff --git a/admin/src/main/java/com/multictrl/modules/business/controller/RouteController.java b/admin/src/main/java/com/multictrl/modules/business/controller/RouteController.java index 01b5364..b545dde 100644 --- a/admin/src/main/java/com/multictrl/modules/business/controller/RouteController.java +++ b/admin/src/main/java/com/multictrl/modules/business/controller/RouteController.java @@ -46,7 +46,7 @@ public class RouteController { }) @RequiresPermissions("bus:route:page") public Result> page(@Parameter(hidden = true) @RequestParam Map params) { - PageData page = routeService.page(params); + PageData page = routeService.pageList(params); return new Result>().ok(page); } diff --git a/admin/src/main/java/com/multictrl/modules/business/service/RouteService.java b/admin/src/main/java/com/multictrl/modules/business/service/RouteService.java index 395c80e..16b8a1a 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/RouteService.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/RouteService.java @@ -1,9 +1,12 @@ package com.multictrl.modules.business.service; +import com.multictrl.common.page.PageData; import com.multictrl.common.service.CrudService; import com.multictrl.modules.business.dto.RouteDTO; import com.multictrl.modules.business.entity.RouteEntity; +import java.util.Map; + /** * 航线信息表 * @@ -12,6 +15,9 @@ import com.multictrl.modules.business.entity.RouteEntity; */ public interface RouteService extends CrudService { + //分页查询 + PageData pageList(Map params); + //新增航线 void saveRoute(RouteDTO routeDTO); diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/MinioServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/MinioServiceImpl.java index 7c7ecc7..32321da 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/impl/MinioServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/MinioServiceImpl.java @@ -138,7 +138,7 @@ public class MinioServiceImpl implements MinioService { throw new RenException(ErrorCode.OSS_UPLOAD_FILE_ERROR, file.getOriginalFilename()); } - return BusinessConstant.ROUTE_IMG_BUCKET + "/" + path; + return BusinessConstant.IMAGE_PATH + BusinessConstant.ROUTE_IMG_BUCKET + "/" + path; } @Override diff --git a/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java b/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java index b687d1f..0c49f61 100644 --- a/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java +++ b/admin/src/main/java/com/multictrl/modules/business/service/impl/RouteServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import cn.hutool.core.util.StrUtil; import com.multictrl.common.constant.BusinessConstant; import com.multictrl.common.exception.ErrorCode; +import com.multictrl.common.page.PageData; import com.multictrl.common.service.impl.CrudServiceImpl; import com.multictrl.common.utils.ConvertUtils; import com.multictrl.common.utils.kmz.KmzUtils; @@ -57,6 +58,15 @@ public class RouteServiceImpl extends CrudServiceImpl pageList(Map params) { + PageData page = page(params); + for (RouteDTO dto : page.getList()) { + dto.setImgUrl(BusinessConstant.IMAGE_PATH + dto.getImgUrl()); + } + return page; + } + @Transactional(rollbackFor = Exception.class) @Override public void saveRoute(RouteDTO routeDTO) { @@ -73,6 +83,8 @@ public class RouteServiceImpl extends CrudServiceImpl