fix: 基站接口返回所在城市信息

2 files changed, 20 insertions, 2 deletions

diff --git a/cn-admin/src/main/java/net/geedge/modules/knowledge/entity/Cell.java b/cn-admin/src/main/java/net/geedge/modules/knowledge/entity/Cell.java
index a4631db..4b55f0a 100644
--- a/cn-admin/src/main/java/net/geedge/modules/knowledge/entity/Cell.java
+++ b/cn-admin/src/main/java/net/geedge/modules/knowledge/entity/Cell.java
@@ -1,6 +1,7 @@
 package net.geedge.modules.knowledge.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
@@ -40,4 +41,10 @@ public class Cell {
 
     private String fddSpectrum;
 
+    @TableField(exist = false)
+    private String country;
+    @TableField(exist = false)
+    private String superAdministrativeArea;
+    @TableField(exist = false)
+    private String administrativeArea;
 }
diff --git a/cn-admin/src/main/java/net/geedge/modules/knowledge/service/impl/CellServiceImpl.java b/cn-admin/src/main/java/net/geedge/modules/knowledge/service/impl/CellServiceImpl.java
index 8999fb1..f3b7420 100644
--- a/cn-admin/src/main/java/net/geedge/modules/knowledge/service/impl/CellServiceImpl.java
+++ b/cn-admin/src/main/java/net/geedge/modules/knowledge/service/impl/CellServiceImpl.java
@@ -3,6 +3,7 @@ package net.geedge.modules.knowledge.service.impl;
 import cn.hutool.log.Log;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import net.geedge.common.utils.GeoUtil;
 import net.geedge.common.utils.PageUtils;
 import net.geedge.common.utils.Query;
 import net.geedge.common.utils.Tool;
@@ -33,8 +34,18 @@ public class CellServiceImpl extends ServiceImpl<CellDao, Cell> implements CellS
             params.put("nodebIds", Arrays.asList(nodebIds.split(",")));
         }
         IPage page = this.page(new Query(Cell.class).getPage(params));
-        List<Cell> list = this.baseMapper.queryCellList(page, params);
-        page.setRecords(list);
+        List<Cell> cells = this.baseMapper.queryCellList(page, params);
+        if(Tool.ObjectUtil.isNotEmpty(cells)){
+            cells.stream().forEach(cell -> {
+                Map<String, Object> result = GeoUtil.reverseGeocode(cell.getLongitude(), cell.getLatitude());
+                if(Tool.ObjectUtil.isNotEmpty(result)){
+                    cell.setCountry(result.get("country").toString());
+                    cell.setAdministrativeArea(result.get("administrativeArea").toString());
+                    cell.setSuperAdministrativeArea(result.get("superAdministrativeArea").toString());
+                }
+            });
+        }
+        page.setRecords(cells);
         return new PageUtils(page);
     }