From 917c4ee8b05e816602aa06f67f2f5447150b242f Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 17 十二月 2025 09:35:50 +0800
Subject: [PATCH] Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvisit into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 391 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 356 insertions(+), 35 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 a2c4051..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
@@ -12,6 +12,7 @@
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.admin.request.SketchCateModel;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dto.TelecomLineInfoDTO;
import com.doumee.dao.business.model.*;
@@ -245,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
@@ -499,7 +503,6 @@
c.setNeedList(Constants.equalsInteger(model.getForceUpdate(),0)?needList:customerList);
return c;
}
-
/**
* 寮�濮嬪紓姝ユ墽琛岀嚎璺紭鍖栦换鍔�
* @param model
@@ -508,6 +511,74 @@
@Async
public void startUpdateLineAsync(JkSketch model) {
try {
+ int maxnum =100,distance = 500;
+ try {
+ maxnum = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_MAX_CLUSTER).getCode());
+ distance = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_DISTANCE_CLUSTER).getCode());
+ }catch (Exception e){
+ }
+ List<JkSketchCustomer> allCustomerList = model.getCustomerList();
+ //涓ゅ叕閲屽唴鏁版嵁瀹㈡埛鍚堝苟
+// List<SketchCateModel> customerList =Clustering.clusterPoints(allCustomerList,1000);
+ List<SketchCateModel> customerList = new ClusterCustomKMeans().clusterPoints(allCustomerList,maxnum,distance);
+ List<JkLine> lineList = model.getLineList();
+ TspSolver.DataModel dataModel = new TspSolver.DataModel();
+ int vehicleNumber1 = lineList.size();//绾胯矾鏁伴噺
+ long[] vehicleCapacities1=new long[lineList.size()];//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
+ long[] vehicleMaxNodes=new long[lineList.size()];//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
+ long[] demands1 = new long[customerList.size()+1]; //鍚勪釜鐐圭殑璁㈠崟閲�
+ long[] demands2 = new long[customerList.size()+1]; //鍚勪釜鐐圭殑瀹㈡埗閲�
+ long[][] distanceMatrix1 = new long[customerList.size()+1][customerList.size()+1];
+ distanceMatrix1[0][0] = 0;
+ demands1[0] =0;//鍘熺偣
+ demands2[0] =0;//鍘熺偣
+ for (int i = 0; i < customerList.size(); i++) {
+ List<DistanceMapParam> disList = customerList.get(i).getStartPoint().getDistanceMapParamList();
+ distanceMatrix1[0][i+1] = disList.get(0).getDistance();
+ distanceMatrix1[i+1][0] = disList.get(disList.size() -1).getDistance();
+ demands1[i+1] = Constants.formatBigdecimal( customerList.get(i).getTotalNum()).longValue(); //鍚勪釜鐐圭殑璁㈠崟閲�
+ demands2[i+1] = customerList.get(i).getTotalCustomer(); //鍚勪釜鐐圭殑璁㈠崟閲�
+ for (int j = 0; j < customerList.size(); j++) {
+ distanceMatrix1[i+1][j+1] =disList.get(j+1).getDistance() ;
+ }
+ }
+ for (int i = 0; i < lineList.size(); i++) {
+ vehicleCapacities1[i] = lineList.get(i).getMaxOrder();//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
+ vehicleMaxNodes[i] =lineList.get(i).getMaxCustomer();//鏈�澶у鎴锋暟
+ }
+ //鏋勯�犱紭鍖栨暟鎹ā鍨�
+ dataModel.initDataInfo(vehicleNumber1,demands1,demands2,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
+ TspSolver.startSearch(dataModel);
+ JkSketch nowModel = jkSketchMapper.selectById(model.getId());
+ if(StringUtils.equals(model.getJobId(), nowModel.getJobId())){
+ log.error( "浼樺寲缁撴灉宸插け鏁堬紝闈炴渶杩戜竴娆℃搷浣滐紒");
+ return;
+ }
+ dealSearchSolution(model, customerList,dataModel);
+ }catch (Exception e){
+ e.printStackTrace();
+ jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
+ .eq(JkSketch::getId,model.getId() )
+ .eq(JkSketch::getJobId,model.getJobId() )
+ .set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆＄嚎璺紭鍖栧け璐ワ紒"+e.getMessage())
+ .set(JkSketch::getStatus,Constants.THREE)
+ .set(JkSketch::getPlanLineEndDate,new Date()));
+ }
+ }
+
+ private List<JkSketchCustomer> getCustomerCateList(List<JkSketchCustomer> allCustomerList) {
+ List<JkSketchCustomer> list = new ArrayList<>();
+ return list;
+ }
+
+ /**
+ * 寮�濮嬪紓姝ユ墽琛岀嚎璺紭鍖栦换鍔�
+ * @param model
+ */
+ @Override
+ @Async
+ public void startUpdateLineAsyncOld(JkSketch model) {
+ try {
List<JkSketchCustomer> customerList = model.getCustomerList();
List<JkLine> lineList = model.getLineList();
TspSolver.DataModel dataModel = new TspSolver.DataModel();
@@ -515,6 +586,7 @@
long[] vehicleCapacities1=new long[lineList.size()];//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
long[] vehicleMaxNodes=new long[lineList.size()];//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
long[] demands1 = new long[customerList.size()+1]; //鍚勪釜鐐圭殑璁㈠崟閲�
+ long[] demands2 = new long[customerList.size()+1]; //鍚勪釜鐐圭殑瀹㈡埛閲�
long[][] distanceMatrix1 = new long[customerList.size()+1][customerList.size()+1];
distanceMatrix1[0][0] = 0;
demands1[0] =0;//鍘熺偣
@@ -523,6 +595,7 @@
distanceMatrix1[0][i+1] = disList.get(0).getDistance();
distanceMatrix1[i+1][0] = disList.get(disList.size() -1).getDistance();
demands1[i+1] = Constants.formatBigdecimal( customerList.get(i).getTotalNum()).longValue(); //鍚勪釜鐐圭殑璁㈠崟閲�
+ demands2[i+1] =1; //鍚勪釜鐐圭殑璁㈠崟閲�
for (int j = 0; j < customerList.size(); j++) {
distanceMatrix1[i+1][j+1] =disList.get(j+1).getDistance() ;
}
@@ -542,9 +615,9 @@
vehicleMaxNodes[i] =lineList.get(i).getMaxCustomer();//鏈�澶у鎴锋暟
}
//鏋勯�犱紭鍖栨暟鎹ā鍨�
- dataModel.initDataInfo(vehicleNumber1,demands1,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
+ dataModel.initDataInfo(vehicleNumber1,demands1,demands2,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
TspSolver.startSearch(dataModel);
- dealSearchSolution(model,dataModel);
+ dealSearchSolutionOld(model,dataModel);
}catch (Exception e){
e.printStackTrace();
jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
@@ -571,7 +644,132 @@
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)
+ .selectAs(JkCustomer::getEndDistance,JkSketchCustomer::getEndDistance)
+ .leftJoin(JkCustomer.class,JkCustomer::getId,JkSketchCustomer::getCustomerId )
+ .eq(JkSketchCustomer::getType, Constants.equalsInteger(model.getOptStatus(),Constants.ONE)?1:0)
+ .eq(JkSketchCustomer::getSketchId, model.getId())
+ .eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
+ .orderByAsc(JkSketchCustomer::getSortnum);
+ List<JkSketchCustomer> customerList = jkSketchCustomerMapper.selectJoinList(JkSketchCustomer.class,queryWrapper);
+ if(customerList == null ||customerList.size() ==0){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺鎴蜂俊鎭负绌猴紝涓嶆弧瓒充紭鍖栨潯浠讹紒");
+ }
+ int maxnum =100,distance = 500;
+ try {
+ maxnum = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_MAX_CLUSTER).getCode());
+ distance = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_DISTANCE_CLUSTER).getCode());
+ }catch (Exception e){
+ }
+ int totalNum = 0;
+ for(JkSketchLine line : lineList){
+ //瀹屽杽绾胯矾瀹㈡埛浼樺寲鍙傛暟
+ List<JkSketchCustomer> customerListParam = line.getCustomerList() ;
+ if(customerListParam ==null || customerListParam.size()==0){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ initSketchCustomerListParam(line.getCustomerList(),customerList) ;
+ totalNum += customerListParam.size();
+ }
+ if(totalNum != Constants.formatIntegerNum(model.getOrderNum())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ for(JkSketchLine line : lineList){
+ //閫愪釜璺嚎浼樺寲
+ List<JkSketchCustomer> allCustomerListParam = line.getCustomerList() ;
+// List<SketchCateModel> customerListParam = Clustering.clusterPoints(allCustomerListParam,1000);
+ List<SketchCateModel> customerListParam = new ClusterCustomKMeans().clusterPoints(allCustomerListParam,maxnum,distance);
+ TspSolver.DataModel dataModel = new TspSolver.DataModel();
+ int vehicleNumber1 = 1;//绾胯矾鏁伴噺
+ long[] vehicleCapacities1=new long[]{line.getMaxOrder()};//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
+ long[] vehicleMaxNodes=new long[]{line.getMaxCustomer()};//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
+ long[] demands1 = new long[customerListParam.size()+1]; //鍚勪釜鐐圭殑璁㈠崟閲�
+ long[] demands2 = new long[customerListParam.size()+1]; //鍚勪釜鐐圭殑璁㈠崟閲�
+ long[][] distanceMatrix1 = new long[customerListParam.size()+1][customerListParam.size()+1];
+ distanceMatrix1[0][0] = 0;
+ demands1[0] =0;//鍘熺偣
+ for (int i = 0; i < customerListParam.size(); i++) {
+ List<DistanceMapParam> disList = customerListParam.get(i).getStartPoint().getDistanceMapParamList();
+ distanceMatrix1[0][i+1] = disList.get(0).getDistance();
+ distanceMatrix1[i+1][0] = disList.get(disList.size() -1).getDistance();
+ demands1[i+1] = Constants.formatBigdecimal( customerListParam.get(i).getTotalNum()).longValue(); //鍚勪釜鐐圭殑璁㈠崟閲�
+ demands2[i+1] = customerListParam.get(i).getTotalCustomer() ; //鍚勪釜鐐圭殑璁㈠崟閲�
+ for (int j = 0; j < customerListParam.size(); j++) {
+ distanceMatrix1[i+1][j+1] =disList.get(j+1).getDistance() ;
+ }
+ }
+ //鏋勯�犱紭鍖栨暟鎹ā鍨�
+ dataModel.initDataInfo(vehicleNumber1,demands1,demands2,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
+ TspSolver.startSearch(dataModel);
+ if(dataModel.getSolutions()==null || dataModel.getSolutions().size()==0){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛屾湭鑾峰緱鏈�浼樹氦閫氳鍒掓柟妗堬紒");
+ }
+ JkSketch nowModel = jkSketchMapper.selectById(model.getId());
+ if(StringUtils.equals(model.getJobId(), nowModel.getJobId())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛岄潪鏈�杩戜竴娆℃搷浣滐紒");
+ }
+
+ TspSolverSolutions so = dataModel.getSolutions().get(0);
+ List<Integer> routes = so.getRouteIndex();
+ totalDistance += so.getDistance();
+ if(routes.size() <=2) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛屾湭鑾峰緱鏈�浼樹氦閫氳鍒掓柟妗堬紒");
+ }
+ int index = 0;
+ line.setDistance(so.getDistance());
+ //鏈夋晥璺緞
+ for (Integer cIndex : routes){
+ if(cIndex ==0){
+ continue; //璧峰鐐逛笉澶勭悊
+ }
+ SketchCateModel cateModel = customerListParam.get(cIndex-1);
+ for(int t=0;t<cateModel.getCustomerList().size();t++){
+ JkSketchCustomer customer = cateModel.getCustomerList().get(t);
+ customer.setSortnum(index++);
+ if(t < cateModel.getCustomerList().size()-1){
+ long tdistance = (long)Clustering.distanceTo(customer, cateModel.getCustomerList().get(t+1));
+ line.setDistance(Constants.formatLongNum(line.getDistance()) +tdistance);
+ totalDistance += tdistance;
+ }
+ }
+ }
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ success =false;
+ }finally {
+ if(success){
+ List<JkSketchCustomer> allList = new ArrayList<>();
+ for(JkSketchLine line : lineList){
+ allList.addAll(line.getCustomerList());
+ }
+ jkSketchLineMapper.updateById(lineList);
+ jkSketchCustomerMapper.updateById(allList);
+ }
+ jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
+ .eq(JkSketch::getId,model.getId() )
+ .eq(JkSketch::getJobId,model.getJobId() )
+ .set(success,JkSketch::getDistance,totalDistance)
+ .set(JkSketch::getPlanLineInfo,success?"鏈�杩戜竴娆＄嚎璺皟鏁存垚鍔�":"鏈�杩戜竴娆＄嚎璺皟鏁村け璐ワ紒")
+ .set(JkSketch::getStatus,success?Constants.TWO:Constants.THREE)
+ .set(JkSketch::getPlanLineEndDate,new Date()));
+ }
+ }
+ @Override
+ @Async
+ public void startEditSketchLineAsyncOld(JkSketch model) {
+ boolean success = true;
+ int totalDistance = 0;
+ List<JkSketchLine> lineList = model.getSketchLineList();
+ try {
+ 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)
.selectAs(JkCustomer::getStartDistance,JkSketchCustomer::getStartDistance)
@@ -607,6 +805,7 @@
long[] vehicleCapacities1=new long[]{line.getMaxOrder()};//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
long[] vehicleMaxNodes=new long[]{line.getMaxCustomer()};//姣忚締杞︾殑鏈�澶ц鍗曢噺闄愬埗
long[] demands1 = new long[customerListParam.size()+1]; //鍚勪釜鐐圭殑璁㈠崟閲�
+ long[] demands2 = new long[customerListParam.size()+1]; //鍚勪釜鐐圭殑璁㈠崟閲�
long[][] distanceMatrix1 = new long[customerListParam.size()+1][customerListParam.size()+1];
distanceMatrix1[0][0] = 0;
demands1[0] =0;//鍘熺偣
@@ -615,12 +814,13 @@
distanceMatrix1[0][i+1] = disList.get(0).getDistance();
distanceMatrix1[i+1][0] = disList.get(disList.size() -1).getDistance();
demands1[i+1] = Constants.formatBigdecimal( customerListParam.get(i).getTotalNum()).longValue(); //鍚勪釜鐐圭殑璁㈠崟閲�
+ demands2[i+1] = 1; //鍚勪釜鐐圭殑璁㈠崟閲�
for (int j = 0; j < customerListParam.size(); j++) {
distanceMatrix1[i+1][j+1] =disList.get(j+1).getDistance() ;
}
}
//鏋勯�犱紭鍖栨暟鎹ā鍨�
- dataModel.initDataInfo(vehicleNumber1,demands1,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
+ dataModel.initDataInfo(vehicleNumber1,demands1,demands2,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
TspSolver.startSearch(dataModel);
if(dataModel.getSolutions()==null || dataModel.getSolutions().size()==0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛屾湭鑾峰緱鏈�浼樹氦閫氳鍒掓柟妗堬紒");
@@ -676,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()) );
@@ -686,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();
@@ -715,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);
}
@@ -758,32 +965,35 @@
int index =0;
for(JkSketchCustomer c : customers){
if(index ==0){
- if(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(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);
@@ -828,7 +1038,116 @@
return new ArrayList<>();
}
- private void dealSearchSolution(JkSketch model, TspSolver.DataModel dataModel) {
+ private void dealSearchSolution(JkSketch model, List<SketchCateModel> customerList,TspSolver.DataModel dataModel) {
+ Date date = new Date();
+ List<TspSolverSolutions> solutions = dataModel.getSolutions();
+ List<JkSketchLine> sketchLineList = new ArrayList<>();
+ List<JkSketchCustomer> sketchCustomerList = new ArrayList<>();
+ long totalDistance = 0l;
+ if(solutions!=null && solutions.size()>0){
+ for(TspSolverSolutions so : solutions){
+ List<Integer> routes = so.getRouteIndex();
+ totalDistance+= so.getDistance();
+ if(routes.size() <=2) {
+ continue;//鏃犲鎴风殑闈炴湁鏁堣矾绾�
+ }
+ JkLine line =model.getLineList().get(so.getLineIndex());
+ JkSketchLine tModel = new JkSketchLine();
+ tModel.setSketchId(model.getId());
+ tModel.setCreator(model.getEditor());
+ tModel.setCreateDate(date);
+ tModel.setLineId(line.getId());
+ tModel.setTotalNum(new BigDecimal(0));
+ tModel.setDateInfo(model.getDateInfo());
+ tModel.setType(Constants.ONE);
+ tModel.setSortnum(sketchLineList.size()+1);
+ tModel.setEditDate(tModel.getCreateDate());
+ tModel.setEditor(tModel.getCreator());
+ tModel.setIsdeleted(Constants.ZERO);
+ tModel.setDistance(so.getDistance());//
+ sketchLineList.add(tModel);
+ tModel.setCustomerList( new ArrayList<>());
+ //鏈夋晥璺緞
+ for (Integer cIndex : routes){
+ if(cIndex ==0){
+ continue; //璧峰鐐逛笉澶勭悊
+ }
+// JkSketchCustomer customer = model.getCustomerList().get(cIndex-1);
+// tModel.setTotalNum(tModel.getTotalNum().add(Constants.formatBigdecimal(customer.getTotalNum())));//閫佽揣閲�
+ SketchCateModel cateModel = customerList.get(cIndex-1);
+ tModel.setTotalNum(tModel.getTotalNum().add(Constants.formatBigdecimal(cateModel.getTotalNum())));//閫佽揣閲�
+ for(int t=0;t<cateModel.getCustomerList().size();t++){
+ JkSketchCustomer customer = cateModel.getCustomerList().get(t);
+ JkSketchCustomer cModel = new JkSketchCustomer();
+ cModel.setCreator(tModel.getCreator());
+ cModel.setOrderId(customer.getOrderId());
+ cModel.setCreateDate(tModel.getCreateDate());
+ cModel.setType(Constants.ONE);
+ cModel.setTotalNum(customer.getTotalNum());
+ cModel.setDateInfo(model.getDateInfo());
+ cModel.setSortnum(tModel.getCustomerList().size()+1);
+ cModel.setEditDate(tModel.getCreateDate());
+ cModel.setEditor(tModel.getCreator());
+ cModel.setIsdeleted(Constants.ZERO);
+ cModel.setSketchId(model.getId());
+ cModel.setCustomerId(customer.getCustomerId());
+ if(t < cateModel.getCustomerList().size()-1){
+ long tdistance = (long)Clustering.distanceTo(customer, cateModel.getCustomerList().get(t+1));
+ tModel.setDistance(Constants.formatLongNum(tModel.getDistance()) +tdistance);
+ totalDistance += tdistance;
+ }
+ tModel.getCustomerList().add(cModel);
+ }
+ tModel.setOrderNum( tModel.getCustomerList().size());
+ }
+ }
+ }
+ if(sketchLineList!=null && sketchLineList.size()>0){
+ jkSketchLineMapper.update(null,new UpdateWrapper<JkSketchLine>().lambda()
+ .set(JkSketchLine::getIsdeleted,Constants.ONE)
+ .eq(JkSketchLine::getIsdeleted,Constants.ZERO)
+ .eq(JkSketchLine::getType,Constants.ONE)
+ .eq(JkSketchLine::getSketchId,model.getId())
+ .eq(JkSketchLine::getDateInfo,model.getDateInfo()));
+ jkSketchCustomerMapper.update(null,new UpdateWrapper<JkSketchCustomer>().lambda()
+ .set(JkSketchCustomer::getIsdeleted,Constants.ONE)
+ .eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
+ .eq(JkSketchCustomer::getType,Constants.ONE)
+ .eq(JkSketchCustomer::getSketchId,model.getId())
+ .eq(JkSketchCustomer::getDateInfo,model.getDateInfo()));
+ if(sketchLineList.size()>0){
+ jkSketchLineMapper.insert(sketchLineList);
+ }
+ for(JkSketchLine l : sketchLineList){
+ if(l.getCustomerList()!=null ){
+ for(JkSketchCustomer c :l.getCustomerList()){
+ c.setSketchLineId(l.getId());
+ }
+ sketchCustomerList.addAll(l.getCustomerList());
+ }
+ }
+ if(sketchCustomerList.size()>0){
+ jkSketchCustomerMapper.insert(sketchCustomerList);
+ }
+ jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
+ .eq(JkSketch::getId,model.getId() )
+// .eq(JkSketch::getJobId,model.getJobId() )
+ .set(JkSketch::getLineNum,sketchLineList.size() )
+ .set(JkSketch::getOptStatus,Constants.ONE)//宸茬敓鎴愪紭鍖栫嚎璺�
+ .set(JkSketch::getDistance,totalDistance)
+ .set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆＄嚎璺紭鍖栨垚鍔燂紝浼樺寲鍚庢�昏窛绂伙細"+(totalDistance/1000)+"鍏噷锛�")
+ .set(JkSketch::getStatus,Constants.TWO)
+ .set(JkSketch::getPlanLineEndDate,date));
+ }else{
+ jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
+ .eq(JkSketch::getId,model.getId() )
+// .eq(JkSketch::getJobId,model.getJobId() )
+ .set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆＄嚎璺紭鍖栧け璐�,鏈壘鍒版渶浼樿矾绾匡紒")
+ .set(JkSketch::getStatus,Constants.THREE)
+ .set(JkSketch::getPlanLineEndDate,date));
+ }
+ }
+ private void dealSearchSolutionOld(JkSketch model, TspSolver.DataModel dataModel) {
Date date = new Date();
List<TspSolverSolutions> solutions = dataModel.getSolutions();
List<JkSketchLine> sketchLineList = new ArrayList<>();
@@ -889,11 +1208,13 @@
.set(JkSketchLine::getIsdeleted,Constants.ONE)
.eq(JkSketchLine::getIsdeleted,Constants.ZERO)
.eq(JkSketchLine::getType,Constants.ONE)
+ .eq(JkSketchLine::getSketchId,model.getId())
.eq(JkSketchLine::getDateInfo,model.getDateInfo()));
jkSketchCustomerMapper.update(null,new UpdateWrapper<JkSketchCustomer>().lambda()
.set(JkSketchCustomer::getIsdeleted,Constants.ONE)
.eq(JkSketchCustomer::getIsdeleted,Constants.ZERO)
.eq(JkSketchCustomer::getType,Constants.ONE)
+ .eq(JkSketchCustomer::getSketchId,model.getId())
.eq(JkSketchCustomer::getDateInfo,model.getDateInfo()));
if(sketchLineList.size()>0){
jkSketchLineMapper.insert(sketchLineList);
@@ -934,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