From 9852b16ec51c85fd808dc68b75eadfebd117a27e Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 18:27:06 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java
index 85cf953..acd94f9 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java
@@ -156,6 +156,7 @@
.selectAs(Category::getName,JkCustomer::getCategoryName)
.leftJoin(JkLine.class,JkLine::getId,JkCustomer::getLineId )
.leftJoin(Category.class,Category::getId,JkLine::getCategoryId );
+ queryWrapper.eq( pageWrap.getModel().getDistanceStatus()!=null,JkCustomer::getDistanceStatus, pageWrap.getModel().getDistanceStatus());
queryWrapper.eq( pageWrap.getModel().getCategoryId()!=null,JkLine::getCategoryId, pageWrap.getModel().getCategoryId());
queryWrapper.eq(StringUtils.isNotBlank(pageWrap.getModel().getLineWeeks()),JkLine::getWeeks, pageWrap.getModel().getLineWeeks());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getCategoryName()),Category::getName, pageWrap.getModel().getCategoryName());
@@ -236,6 +237,7 @@
try {
LambdaQueryWrapper<JkCustomer> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.isNotNull(JkCustomer::getLocation);
+ queryWrapper.isNotNull(JkCustomer::getLocation);
queryWrapper.and(wrapper ->{
wrapper.isNull(JkCustomer::getLatitude)
.or().isNull(JkCustomer::getLongitude); });
@@ -247,7 +249,9 @@
String url = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GAODE_LOCATION_GEOAPI_URL).getCode();
for(JkCustomer c : list){
try {
- String result = HttpsUtil.get(url.replace("${param}",c.getLocation()),true);
+ String urlStr =url.replace("${param}"
+ ,c.getLocation().replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5]", ""));
+ String result = HttpsUtil.get(urlStr,true);
JSONObject json = JSONObject.parseObject(result);
if(json!=null
&& json.getInteger("status")!=null
@@ -271,7 +275,7 @@
}
}else{
log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====鑾峰彇json=========="+json);
- log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====鑾峰彇澶辫触=========="+c.getName()+"-"+c.getLocation());
+ log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====鑾峰彇澶辫触=========="+urlStr+c.getName()+"-"+c.getLocation());
}
}catch (Exception e){
log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====澶辫触=========="+c.getName()+"-"+c.getLocation());
--
Gitblit v1.9.3