From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 127 ++++++++++++++++++++++++++++++++----------
1 files changed, 96 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 d4fddbd..c7669ef 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
@@ -54,6 +54,8 @@
@Autowired
private JkCustomerMapper jkCustomerMapper;
@Autowired
+ private JkCustomerNavigationMapper jkCustomerNavigationMapper;
+ @Autowired
private JkLineMapper jkLineMapper;
@Autowired
@@ -98,11 +100,11 @@
if( model.getDateInfo() == null){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺棩鏈熶俊鎭笉姝ｇ‘锛屼笉鏀寔浼樺寲锛�");
}
- if(Constants.equalsInteger(Constants.ZERO,jkSketch.getForceUpdate()) && Constants.equalsInteger(model.getStatus(),Constants.ONE)){
+ if(Constants.equalsInteger(Constants.ZERO,jkSketch.getForceUpdate()) && Constants.equalsInteger(model.getStatus(),Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺瓨鍦ㄦ鍦ㄤ紭鍖栦腑锛岃鑰愬績绛夊緟浼樺寲瀹屾垚鎴栬�呴�夋嫨寮哄埗浼樺寲鎿嶄綔锛�");
}
- if( jkSketch.getLineIdList() ==null || jkSketch.getLineIdList().size()==0 ){
+ if( jkSketch.getLineIdList() ==null || jkSketch.getLineIdList().size()==0 ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇烽�夋嫨鏈夋晥鍚堢悊鐨勭嚎璺繘琛屼紭鍖栨搷浣滐紒");
}
//褰撳墠鎵�鏈夌嚎璺�(绗﹀悎鏉′欢鐨勭嚎璺級
@@ -117,7 +119,6 @@
totalCus += Constants.formatIntegerNum(line.getMaxCustomer());//鎬诲鎴烽噺
totalNum += Constants.formatIntegerNum(line.getMaxOrder());//鎬婚�佽揣閲�
}
-
if( totalCus < Constants.formatIntegerNum(model.getOrderNum()) ){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇ョ嚎璺鍗曞鎴锋暟閲忚秴杩囦簡绾胯矾鎬诲鎴烽噺闄愬埗锛屾棤娉曡繘琛屼紭鍖栵紒");
}
@@ -151,25 +152,17 @@
long[] demands1 = new long[customerList.size()+1]; //鍚勪釜鐐圭殑璁㈠崟閲�
long[][] distanceMatrix1 = new long[customerList.size()+1][customerList.size()+1];
demands1[0] =0;//鍘熺偣
- double cLatitude =0;
- double cLongitude =0;
- String location = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_LOCATION).getCode();
- try {
- String[] ss = location.split(",");
- cLongitude = Double.parseDouble(ss[0]);
- cLatitude = Double.parseDouble(ss[1]);
- }catch (Exception e){
-
- }
-
for (int i = 0; i < customerList.size(); i++) {
- distanceMatrix1[0][i] = DistanceCalculator.calculateDistance(cLatitude,cLongitude,customerList.get(i).getLatitude().doubleValue(),customerList.get(i).getLongitude().doubleValue())/1000;
- distanceMatrix1[i][0] = distanceMatrix1[0][i];
+ List<DistanceMapParam> disList = customerList.get(i).getDistanceMapParamList();
+ distanceMatrix1[0][i] = disList.get(0).getDistance();
+ distanceMatrix1[i][0] = disList.get(disList.size() -1).getDistance();
demands1[i+1] = Constants.formatBigdecimal( customerList.get(i).getTotalNum()).longValue(); //鍚勪釜鐐圭殑璁㈠崟閲�
- List<Map<String,Object>> disList = customerList.get(i).getDistanceList();
- for (int j = 0; j< disList.size(); j++) {
- if(disList.size()>j){
- distanceMatrix1[i+1][j+1] = (Long) disList.get(j).get("b")/1000;//鏋勯�犺窛绂荤煩闃�
+ for (int j = 0; j< disList.size()-2; j++) {
+ if(j+1 >=10){
+ break;
+ }
+ if(disList.size()>j+1){
+ distanceMatrix1[i+1][j+1] = disList.get(j+1).getDistance()/1000;//鏋勯�犺窛绂荤煩闃�
}else{
distanceMatrix1[i+1][j+1] = 1l;
}
@@ -195,20 +188,65 @@
}
private void initCustomerDistance(JkSketch model) {
- String url = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GAODE_LOCATION_GEOAPI_URL).getCode();
+ String url = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GAODE_DISTANCE_GEOAPI_URL).getCode();
List<JkCustomer> updateCustomerList = new ArrayList<>();
+ List<JkCustomerNavigation> navigationList = new ArrayList<>();
List<JkSketchCustomer> customerList = model.getCustomerList();
+
+ Date date = new Date();
+ BigDecimal cLatitude =new BigDecimal(0);
+ BigDecimal cLongitude =new BigDecimal(0);
+
+ String location = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.COMPANY_LOCATION).getCode();
+ try {
+ String[] ss = location.split(",");
+ cLongitude = new BigDecimal(ss[0]);
+ cLatitude = new BigDecimal(ss[1]);
+ }catch (Exception e){
+ }
for(JkSketchCustomer c : customerList){
List<DistanceMapParam> tmpList = new ArrayList<>();
List<DistanceMapParam> distanceMapParamList = getListFromJsonStr(c.getDistanceJson());
+ boolean isNew = false;
+ JkCustomer u =new JkCustomer();
+ DistanceMapParam t0 = new DistanceMapParam();
+ t0.setId(-2);//琛ㄧず杩斿洖鍥尯
+ t0.setDistance(Constants.formatLongNum(c.getStartDistance()) );
+ if(Constants.formatLongNum(c.getStartDistance()) <= 0){
+ //鍥尯鍓嶅線璇ュ鎴风殑璺濈锛屽鏋滀箣鍓嶆湭鑾峰彇杩�
+ isNew = true;
+ JkSketchCustomer start = new JkSketchCustomer();
+ start.setId(-1);
+ start.setLongitude(cLongitude);
+ start.setLatitude(cLatitude);
+ DistanceModel dm = DistanceCalculator.calculateDistanceGaode(url,start,c);
+ c.setStartDistance(dm.getDistance() );
+ t0.setDistance(dm.getDistance());
+ u.setStartDistance(dm.getDistance());
+ if(dm.getLocations().size()>0){
+ //濡傛灉鏈夎矾寰勪俊鎭�
+ u.setStartSteps(dm.getPolyline());
+ }
+ }
+ tmpList.add(t0);
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{
+ JkCustomerNavigation navigation = new JkCustomerNavigation();
+ navigation.setStartId(c.getId());
+ navigation.setEndId(cm.getId());
+ navigation.setIsdeleted(Constants.ZERO);
+ navigation.setCreateDate(date);
+ navigation.setEditDate(date);
+ navigation.setEndLatitude(cm.getLatitude());
+ navigation.setEndLogitude(cm.getLongitude());
+ navigation.setStartLatitude(c.getLatitude());
+ navigation.setStartLogitude(c.getLongitude());
isNew = true;
if(Constants.equalsInteger(c.getCustomerId(),cm.getCustomerId())){
t.setDistance(0l);
@@ -217,16 +255,40 @@
t.setDistance(dm.getDistance() );
if(dm.getLocations().size()>0){
//濡傛灉鏈夎矾寰勪俊鎭�
-
+ navigation.setSteps(dm.getPolyline());
}
}
+ navigation.setIdIndex(c.getId()+"-"+cm.getId());
+ navigation.setDistance(t.getDistance());
+ navigationList.add(navigation);
}
tmpList.add(t);
- if(isNew){//
- JkCustomer u =new JkCustomer();
- u.setId(c.getId());
- u.setDistance(JSONObject.toJSONString(tmpList));
+ }
+ DistanceMapParam tt = new DistanceMapParam();
+ tt.setId(-2);//琛ㄧず杩斿洖鍥尯
+ tt.setDistance(Constants.formatLongNum(c.getEndDistance()));
+ if(Constants.formatLongNum(c.getEndDistance()) <= 0){
+ //璇ュ鎴疯繑鍥炲洯鍖虹殑璺濈 ,濡傛灉涔嬪墠鏈幏鍙栬繃
+ isNew = true;
+ JkSketchCustomer start = new JkSketchCustomer();
+ start.setId(-1);
+ start.setLongitude(cLongitude);
+ start.setLatitude(cLatitude);
+
+ DistanceModel dm = DistanceCalculator.calculateDistanceGaode(url,c,start);
+ c.setEndDistance(dm.getDistance() );
+ tt.setDistance(dm.getDistance());
+ u.setEndDistance(dm.getDistance());
+ if(dm.getLocations().size()>0){
+ //濡傛灉鏈夎矾寰勪俊鎭�
+ u.setEndSteps(dm.getPolyline());
}
+ }
+ tmpList.add(tt);
+ if(isNew){//
+ u.setId(c.getCustomerId());
+ u.setDistance(JSONObject.toJSONString(tmpList));
+ updateCustomerList.add(u);
}
c.setDistanceMapParamList(tmpList);
}
@@ -234,6 +296,9 @@
for(JkCustomer c : updateCustomerList){
jkCustomerMapper.updateById(c);//鏇存柊瀹㈡埛涓庡叾浠栫偣涔嬮棿鐨勮窛绂�
}
+ }
+ if(navigationList.size()>0){
+ jkCustomerNavigationMapper.insert(navigationList);
}
}
@@ -288,7 +353,7 @@
tModel.setCustomerList( new ArrayList<>());
//鏈夋晥璺緞
for (Integer cIndex : routes){
- if(cIndex ==0 || cIndex == routes.size()-1){
+ if(cIndex ==0){
continue; //璧峰鐐逛笉澶勭悊
}
JkSketchCustomer customer = model.getCustomerList().get(cIndex-1);
@@ -306,9 +371,7 @@
cModel.setSketchId(model.getId());
cModel.setCustomerId(customer.getCustomerId());
tModel.getCustomerList().add(cModel);
- if(cIndex ==0 || cIndex == routes.size()-1){
- continue; //璧峰鐐逛笉澶勭悊
- }
+
}
}
}
@@ -361,6 +424,8 @@
.selectAs(JkCustomer::getDistance,JkSketchCustomer::getDistanceJson)
.selectAs(JkCustomer::getLongitude,JkSketchCustomer::getLongitude)
.selectAs(JkCustomer::getLatitude,JkSketchCustomer::getLatitude)
+ .selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
+ .selectAs(JkCustomer::getEndDistance,JkSketchCustomer::getEndDistance)
.leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId )
.eq(JkSketchCustomer::getSketchId, model.getId())
.eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
--
Gitblit v1.9.3