From 13db8741a8d6700980238716eca4c3a097c2d074 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 06 三月 2026 09:57:48 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 102 +++++++++++++++++++--------------------------------
1 files changed, 38 insertions(+), 64 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 4f4f587..93a8f1c 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,13 +246,10 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"璇ョ嚎璺凡琚紭鍖栵紝宸叉棤娉曡绠楀師濮嬭矾绾胯矾绋嬫暟");
}
checkJketchCustomerLocation(model,true);
- 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;
+ model.setEditDate(new Date());
+ model.setDistance(model.getOriginDistance());
+ jkSketchMapper.updateById(model);
+ return model;
}
@Override
@@ -503,6 +500,7 @@
c.setNeedList(Constants.equalsInteger(model.getForceUpdate(),0)?needList:customerList);
return c;
}
+
/**
* 寮�濮嬪紓姝ユ墽琛岀嚎璺紭鍖栦换鍔�
* @param model
@@ -514,7 +512,7 @@
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());
+ distance = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_DISTANCECLUSTER).getCode());
}catch (Exception e){
}
List<JkSketchCustomer> allCustomerList = model.getCustomerList();
@@ -549,18 +547,13 @@
//鏋勯�犱紭鍖栨暟鎹ā鍨�
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::getPlanLineInfo,"鏈�杩戜竴娆＄嚎璺紭鍖栧け璐ワ紒")
.set(JkSketch::getStatus,Constants.THREE)
.set(JkSketch::getPlanLineEndDate,new Date()));
}
@@ -644,7 +637,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)
@@ -661,7 +654,7 @@
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());
+ distance = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_DISTANCECLUSTER).getCode());
}catch (Exception e){
}
int totalNum = 0;
@@ -707,11 +700,6 @@
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();
@@ -750,7 +738,7 @@
jkSketchCustomerMapper.updateById(allList);
}
jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
- .eq(JkSketch::getId,model.getId() )
+// .eq(JkSketch::getId,model.getId() )
.eq(JkSketch::getJobId,model.getJobId() )
.set(success,JkSketch::getDistance,totalDistance)
.set(JkSketch::getPlanLineInfo,success?"鏈�杩戜竴娆＄嚎璺皟鏁存垚鍔�":"鏈�杩戜竴娆＄嚎璺皟鏁村け璐ワ紒")
@@ -769,7 +757,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)
@@ -876,7 +864,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()) );
@@ -886,11 +874,10 @@
DistanceMapParam t = new DistanceMapParam();
t.setId(cm.getCustomerId());
t.setDistance(0);
- t.setDistance(DistanceCalculator.calculateDistanceDecinal(cm.getLatitude(),cm.getLongitude(),c.getLatitude(),c.getLongitude()));
- /* DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),distanceMapParamList);
+ DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),distanceMapParamList);
if(param!=null){//濡傛灉涔嬪墠宸茬粡鑾峰彇杩�
t = param;
- }*/
+ }
tmpList.add(t);
}
DistanceMapParam tt = new DistanceMapParam();
@@ -916,44 +903,38 @@
}
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(DistanceCalculator.calculateDistanceDecinal(cLatitude,cLongitude,c.getLatitude(),c.getLongitude()));
-
- //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
- /* t0.setDistance(Constants.formatLongNum(c.getStartDistance()) );
+ t0.setId(-2);//琛ㄧず杩斿洖鍥尯
+ 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());
- t.setDistance(DistanceCalculator.calculateDistanceDecinal(cm.getLatitude(),cm.getLongitude(),c.getLatitude(),c.getLongitude()));
- //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
- /* DistanceMapParam param = getParamByCustomerIds( cm.getCustomerId(),distanceMapParamList);
+ 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(DistanceCalculator.calculateDistanceDecinal(cLatitude,cLongitude,c.getLatitude(),c.getLongitude()));
-
- //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
- /* tt.setDistance(Constants.formatLongNum(c.getEndDistance()));
+ 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);
}
@@ -965,35 +946,32 @@
int index =0;
for(JkSketchCustomer c : customers){
if(index ==0){
-
- lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),cLatitude,cLongitude);
- //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
- /* if(Constants.formatLongNum(c.getStartDistance()) >0){
+ if(c.getStartDistance() >0){
lineDistance+= Constants.formatLongNum(c.getStartDistance());
}else{
lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),cLatitude,cLongitude);
- }*/
+ }
}
if(index == customers.size()-1){
- lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),cLatitude,cLongitude);
- //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
- /* if(Constants.formatLongNum(c.getEndDistance())>0){
+ if(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);
- lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),end.getLatitude(),end.getLongitude());
- //====鏍囪==蹇界暐浜ら�氳鍒掕窛绂�=====
- /* DistanceMapParam param1 = getParamByCustomerIds(end.getCustomerId(),getListFromJsonStr(c.getDistanceJson()));
+ 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();
+ }*/
}
if(updateLineDistance && Constants.equalsInteger(model.getStatus(),Constants.ZERO) ){
line.setDistance(lineDistance);
@@ -1107,13 +1085,11 @@
.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);
@@ -1131,7 +1107,7 @@
}
jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
.eq(JkSketch::getId,model.getId() )
-// .eq(JkSketch::getJobId,model.getJobId() )
+ .eq(JkSketch::getJobId,model.getJobId() )
.set(JkSketch::getLineNum,sketchLineList.size() )
.set(JkSketch::getOptStatus,Constants.ONE)//宸茬敓鎴愪紭鍖栫嚎璺�
.set(JkSketch::getDistance,totalDistance)
@@ -1141,7 +1117,7 @@
}else{
jkSketchMapper.update(null,new UpdateWrapper<JkSketch>().lambda()
.eq(JkSketch::getId,model.getId() )
-// .eq(JkSketch::getJobId,model.getJobId() )
+ .eq(JkSketch::getJobId,model.getJobId() )
.set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆＄嚎璺紭鍖栧け璐�,鏈壘鍒版渶浼樿矾绾匡紒")
.set(JkSketch::getStatus,Constants.THREE)
.set(JkSketch::getPlanLineEndDate,date));
@@ -1208,13 +1184,11 @@
.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);
@@ -1255,7 +1229,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