From 4a8ff39b0fab0627ef8f7459587d514cc01c3676 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 20 十月 2025 10:52:02 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 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 a2aa471..5cb15bf 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
@@ -111,6 +111,12 @@
.set(JkCustomer::getLatitude,jkCustomer.getLatitude())
.set(JkCustomer::getLongitude,jkCustomer.getLongitude())
.set(JkCustomer::getEditor,jkCustomer.getLoginUserInfo().getId())
+ .set(JkCustomer::getStartDistance,null)
+ .set(JkCustomer::getEndDistance,null)
+ .set(JkCustomer::getStartSteps,null)
+ .set(JkCustomer::getEndSteps,null)
+ .set(JkCustomer::getDistanceStatus,Constants.ZERO)
+ .set(JkCustomer::getDistance,null)
.set(JkCustomer::getEditDate,new Date())
.eq(JkCustomer::getId,jkCustomer.getId())
);
@@ -156,6 +162,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());
@@ -238,7 +245,8 @@
queryWrapper.isNotNull(JkCustomer::getLocation);
queryWrapper.and(wrapper ->{
wrapper.isNull(JkCustomer::getLatitude)
- .or().isNull(JkCustomer::getLongitude); });
+ .or().isNull(JkCustomer::getLongitude)
+ .or().eq(JkCustomer::getDistanceStatus,Constants.TWO);});
//鏌ヨ鍏ㄩ儴鏈夊湴鍧�锛屼絾鏄病鏈夌粡绾害鐨勫鎴蜂俊鎭�
List<JkCustomer> list = jkCustomerMapper.selectList(queryWrapper);
if(list ==null || list.size()==0){
@@ -247,7 +255,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
@@ -265,13 +275,18 @@
jkCustomerMapper.update(null,new UpdateWrapper<JkCustomer>().lambda()
.set(JkCustomer::getLatitude,c.getLatitude())
.set(JkCustomer::getLongitude,c.getLongitude())
+ .set(JkCustomer::getStartDistance,null)
+ .set(JkCustomer::getEndDistance,null)
+ .set(JkCustomer::getStartSteps,null)
+ .set(JkCustomer::getEndSteps,null)
+ .set(JkCustomer::getDistanceStatus,Constants.ZERO)
+ .set(JkCustomer::getDistance,null)
.set(JkCustomer::getEditDate,new Date())
.eq(JkCustomer::getId,c.getId())
);
}
}else{
- log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====鑾峰彇json=========="+json);
- log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====鑾峰彇澶辫触=========="+c.getName()+"-"+c.getLocation());
+ log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====鑾峰彇json=========="+urlStr+"\n"+c.getName()+"\n"+json);
}
}catch (Exception e){
log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====澶辫触=========="+c.getName()+"-"+c.getLocation());
@@ -390,8 +405,17 @@
tModel.setCreator(loginUserInfo.getId());
tModel.setCreateDate(new Date());
tModel.setIsnew(Constants.ONE);
+ tModel.setDistanceStatus(Constants.TWO);//闇�瑕侀噸鏂板畾浣�
+ tModel.setStatus(Constants.ZERO);
+ tModel.setDistanceStatus(Constants.ZERO);
newList.add(tModel);
}else{
+ if(StringUtils.isBlank(model.getLocation()) ||
+ StringUtils.equals(tModel.getLocation().replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5]","")
+ ,model.getLocation().replaceAll("[^a-zA-Z0-9\\u4e00-\\u9fa5]",""))){
+ //濡傛灉浣嶇疆淇℃伅鍙戠敓鍙樺寲
+ tModel.setDistanceStatus(Constants.TWO);//闇�瑕侀噸鏂板畾浣�
+ }
tModel.setIsnew(Constants.ZERO);
updateList.add(tModel);
}
--
Gitblit v1.9.3