diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java index 1607fec73..e881cb2ef 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java +++ b/esua-epdc/epdc-admin/epdc-admin-server/src/main/java/com/elink/esua/epdc/service/impl/SysDeptServiceImpl.java @@ -47,7 +47,7 @@ import com.elink.esua.epdc.service.GisGridService; import com.elink.esua.epdc.service.GisService; import com.elink.esua.epdc.service.SysDeptService; import com.elink.esua.epdc.service.SysUserService; -import com.elink.esua.epdc.utils.ArcGISUtil; +import com.elink.esua.epdc.utils.HttpUtil; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import lombok.extern.slf4j.Slf4j; @@ -109,7 +109,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl list = new ArrayList<>(); - Map urlParams = new HashMap<>(); - String resultStr = arcGISUtil.getGisStr(urlParams); + String resultStr = httpUtil.getGisStr(new HashMap<>()); JSONObject toResult = JSON.parseObject(resultStr); JSONArray jsonArray = JSON.parseArray(toResult.get("features").toString()); @@ -1422,7 +1421,7 @@ public class SysDeptServiceImpl extends BaseServiceImpl headerMap = new HashMap<>(4); + Map headerMap = new HashMap<>(2); Map paramsMap = new HashMap<>(8); paramsMap.put("where", "1=1"); @@ -65,5 +74,35 @@ public class ArcGISUtil { return data; } + /** + * 获取公司信息 + * + * @param urlParams + * @return java.lang.String + * @author zhy + * @date 2022/9/6 9:53 + */ + public String getCompanyStr(Map urlParams) { + String key = RedisKeys.getCompanyKey(); + Object obj = redisUtils.get(key); + if (null != obj) { + return (String) obj; + } + Map headerMap = new HashMap<>(4); + + Map paramsMap = new HashMap<>(8); + paramsMap.put("where", "1=1"); + paramsMap.put("outFields", "网格名称,网格编码"); + paramsMap.put("f", "pjson"); + + String data = httpClientUtils.sendPostAndHeader(GET_COMPANY_URL, paramsMap, headerMap).getResult(); + + if (null == data) { + throw new RenException("公司信息获取失败"); + } + + redisUtils.set(key, data, RedisUtils.DEFAULT_EXPIRE); + return data; + } } diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 57907a9d4..ed1f6f4ef 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 57907a9d4a48175ed5a5ef68fd73efe577945059 +Subproject commit ed1f6f4ef632059e42f23759eb09be038f806b13