From 2fd6e6eda3be29e5d77519fd0ca75ae172a11c46 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 16 十二月 2025 18:25:17 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 75 ++++++++++++++++++++++---------------
1 files changed, 44 insertions(+), 31 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 95f0717..4f4f587 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
@@ -246,10 +246,13 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺凡琚紭鍖栵紝宸叉棤娉曡绠楀師濮嬭矾绾胯矾绋嬫暟");
}
checkJketchCustomerLocation(model,true);
- model.setEditDate(new Date());
- model.setDistance(model.getOriginDistance());
- jkSketchMapper.updateById(model);
- return model;
+ JkSketch update = new JkSketch();
+ update.setId(model.getId());
+ update.setEditDate(new Date());
+ update.setDistance(model.getOriginDistance());
+ update.setOriginDistance(model.getOriginDistance());
+ jkSketchMapper.updateById(update);
+ return update;
}
@Override
@@ -641,7 +644,7 @@
queryWrapper.selectAll(JkSketchCustomer.class )
.selectAs(JkCustomer::getName,JkSketchCustomer::getName)
.selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
- .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
+// .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
@@ -766,7 +769,7 @@
queryWrapper.selectAll(JkSketchCustomer.class )
.selectAs(JkCustomer::getName,JkSketchCustomer::getName)
.selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
- .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
+// .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
@@ -873,7 +876,7 @@
}
for(JkSketchCustomer c : customerList){
List<DistanceMapParam> tmpList = new ArrayList<>();
- List<DistanceMapParam> distanceMapParamList = getListFromJsonStr(c.getDistanceJson());
+// List<DistanceMapParam> distanceMapParamList = getListFromJsonStr(c.getDistanceJson());
DistanceMapParam t0 = new DistanceMapParam();
t0.setId(-2);//琛ㄧず杩斿洖鍥尯
t0.setDistance(Constants.formatLongNum(c.getStartDistance()) );
@@ -883,10 +886,11 @@
DistanceMapParam t = new DistanceMapParam();
t.setId(cm.getCustomerId());
t.setDistance(0);
- DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),distanceMapParamList);
+ t.setDistance(DistanceCalculator.calculateDistanceDecinal(cm.getLatitude(),cm.getLongitude(),c.getLatitude(),c.getLongitude()));
+ /* DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),distanceMapParamList);
if(param!=null){//濡傛灉涔嬪墠宸茬粡鑾峰彇杩�
t = param;
- }
+ }*/
tmpList.add(t);
}
DistanceMapParam tt = new DistanceMapParam();
@@ -912,38 +916,44 @@
}
for(JkSketchCustomer c : customerList){
List<DistanceMapParam> tmpList = new ArrayList<>();
- List<DistanceMapParam> distanceMapParamList = getListFromJsonStr(c.getDistanceJson());
+ //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
+// List<DistanceMapParam> distanceMapParamList = getListFromJsonStr(c.getDistanceJson());
DistanceMapParam t0 = new DistanceMapParam();
- t0.setId(-2);//琛ㄧず杩斿洖鍥尯
- t0.setDistance(Constants.formatLongNum(c.getStartDistance()) );
+ t0.setId(-2);//
+ t0.setDistance(DistanceCalculator.calculateDistanceDecinal(cLatitude,cLongitude,c.getLatitude(),c.getLongitude()));
+
+ //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
+ /* t0.setDistance(Constants.formatLongNum(c.getStartDistance()) );
if(Constants.formatLongNum(c.getStartDistance()) <= 0){
//鍥尯鍓嶅線璇ュ鎴风殑璺濈锛屽鏋滀箣鍓嶆湭鑾峰彇杩�
t0.setDistance(DistanceCalculator.calculateDistanceDecinal(cLatitude,cLongitude,c.getLatitude(),c.getLongitude()));
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺鎴�:"+c.getName()+"浜ら�氳鍒掑皻鏈畬鎴愶紝涓嶆弧瓒充紭鍖栨潯浠讹紒");
- }
+ }*/
tmpList.add(t0);
for(JkSketchCustomer cm : customerList){
//瀹㈡埛鍜屽鎴蜂箣闂寸殑璺濈淇℃伅
DistanceMapParam t = new DistanceMapParam();
t.setId(cm.getCustomerId());
- DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),distanceMapParamList);
+ t.setDistance(DistanceCalculator.calculateDistanceDecinal(cm.getLatitude(),cm.getLongitude(),c.getLatitude(),c.getLongitude()));
+ //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
+ /* DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),distanceMapParamList);
if(param!=null && t.getDistance()>0){//濡傛灉涔嬪墠宸茬粡鑾峰彇杩�
t = param;
}else{
//濡傛灉鏈鍒掞紝鎸夌収鐩寸嚎璺濈
t.setDistance(DistanceCalculator.calculateDistanceDecinal(cm.getLatitude(),cm.getLongitude(),c.getLatitude(),c.getLongitude()));
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺鎴�:"+c.getName()+"涓庡鎴�:"+cm.getName()+"绠�浜ら�氳鍒掑皻鏈畬鎴愶紝涓嶆弧瓒宠矾绋嬭绠楁潯浠讹紒");
- }
+ }*/
tmpList.add(t);
}
DistanceMapParam tt = new DistanceMapParam();
tt.setId(-2);//琛ㄧず杩斿洖鍥尯
- tt.setDistance(Constants.formatLongNum(c.getEndDistance()));
+ tt.setDistance(DistanceCalculator.calculateDistanceDecinal(cLatitude,cLongitude,c.getLatitude(),c.getLongitude()));
+
+ //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
+ /* tt.setDistance(Constants.formatLongNum(c.getEndDistance()));
if(Constants.formatLongNum(c.getEndDistance()) <= 0){
//璇ュ鎴疯繑鍥炲洯鍖虹殑璺濈 ,濡傛灉涔嬪墠鏈幏鍙栬繃
tt.setDistance(DistanceCalculator.calculateDistanceDecinal(cLatitude,cLongitude,c.getLatitude(),c.getLongitude()));
-// throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺鎴�:"+c.getName()+"涓庤捣鐐逛氦閫氳鍒掑皻鏈畬鎴愶紝涓嶆弧瓒宠矾绋嬭绠楁潯浠讹紒");
- }
+ }*/
tmpList.add(tt);
c.setDistanceMapParamList(tmpList);
}
@@ -955,32 +965,35 @@
int index =0;
for(JkSketchCustomer c : customers){
if(index ==0){
- if(Constants.formatLongNum(c.getStartDistance()) >0){
+
+ lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),cLatitude,cLongitude);
+ //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
+ /* if(Constants.formatLongNum(c.getStartDistance()) >0){
lineDistance+= Constants.formatLongNum(c.getStartDistance());
}else{
lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),cLatitude,cLongitude);
- }
+ }*/
}
if(index == customers.size()-1){
- if(Constants.formatLongNum(c.getEndDistance())>0){
+ lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),cLatitude,cLongitude);
+ //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
+ /* if(Constants.formatLongNum(c.getEndDistance())>0){
lineDistance+= Constants.formatLongNum(c.getEndDistance());
}else{
lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),cLatitude,cLongitude);
- }
+ }*/
break;
}
JkSketchCustomer end = customers.get(index+1);
- DistanceMapParam param1 = getParamByCustomerIds(end.getCustomerId(),getListFromJsonStr(c.getDistanceJson()));
+ lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),end.getLatitude(),end.getLongitude());
+ //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
+ /* DistanceMapParam param1 = getParamByCustomerIds(end.getCustomerId(),getListFromJsonStr(c.getDistanceJson()));
if(param1 !=null && param1.getDistance()>0){
lineDistance += param1.getDistance();
}else{
lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),end.getLatitude(),end.getLongitude());
- }
- index++;
- /* for(JkSketchCustomer cm : customers){
- DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),getListFromJsonStr(c.getDistanceJson()));
- lineDistance += param.getDistance();
}*/
+ index++;
}
if(updateLineDistance && Constants.equalsInteger(model.getStatus(),Constants.ZERO) ){
line.setDistance(lineDistance);
@@ -1242,7 +1255,7 @@
.selectAs(JkCustomer::getName,JkSketchCustomer::getName)
.selectAs(JkCustomer::getCode,JkSketchCustomer::getCode)
.selectAs(JkCustomer::getDistanceStatus,JkSketchCustomer::getDistanceStatus)
- .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
+// .selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
--
Gitblit v1.9.3