From 86450ddc6c1e36e2160336778672bf20be1a0bd6 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 13 十月 2025 15:49:26 +0800
Subject: [PATCH] 最新版本541200007
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 19 +--
/dev/null | 21 ----
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkCustomerServiceImpl.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceCalculator.java | 94 ++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java | 9 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 88 +++++++++++++++--
server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolverSolutions.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceMapParam.java | 15 +++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceModel.java | 20 ++++
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java | 11 ++
server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java | 5
server/visits/dmvisit_service/pom.xml | 14 ++
12 files changed, 247 insertions(+), 53 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 8cc9499..05b8303 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -558,28 +558,21 @@
return d;
}
public static BigDecimal formatBigdecimal4Float(BigDecimal d) {
+ return formatBigdecimalScale(d,4);
+ }
+ public static BigDecimal formatBigdecimalScale(BigDecimal d,int scale) {
if (d == null) {
d = new BigDecimal(0.0);
}
//淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
- d = d.setScale(4, BigDecimal.ROUND_HALF_UP);
+ d = d.setScale(scale, BigDecimal.ROUND_HALF_UP);
return d;
}
public static BigDecimal formatBigdecimal0Float(BigDecimal d) {
- if (d == null) {
- d = new BigDecimal(0.0);
- }
- //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
- d = d.setScale(0, BigDecimal.ROUND_HALF_UP);
- return d;
+ return formatBigdecimalScale(d,0);
}
public static BigDecimal formatBigdecimal2Float(BigDecimal d) {
- if (d == null) {
- d = new BigDecimal(0.0);
- }
- //淇濈暀涓や綅灏忔暟涓斿洓鑸嶄簲鍏�
- d = d.setScale(2, BigDecimal.ROUND_HALF_UP);
- return d;
+ return formatBigdecimalScale(d,2);
}
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/DistanceCalculator.java b/server/system_service/src/main/java/com/doumee/core/utils/DistanceCalculator.java
deleted file mode 100644
index 64f2904..0000000
--- a/server/system_service/src/main/java/com/doumee/core/utils/DistanceCalculator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.doumee.core.utils;
-public class DistanceCalculator {
- private static final double EARTH_RADIUS = 6371.0; // 鍦扮悆鍗婂緞锛堝崟浣嶏細鍏噷锛�
-
- public static void main(String[] args) {
- //118.363428,31.326485
- //118.363312,31.326638
- System.out.println(calculateDistance(39.326638d,116.363312d,31.326606,118.363272));
- }
- public static long calculateDistance(double lat1, double lon1, double lat2, double lon2) {
- double dLat = Math.toRadians(lat2 - lat1);
- double dLon = Math.toRadians(lon2 - lon1);
-
- double a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
- Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2)) *
- Math.sin(dLon / 2) * Math.sin(dLon / 2);
- double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-
- return (long) (EARTH_RADIUS * c * 1000);
- }
-}
\ No newline at end of file
diff --git a/server/visits/dmvisit_service/pom.xml b/server/visits/dmvisit_service/pom.xml
index 6f4a7ca..c79fde7 100644
--- a/server/visits/dmvisit_service/pom.xml
+++ b/server/visits/dmvisit_service/pom.xml
@@ -21,7 +21,19 @@
<groupId>com.doumee</groupId>
<artifactId>system_service</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>4.31.1</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>com.doumee</groupId>
<artifactId>emaysms</artifactId>
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceCalculator.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceCalculator.java
new file mode 100644
index 0000000..7f76135
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceCalculator.java
@@ -0,0 +1,94 @@
+package com.doumee.core.tsp;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.HttpsUtil;
+import com.doumee.dao.business.model.JkCustomer;
+import com.doumee.dao.business.model.JkSketchCustomer;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+
+@Slf4j
+public class DistanceCalculator {
+ private static final double EARTH_RADIUS = 6371.0; // 鍦扮悆鍗婂緞锛堝崟浣嶏細鍏噷锛�
+
+ public static void main(String[] args) {
+ //118.363428,31.326485
+ //118.363312,31.326638
+ System.out.println(calculateDistance(39.326638d,116.363312d,31.326606,118.363272));
+ }
+
+ public static DistanceModel calculateDistanceGaode(String urlStr, JkSketchCustomer c1, JkSketchCustomer c2) {
+ DistanceModel r =new DistanceModel();
+ r.setStart(c1);
+ r.setEnd(c2);
+ r.setDistance(0);
+ r.setLocations( new ArrayList<>());
+ try {
+ String url =urlStr.replace("${lat1}", Constants.formatBigdecimalScale(c1.getLatitude(),6)+"")
+ .replace("${lat2}",Constants.formatBigdecimalScale(c2.getLatitude(),6)+"")
+ .replace("${long1}",Constants.formatBigdecimalScale(c1.getLongitude(),6)+"")
+ .replace("${long2}",Constants.formatBigdecimalScale(c2.getLongitude(),6)+"");
+ String result = HttpsUtil.get(url ,true);
+ JSONObject json = JSONObject.parseObject(result);
+ if(json!=null
+ && json.getInteger("status")!=null
+ && json.getInteger("status") ==1
+ && json.getJSONObject("route")!=null
+ && json.getJSONObject("route").getJSONArray("paths") !=null
+ && json.getJSONObject("route").getJSONArray("paths") .size()>0 ){
+ JSONArray array = json.getJSONObject("route").getJSONArray("paths");
+ JSONObject model = array.getJSONObject(0);//鍙栫涓�涓�
+ Long distance = Long.parseLong(model.getString("distance"));
+ r.setDistance(distance*1000);
+ JSONArray steps = model.getJSONArray("steps");
+ String tl = "";
+ if(steps!=null && steps.size()>0){
+ for (int i = 0; i < steps.size(); i++) {
+ if(StringUtils.isBlank(steps.getJSONObject(i).getString("polyline" ))){
+ continue;
+ }
+ if(!tl.equals("") &&!tl.endsWith(";")){
+ tl += ";";
+ }
+ tl+= steps.getJSONObject(i).getString("polyline" );
+ }
+ }
+ r.setLocations(Arrays.asList(tl.split(";")));
+ }else{
+ log.error("鑾峰彇浜ら�氳鍒掔嚎璺俊鎭垚鍔�==============");
+ }
+ }catch (Exception e){
+ log.error("鑾峰彇浜ら�氳鍒掔嚎璺俊鎭垚鍔�=====澶辫触==========");
+ }
+
+ return r ;
+ }
+
+ private BigDecimal getDecimalByVal(String val) {
+ try {
+ return new BigDecimal(val);
+ }catch (Exception e){
+
+ }
+ return null;
+ }
+ public static long calculateDistance (double lat1, double lon1, double lat2, double lon2) {
+ double dLat = Math.toRadians(lat2 - lat1);
+ double dLon = Math.toRadians(lon2 - lon1);
+
+ double a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+ Math.cos(Math.toRadians(lat1)) * Math.cos(Math.toRadians(lat2)) *
+ Math.sin(dLon / 2) * Math.sin(dLon / 2);
+ double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+
+ return (long) (EARTH_RADIUS * c * 1000);
+ }
+}
\ No newline at end of file
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceMapParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceMapParam.java
new file mode 100644
index 0000000..670feb5
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceMapParam.java
@@ -0,0 +1,15 @@
+package com.doumee.core.tsp;
+
+import com.doumee.dao.business.model.JkCustomer;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+@Slf4j
+@Data
+public class DistanceMapParam {
+ private long distance;
+ private Integer id;
+
+}
\ No newline at end of file
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceModel.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceModel.java
new file mode 100644
index 0000000..0972223
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/DistanceModel.java
@@ -0,0 +1,20 @@
+package com.doumee.core.tsp;
+
+import com.doumee.dao.business.model.JkCustomer;
+import com.doumee.dao.business.model.JkSketchCustomer;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.List;
+
+@Slf4j
+@Data
+public class DistanceModel {
+ private long distance;
+ private List<String> locations;
+ private JkSketchCustomer start;
+ private JkSketchCustomer end;
+
+
+
+}
\ No newline at end of file
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/tsp/TspSolver.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java
similarity index 98%
rename from server/system_service/src/main/java/com/doumee/core/utils/tsp/TspSolver.java
rename to server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java
index 1a2628a..d8eaa4f 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/tsp/TspSolver.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolver.java
@@ -1,4 +1,4 @@
-package com.doumee.core.utils.tsp;
+package com.doumee.core.tsp;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
@@ -6,12 +6,9 @@
import com.google.ortools.constraintsolver.*;
import lombok.extern.slf4j.Slf4j;
import com.google.protobuf.Internal.IntListAdapter.IntConverter;
-import com.google.ortools.constraintsolver.mainJNI;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
-import java.util.Map;
@Slf4j
public class TspSolver {
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/tsp/TspSolverSolutions.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolverSolutions.java
similarity index 92%
rename from server/system_service/src/main/java/com/doumee/core/utils/tsp/TspSolverSolutions.java
rename to server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolverSolutions.java
index 4e7f84b..7160832 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/tsp/TspSolverSolutions.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tsp/TspSolverSolutions.java
@@ -1,4 +1,4 @@
-package com.doumee.core.utils.tsp;
+package com.doumee.core.tsp;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java
index 9a7f912..2a7586a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkCustomer.java
@@ -12,6 +12,8 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
/**
* 浜ゆ帶-瀹㈡埛淇℃伅琛�
@@ -87,6 +89,9 @@
@ApiModelProperty(value = "鐘舵�� 0姝ｅ父 绂佺敤", example = "1")
//@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
private Integer status;
+ @ApiModelProperty(value = "瀹㈡埛闂磋窛绂婚泦鍚�", example = "1")
+ //@ExcelColumn(name="鐘舵�� 0姝ｅ父 绂佺敤")
+ private String distance;
@ApiModelProperty(value = "鎺掑簭鐮�", example = "1")
//@ExcelColumn(name="鎺掑簭鐮�")
@@ -110,4 +115,10 @@
@ApiModelProperty(value = "鏄惁鏂板锛� 0鍚� 1鏄�", example = "1")
@TableField(exist = false)
private int isnew;
+
+ @ApiModelProperty(value = "鍚岀彮缁勯棿瀹㈡埛浣嶇疆璺濈鏁扮粍锛孾{a:12,b:100},{a:13,b:200},...],a锛氬鎴风紪鐮侊紝b锛氫笌瀹㈡埛a涔嬮棿鐨勮窛绂�")
+ @TableField(exist = false)
+ private List<Map<String,Object>> distanceList;
+
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java
index 28f332c..80b2342 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/JkSketchCustomer.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.tsp.DistanceMapParam;
import com.doumee.service.business.third.model.LoginUserModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -98,6 +99,7 @@
@ExcelColumn(name="绾胯矾",index = 4,width = 10)
@TableField(exist = false)
private String lineName;
+
@ApiModelProperty(value = "鎵�灞炰富绾胯矾", example = "1")
@ExcelColumn(name="鎵�灞炰富绾胯矾",index = 3,width = 10)
@TableField(exist = false)
@@ -117,8 +119,13 @@
//@ExcelColumn(name="缁村害")
@TableField(exist = false)
private BigDecimal latitude;
-
+ @ApiModelProperty(value = "绾胯矾鍚嶇О", example = "1")
+ @TableField(exist = false)
+ private String distanceJson;
@ApiModelProperty(value = "鍚岀彮缁勯棿瀹㈡埛浣嶇疆璺濈鏁扮粍锛孾{a:12,b:100},{a:13,b:200},...],a锛氬鎴风紪鐮侊紝b锛氫笌瀹㈡埛a涔嬮棿鐨勮窛绂�")
@TableField(exist = false)
private List<Map<String,Object>> distanceList;
+ @ApiModelProperty(value = "鍚岀彮缁勯棿瀹㈡埛浣嶇疆璺濈鏁扮粍锛孾{a:12,b:100},{a:13,b:200},...],a锛氬鎴风紪鐮侊紝b锛氫笌瀹㈡埛a涔嬮棿鐨勮窛绂�")
+ @TableField(exist = false)
+ private List<DistanceMapParam> distanceMapParamList;
}
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 7c580ce..a2aa471 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
@@ -227,7 +227,6 @@
@Override
public void checkNullLocation() {
-
log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�===============寮�濮�");
Boolean importing = (Boolean) redisTemplate.opsForValue().get(Constants.RedisKeys.CHECKING_JKCUSTOMER_LOCATION);
if(importing!=null && importing){
@@ -277,7 +276,6 @@
}catch (Exception e){
log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�=====澶辫触=========="+c.getName()+"-"+c.getLocation());
}
-
}
}catch (Exception e){
log.error("鏇存柊浜ゆ帶涓績瀹㈡埛缁忕含搴︿俊鎭�===============",e.getMessage());
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 cf6ef90..d4fddbd 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
@@ -1,12 +1,15 @@
package com.doumee.service.business.impl;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.annotation.excel.ExcelImporter;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+import com.doumee.core.tsp.*;
import com.doumee.core.utils.*;
-import com.doumee.core.utils.tsp.TspSolver;
-import com.doumee.core.utils.tsp.TspSolverSolutions;
+import com.doumee.core.wms.model.response.WmsBaseDataResponse;
+import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.dao.admin.request.JkOrdersImport;
import com.doumee.dao.business.*;
import com.doumee.dao.business.model.*;
@@ -19,8 +22,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import netscape.javascript.JSObject;
import org.apache.commons.lang3.StringUtils;
-import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.annotation.Async;
@@ -139,6 +142,7 @@
@Async
public void startUpdateLineAsync(JkSketch model) {
try {
+ initCustomerDistance(model);
List<JkSketchCustomer> customerList = model.getCustomerList();
List<JkLine> lineList = model.getLineList();
TspSolver.DataModel dataModel = new TspSolver.DataModel();
@@ -188,6 +192,69 @@
.set(JkSketch::getPlanLineEndDate,new Date()));
}
+ }
+
+ private void initCustomerDistance(JkSketch model) {
+ String url = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GAODE_LOCATION_GEOAPI_URL).getCode();
+ List<JkCustomer> updateCustomerList = new ArrayList<>();
+ List<JkSketchCustomer> customerList = model.getCustomerList();
+ for(JkSketchCustomer c : customerList){
+ List<DistanceMapParam> tmpList = new ArrayList<>();
+ List<DistanceMapParam> distanceMapParamList = getListFromJsonStr(c.getDistanceJson());
+ for(JkSketchCustomer cm : customerList){
+ boolean isNew = false;
+ DistanceMapParam t = new DistanceMapParam();
+ t.setId(cm.getId());
+ DistanceMapParam param = getParamByCustomerIds( cm.getId(),distanceMapParamList);
+ if(param!=null){//濡傛灉涔嬪墠宸茬粡鑾峰彇杩�
+ t = param;
+ }else{
+ isNew = true;
+ if(Constants.equalsInteger(c.getCustomerId(),cm.getCustomerId())){
+ t.setDistance(0l);
+ }else{
+ DistanceModel dm = DistanceCalculator.calculateDistanceGaode(url,c,cm);
+ t.setDistance(dm.getDistance() );
+ if(dm.getLocations().size()>0){
+ //濡傛灉鏈夎矾寰勪俊鎭�
+
+ }
+ }
+ }
+ tmpList.add(t);
+ if(isNew){//
+ JkCustomer u =new JkCustomer();
+ u.setId(c.getId());
+ u.setDistance(JSONObject.toJSONString(tmpList));
+ }
+ }
+ c.setDistanceMapParamList(tmpList);
+ }
+ if(updateCustomerList.size()>0){
+ for(JkCustomer c : updateCustomerList){
+ jkCustomerMapper.updateById(c);//鏇存柊瀹㈡埛涓庡叾浠栫偣涔嬮棿鐨勮窛绂�
+ }
+ }
+ }
+
+ private DistanceMapParam getParamByCustomerIds( Integer id1, List<DistanceMapParam> distanceMapParamList) {
+ if(distanceMapParamList!=null){
+ for(DistanceMapParam p :distanceMapParamList){
+ if(Constants.equalsInteger(p.getId(),id1)){
+ return p;
+ }
+ }
+ }
+
+ return null;
+ }
+
+ private List<DistanceMapParam> getListFromJsonStr(String distanceJson) {
+ try {
+ return JSONObject.parseObject(distanceJson, new TypeReference<List<DistanceMapParam>>(){}.getType());
+ }catch (Exception e){
+ }
+ return new ArrayList<>();
}
private void dealSearchSolution(JkSketch model, TspSolver.DataModel dataModel) {
@@ -287,11 +354,11 @@
}
private List<JkSketchCustomer> checkJketchCustomerLocation(JkSketch model) {
-
MPJLambdaWrapper<JkSketchCustomer> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(JkSketchCustomer.class )
.selectAs(JkCustomer::getName,JkSketchCustomer::getName)
.selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
+ .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
.leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId )
@@ -311,7 +378,7 @@
if(StringUtils.isNotBlank(errorMsg)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺鎴�:"+errorMsg+"瀹氫綅淇℃伅涓嶅畬鏁达紝涓嶆弧瓒充紭鍖栨潯浠讹紒");
}
- for(JkSketchCustomer c : customerList){
+ /* for(JkSketchCustomer c : customerList){
List<Map<String,Object>> tmpList = new ArrayList<>();
for(JkSketchCustomer cm : customerList){
Map<String,Object> t = new HashMap<>();
@@ -321,7 +388,7 @@
}else{
t.put("b", DistanceCalculator.calculateDistance(
Constants.formatBigdecimal(c.getLatitude()).doubleValue(),
- Constants.formatBigdecimal(c.getLatitude()).doubleValue(),
+ Constants.formatBigdecimal(c.getLongitude()).doubleValue(),
Constants.formatBigdecimal(cm.getLatitude()).doubleValue(),
Constants.formatBigdecimal(cm.getLongitude()).doubleValue()));
}
@@ -329,8 +396,8 @@
}
c.setDistanceList(tmpList);
}
-
- if(Constants.equalsInteger(Constants.ZERO,model.getStatus())){
+ */
+ /*if(Constants.equalsInteger(Constants.ZERO,model.getStatus())){
//濡傛灉鏄湭浼樺寲鐘舵�侊紝璁＄畻鍘熷璺濈
long totalDistance = 0;
MPJLambdaWrapper<JkSketchLine> queryWrapper1 = new MPJLambdaWrapper<>();
@@ -359,7 +426,8 @@
,Constants.formatBigdecimal(c.getLatitude()).doubleValue()
,Constants.formatBigdecimal(c.getLongitude()).doubleValue());
}else{
- totalDistance += DistanceCalculator.calculateDistance(Constants.formatBigdecimal(c.getLatitude()).doubleValue()
+ totalDistance += DistanceCalculator.calculateDistance(
+ Constants.formatBigdecimal(c.getLatitude()).doubleValue()
,Constants.formatBigdecimal(c.getLongitude()).doubleValue()
,Constants.formatBigdecimal(last.getLatitude()).doubleValue()
,Constants.formatBigdecimal(last.getLongitude()).doubleValue());
@@ -377,7 +445,7 @@
}
model.setOriginDistance(totalDistance);
- }
+ }*/
return customerList;
}
--
Gitblit v1.9.3