From d587001b15cf77392ebe5fd439c31d0478d006b6 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Mon, 20 May 2024 17:09:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkServiceImpl.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkServiceImpl.java
index b028021..685c2ba 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/hk/service/impl/HkServiceImpl.java
@@ -8,6 +8,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import org.apache.logging.log4j.util.Strings;
import org.springblade.core.mp.support.Query;
import org.springframework.stereotype.Service;
@@ -197,11 +198,33 @@
* @param hk
*/
public String regionNodesByParams(HkVO hk) {
+ // 先按地市查询对应的区域code
+ String parentIndexCode = getIndexCodeByRegionName(hk,hk.getCityName(),null);
+ if (!Strings.isBlank(parentIndexCode)) {
+ return getIndexCodeByRegionName(hk,hk.getRegionName(),parentIndexCode);
+ }
+ // 返回
+ return null;
+ }
+
+ /**
+ * 按区域名称查询对应的区域code
+ * @param hk
+ * @param regionName
+ * @param parentIndexCode
+ * @return
+ */
+ private String getIndexCodeByRegionName(HkVO hk,String regionName,String parentIndexCode) {
String indexCode = "";
// 组装请求参数
JSONObject jsonBody = new JSONObject();
jsonBody.put("resourceType", "region");
- jsonBody.put("regionName", hk.getRegionName());
+ jsonBody.put("regionName", regionName);
+ if (!Strings.isBlank(parentIndexCode)){
+ jsonBody.put("parentIndexCodes", new ArrayList<>(){{
+ add(parentIndexCode);
+ }});
+ }
jsonBody.put("pageNo", 1);
jsonBody.put("pageSize", 10);
String body = jsonBody.toJSONString();
--
Gitblit v1.9.3