From 4c41dbc24ac3dd176c925d77b2342a2ec41dc4fc Mon Sep 17 00:00:00 2001
From: jkcdev <dingchao@jkcchina.com>
Date: Wed, 23 Apr 2025 17:26:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AEID=E5=8F=8D=E5=90=91=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=85=A8=E7=A7=B0=EF=BC=8C=E5=8C=85=E6=8B=AC=E7=9C=81=E3=80=81?=
 =?UTF-8?q?=E5=B8=82=E3=80=81=E5=8E=BF=E5=8C=BA=EF=BC=8C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=BAjson=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EbikeOperateSystemInfoController.java     | 13 ++++++++
 .../EbikeAdministrationZoneServiceImpl.java   | 31 +++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeOperateSystemInfoController.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeOperateSystemInfoController.java
index 32abb5a5..dee73cc0 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeOperateSystemInfoController.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeOperateSystemInfoController.java
@@ -1,6 +1,7 @@
 package com.cdzy.ebikeoperate.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.cdzy.common.enums.Code;
 import com.cdzy.common.model.JsonResult;
 import com.cdzy.ebikeoperate.model.dto.request.ReqEbikeComponentTypeInfoDto;
@@ -148,6 +149,18 @@ public class EbikeOperateSystemInfoController {
         return JsonResult.success(list);
     }
 
+    /**
+     * 根据行政区划id获取行政区划全称。
+     *
+     * @param zoneId 行政区划id
+     * @return 行政区划全称
+     */
+    @GetMapping("ebikeAdministrationZoneFullName")
+    public JsonResult<?> ebikeAdministrationZoneFullName(@RequestParam(name = "zoneId") String zoneId) {
+        JSONObject fullName = ebikeAdministrationZoneService.getFullNameByZoneId(zoneId);
+        return fullName == null?JsonResult.failed("获取行政区划全称失败") :JsonResult.success(fullName);
+    }
+
     /**
      * 生成二维码 (png图像base64串)。
      * @param content 二维码内容
diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeAdministrationZoneServiceImpl.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeAdministrationZoneServiceImpl.java
index db92dd6d..be997df7 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeAdministrationZoneServiceImpl.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeAdministrationZoneServiceImpl.java
@@ -1,5 +1,6 @@
 package com.cdzy.ebikeoperate.service.impl;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.cdzy.ebikeoperate.mapper.EbikeAdministrationZoneMapper;
 import com.cdzy.ebikeoperate.model.dto.response.EbikeAdministrationZoneDto;
 import com.cdzy.ebikeoperate.model.pojo.EbikeAdministrationZone;
@@ -40,4 +41,34 @@ public class EbikeAdministrationZoneServiceImpl extends ServiceImpl<EbikeAdminis
             return dto;
         }).toList();
     }
+
+    @Override
+    public JSONObject getFullNameByZoneId(String zoneId) {
+        switch (zoneId.length()){
+            case 2:
+                EbikeAdministrationZone province = this.getById(zoneId);
+                if(province != null){
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("province", province.getFullname());
+                    return jsonObject;
+                }
+                break;
+            case 4:
+                EbikeAdministrationZone city = this.getById(zoneId);
+                if(city!= null){
+                    JSONObject jsonObject = getFullNameByZoneId(zoneId.substring(0, 2));
+                    jsonObject.put("city", city.getFullname());
+                    return jsonObject;
+                }
+                break;
+            case 6:
+                EbikeAdministrationZone county = this.getById(zoneId);
+                if(county!= null){
+                    JSONObject jsonObject = getFullNameByZoneId(zoneId.substring(0, 4));
+                    jsonObject.put("county", county.getFullname());
+                    return jsonObject;
+                }
+        }
+        return null;
+    }
 }

From e75a55a07aae5f1a94fb00afdc4d7abc4e683369 Mon Sep 17 00:00:00 2001
From: jkcdev <dingchao@jkcchina.com>
Date: Wed, 23 Apr 2025 17:26:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AEID=E5=8F=8D=E5=90=91=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=85=A8=E7=A7=B0=EF=BC=8C=E5=8C=85=E6=8B=AC=E7=9C=81=E3=80=81?=
 =?UTF-8?q?=E5=B8=82=E3=80=81=E5=8E=BF=E5=8C=BA=EF=BC=8C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=BAjson=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ebikeoperate/service/EbikeAdministrationZoneService.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeAdministrationZoneService.java b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeAdministrationZoneService.java
index d92a23a7..7b7452d9 100644
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeAdministrationZoneService.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeAdministrationZoneService.java
@@ -1,5 +1,6 @@
 package com.cdzy.ebikeoperate.service;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.cdzy.ebikeoperate.model.dto.response.EbikeAdministrationZoneDto;
 import com.cdzy.ebikeoperate.model.pojo.EbikeAdministrationZone;
 import com.cdzy.ebikeoperate.model.pojo.EbikeComponentTypeInfo;
@@ -21,4 +22,6 @@ public interface EbikeAdministrationZoneService extends IService<EbikeAdministra
      * @return 列表
      */
     List<EbikeAdministrationZoneDto>  getAdministrationZoneList(String parentId);
+
+    JSONObject getFullNameByZoneId(String zoneId);
 }