diff --git a/blade-service/logpm-report/pom.xml b/blade-service/logpm-report/pom.xml index ae7ed3676..8c0ceae19 100644 --- a/blade-service/logpm-report/pom.xml +++ b/blade-service/logpm-report/pom.xml @@ -43,6 +43,11 @@ blade-dict-api 3.2.0.RELEASE + + org.springblade + blade-system-api + 3.2.0.RELEASE + org.springblade logpm-factory-data-api diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/MapWarehouseMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/MapWarehouseMapper.xml index 5c41a913f..c43782fb1 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/MapWarehouseMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/MapWarehouseMapper.xml @@ -7,6 +7,7 @@ select id as warehouseId, name as warehouseName, + province_code as provinceCode, latitude as lat, longitude as lng from logpm_platform.logpm_warehouse_warehouse diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java index c57e17a78..09c50cc1b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/largeScreen/impl/MapWarehouseServiceImpl.java @@ -9,6 +9,7 @@ import com.logpm.report.vo.largeScreen.MapWarehouse.WarehouseInfoVO; import com.logpm.report.vo.largeScreen.MapWarehouseVO; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.system.feign.IRegionFeign; import org.springframework.context.annotation.Primary; import org.springframework.stereotype.Service; @@ -25,7 +26,7 @@ import java.util.stream.Collectors; public class MapWarehouseServiceImpl implements IMapWarehouseService { private final MapWarehouseMapper mapWarehouseMapper; - + private final IRegionFeign regionFeign; @Override public List list() { List warehouselist = mapWarehouseMapper.warehouselist(); @@ -45,6 +46,9 @@ public class MapWarehouseServiceImpl implements IMapWarehouseService { mapWarehouseVO.setLng(warehouseInfoVO.getLng()); mapWarehouseVO.setWarehouseId(warehouseInfoVO.getWarehouseId()); mapWarehouseVO.setWarehouseName(warehouseInfoVO.getWarehouseName()); + if (!warehouseInfoVO.getProvinceCode().isEmpty()) { + mapWarehouseVO.setArea(regionFeign.getName(warehouseInfoVO.getProvinceCode())); + } if (null == warehouseLine.get(warehouseInfoVO.getWarehouseId())) { return mapWarehouseVO; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouse/WarehouseInfoVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouse/WarehouseInfoVO.java index e7a82ef84..cb4ed3ec9 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouse/WarehouseInfoVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouse/WarehouseInfoVO.java @@ -9,6 +9,8 @@ public class WarehouseInfoVO { private String warehouseName; + private String provinceCode; + private Float lat; private Float lng; diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouseVO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouseVO.java index dff8077be..1906d4c26 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouseVO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/vo/largeScreen/MapWarehouseVO.java @@ -12,6 +12,8 @@ public class MapWarehouseVO{ private String warehouseName; + private String area; + private Float lat; private Float lng;