增加仓库的区域

blade-service/logpm-report/pom.xml

@@ -43,6 +43,11 @@
             <artifactId>blade-dict-api</artifactId>
             <version>3.2.0.RELEASE</version>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-system-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+        </dependency>
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>logpm-factory-data-api</artifactId>

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

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<MapWarehouseVO> list() {
 		List<WarehouseInfoVO> 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;

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;

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;