From 63845bd0d5991a940f84549c2bb94a07ffe35664 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期五, 06 三月 2026 09:57:20 +0800
Subject: [PATCH] 钥匙柜大屏
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 56 +++++++++++++++-----------------------------------------
1 files changed, 15 insertions(+), 41 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
index 2c34d74..0a787c2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java
@@ -287,7 +287,7 @@
int index =0;
for (int j = start; j < end; j++) {
try {
- log.error("浜ら�氳鍒�========"+cate.getId()+"/"+cate.getName()+"/"+customerList.get(j).getName()+"=======cirle/index:"+finalI+"/"+index++);
+ log.error("浜ら�氳鍒�========"+customerList.get(j).getName()+"========cirle:"+finalI+"==="+index++);
dealDistancePerCustomer(customerList.get(j),url,date, finalCLatitude, finalCLongitude,customerList);
}catch (Exception e){
@@ -321,7 +321,7 @@
List<JkCustomerNavigation> navigationList = new ArrayList<>();
List<DistanceMapParam> tmpList = new ArrayList<>();
List<DistanceMapParam> distanceMapParamList = getListFromJsonStr(c.getDistance());
- boolean isNew = false,hasError =false;
+ boolean isNew = false;
JkCustomer u =new JkCustomer();
DistanceMapParam t0 = new DistanceMapParam();
t0.setId(-2);//琛ㄧず杩斿洖鍥尯
@@ -344,14 +344,13 @@
//濡傛灉鏈夎矾寰勪俊鎭�
u.setStartSteps(dm.getPolyline());
}
- }else{
- hasError=true;
}
}
tmpList.add(t0);
for(JkCustomer cm : customerList){
//瀹㈡埛鍜屽鎴蜂箣闂寸殑璺濈淇℃伅
+ Thread.sleep(500);
DistanceMapParam t = new DistanceMapParam();
t.setId(cm.getId());
DistanceMapParam param = getParamByCustomerIds( cm.getId(),distanceMapParamList);
@@ -374,15 +373,10 @@
}else{
DistanceCustomerModel dm = DistanceCalculator.calculateDistanceGaode(url,c,cm);
t.setDistance(dm.getDistance() );
- if(dm.getCode() == 1){
- if(dm.getLocations().size()>0){
- //濡傛灉鏈夎矾寰勪俊鎭�
- navigation.setSteps(dm.getPolyline());
- }
- }else{
- hasError=true;
+ if(dm.getLocations().size()>0){
+ //濡傛灉鏈夎矾寰勪俊鎭�
+ navigation.setSteps(dm.getPolyline());
}
-
}
navigation.setIdIndex(c.getId()+"-"+cm.getId());
navigation.setDistance(t.getDistance());
@@ -411,14 +405,12 @@
//濡傛灉鏈夎矾寰勪俊鎭�
u.setEndSteps(dm.getPolyline());
}
- }else{
- hasError=true;
}
}
tmpList.add(tt);
if(isNew){//
- u.setDistanceStatus(hasError?Constants.ZERO:Constants.ONE);//鎵�鏈夐兘鎴愬姛鎵嶆爣娉ㄥ凡瑙勫垝
+ u.setDistanceStatus(Constants.ONE);
u.setId(c.getId());
u.setDistance(JSONObject.toJSONString(tmpList));
updateCustomerList.add(u);
@@ -478,8 +470,8 @@
.eq(JkCustomer::getIsdeleted,Constants.ZERO)
.eq(JkLine::getCategoryId,model.getCategoryId() );
List<JkCustomer> customerList = jkCustomerMapper.selectJoinList(JkCustomer.class,queryWrapper1);
- List<JkCustomer> needList =checkNeedDistanceDo(customerList);
- if(Constants.equalsInteger(model.getForceUpdate(),0)&& (needList == null || needList.size() == 0)){
+ List<JkCustomer> needList =checkNeedDistanceDo(customerList);
+ if(needList == null || needList.size() == 0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ヤ富绾夸笅鏃犻渶瑕佽繘琛岃窛绂昏绠楃殑瀹㈡埛淇℃伅锛�");
}
String errorMsg ="";
@@ -493,7 +485,7 @@
}
c.setStatus(Constants.TWO);
categoryMapper.updateById(c);//鏇存柊浠诲姟鎵ц鐘舵��
- c.setCustomerList(Constants.equalsInteger(model.getForceUpdate(),0)?needList:customerList);
+ c.setCustomerList(customerList);
return c;
}
@@ -1526,33 +1518,15 @@
.filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())
&& Objects.nonNull(i.getDistance())
&&Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
- if(sketchList!=null){
- for (JkSketch jkSketch:sketchList) {
- TelecomCategoryDataVO telecomCategoryDataVO = new TelecomCategoryDataVO();
- telecomCategoryDataVO.setId(jkSketch.getCategoryId());
- telecomCategoryDataVO.setName(jkSketch.getCategoryName());
- //浼樺寲鍓嶆暟鎹�
- List<JkSketchLine> beforeList = jkSketchLineList.stream()
- .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())&&Constants.equalsInteger(i.getType(),Constants.ZERO)).collect(Collectors.toList());
- telecomCategoryDataVO.setDistance(
- beforeList.stream().map(i->i.getDistance()).reduce(Long.valueOf(0),Long::sum)
- );
- if(Constants.equalsInteger(jkSketch.getOptStatus(),Constants.ZERO)){
- telecomCategoryDataVO.setDistanceAfter(telecomCategoryDataVO.getDistance());
- }else{
- //浼樺寲鍚庢暟鎹�
- List<JkSketchLine> afterList = jkSketchLineList.stream()
- .filter(i->Constants.equalsInteger(i.getSketchId(),jkSketch.getId())&&Constants.equalsInteger(i.getType(),Constants.ONE)&&Constants.equalsInteger(i.getIsdeleted(),Constants.ZERO)).collect(Collectors.toList());
- Long distanceAfter = 0L;
- for (JkSketchLine jkSketchLine:afterList) {
+ Long distanceAfter = 0L;
+ for (JkSketchLine jkSketchLine:afterList) {
distanceAfter = distanceAfter + jkSketchLine.getDistance();
- }
- telecomCategoryDataVO.setDistanceAfter(distanceAfter);
-
}
- telecomCategoryDataVOList.add(telecomCategoryDataVO);
+ telecomCategoryDataVO.setDistanceAfter(distanceAfter);
+
}
+ telecomCategoryDataVOList.add(telecomCategoryDataVO);
}
return telecomCategoryDataVOList;
}
--
Gitblit v1.9.3