From e6604f327adb238274dc7a1fc14892916e2d6a92 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 09:56:50 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/business/categoryJkLine.vue | 8 ++--
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 72 ++++++++++++++++++++---------------
server/system_gateway/src/main/resources/bootstrap.yml | 2
3 files changed, 46 insertions(+), 36 deletions(-)
diff --git a/admin/src/views/business/categoryJkLine.vue b/admin/src/views/business/categoryJkLine.vue
index d66b9e8..2509850 100644
--- a/admin/src/views/business/categoryJkLine.vue
+++ b/admin/src/views/business/categoryJkLine.vue
@@ -43,8 +43,8 @@
>
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.OperaCategoryJkLineWindow.open('缂栬緫涓荤嚎璺�',row)" v-permissions="['business:category:update']">缂栬緫</el-button>
- <el-button type="text" icon="el-icon-edit" @click="distanceDo(row)" v-if="row.status !=2 && row.customerDoneNum < row.customerNum " v-permissions="['business:category:update']">浜ら�氳鍒�</el-button>
- <el-button type="text" icon="el-icon-edit" @click="distanceDo(row)" v-if="row.status ==2 " v-permissions="['business:category:update']">閲嶆柊瑙勫垝</el-button>
+ <el-button type="text" icon="el-icon-edit" @click="distanceDo(row,0)" v-if="row.status !=2 && row.customerDoneNum < row.customerNum " v-permissions="['business:category:update']">浜ら�氳鍒�</el-button>
+ <el-button type="text" icon="el-icon-edit" @click="distanceDo(row,1)" v-if="row.status !=2 && row.customerDoneNum === row.customerNum" v-permissions="['business:category:update']">閲嶆柊瑙勫垝</el-button>
<el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:category:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
@@ -90,14 +90,14 @@
this.search()
},
methods: {
- distanceDo (row) {
+ distanceDo (row,force) {
var that = this
this.$confirm('纭畾杩涜璇ヤ富绾胯矾涓嬪鎴疯窛绂昏绠楀悧?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- distanceCustomer({ categoryId: row.id })
+ distanceCustomer({ categoryId: row.id,forceUpdate: force })
.then(res => {
this.$tip.apiSuccess('浜ら�氳鍒掍换鍔℃鍦ㄥ悗鍙版墽琛岋紝鍙兘闇�瑕佷竴娈垫椂闂达紝璇风瓑寰呬换鍔″畬鎴愬悗鏌ョ湅缁撴灉')
that.search()
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 02ca26f..3d2cb09 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: dev
+ active: pro
application:
name: system_gateway
# 瀹夊叏閰嶇疆
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 f5dbf90..29fecf8 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("浜ら�氳鍒�========"+customerList.get(j).getName()+"========cirle:"+finalI+"==="+index++);
+ log.error("浜ら�氳鍒�========"+cate.getId()+"/"+cate.getName()+"/"+customerList.get(j).getName()+"=======cirle/index:"+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;
+ boolean isNew = false,hasError =false;
JkCustomer u =new JkCustomer();
DistanceMapParam t0 = new DistanceMapParam();
t0.setId(-2);//琛ㄧず杩斿洖鍥尯
@@ -344,13 +344,14 @@
//濡傛灉鏈夎矾寰勪俊鎭�
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);
@@ -373,10 +374,15 @@
}else{
DistanceCustomerModel dm = DistanceCalculator.calculateDistanceGaode(url,c,cm);
t.setDistance(dm.getDistance() );
- if(dm.getLocations().size()>0){
- //濡傛灉鏈夎矾寰勪俊鎭�
- navigation.setSteps(dm.getPolyline());
+ if(dm.getCode() == 1){
+ if(dm.getLocations().size()>0){
+ //濡傛灉鏈夎矾寰勪俊鎭�
+ navigation.setSteps(dm.getPolyline());
+ }
+ }else{
+ hasError=true;
}
+
}
navigation.setIdIndex(c.getId()+"-"+cm.getId());
navigation.setDistance(t.getDistance());
@@ -405,12 +411,14 @@
//濡傛灉鏈夎矾寰勪俊鎭�
u.setEndSteps(dm.getPolyline());
}
+ }else{
+ hasError=true;
}
}
tmpList.add(tt);
if(isNew){//
- u.setDistanceStatus(Constants.ONE);
+ u.setDistanceStatus(hasError?Constants.ZERO:Constants.ONE);//鎵�鏈夐兘鎴愬姛鎵嶆爣娉ㄥ凡瑙勫垝
u.setId(c.getId());
u.setDistance(JSONObject.toJSONString(tmpList));
updateCustomerList.add(u);
@@ -470,8 +478,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(needList == null || needList.size() == 0){
+ List<JkCustomer> needList =checkNeedDistanceDo(customerList);
+ if(Constants.equalsInteger(model.getForceUpdate(),0)&& (needList == null || needList.size() == 0)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ヤ富绾夸笅鏃犻渶瑕佽繘琛岃窛绂昏绠楃殑瀹㈡埛淇℃伅锛�");
}
String errorMsg ="";
@@ -485,7 +493,7 @@
}
c.setStatus(Constants.TWO);
categoryMapper.updateById(c);//鏇存柊浠诲姟鎵ц鐘舵��
- c.setCustomerList(customerList);
+ c.setCustomerList(Constants.equalsInteger(model.getForceUpdate(),0)?needList:customerList);
return c;
}
@@ -1497,31 +1505,33 @@
List<JkSketchLine> jkSketchLineList = jkSketchLineMapper.selectJoinList(JkSketchLine.class,queryWrapper);
List<TelecomCategoryDataVO> telecomCategoryDataVOList = new ArrayList<>();
- 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());
+ 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);
+ }
+ telecomCategoryDataVO.setDistanceAfter(distanceAfter);
+ }
+ telecomCategoryDataVOList.add(telecomCategoryDataVO);
}
- telecomCategoryDataVOList.add(telecomCategoryDataVO);
}
return telecomCategoryDataVOList;
}
--
Gitblit v1.9.3