From 18ab70b5f19fce88ba91c08689f2f39bb9784ecf Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 25 十一月 2025 16:18:15 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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 93a8f1c..95f0717 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
@@ -500,7 +500,6 @@
c.setNeedList(Constants.equalsInteger(model.getForceUpdate(),0)?needList:customerList);
return c;
}
-
/**
* 寮�濮嬪紓姝ユ墽琛岀嚎璺紭鍖栦换鍔�
* @param model
@@ -512,7 +511,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_DISTANCECLUSTER).getCode());
+ distance = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_DISTANCE_CLUSTER).getCode());
}catch (Exception e){
}
List<JkSketchCustomer> allCustomerList = model.getCustomerList();
@@ -547,13 +546,18 @@
//鏋勯�犱紭鍖栨暟鎹ā鍨�
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,"鏈�杩戜竴娆＄嚎璺紭鍖栧け璐ワ紒")
+ .set(JkSketch::getPlanLineInfo,"鏈�杩戜竴娆＄嚎璺紭鍖栧け璐ワ紒"+e.getMessage())
.set(JkSketch::getStatus,Constants.THREE)
.set(JkSketch::getPlanLineEndDate,new Date()));
}
@@ -654,7 +658,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_DISTANCECLUSTER).getCode());
+ distance = Integer.parseInt(systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.JK_PLAN_DISTANCE_CLUSTER).getCode());
}catch (Exception e){
}
int totalNum = 0;
@@ -700,6 +704,11 @@
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();
@@ -738,7 +747,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?"鏈�杩戜竴娆＄嚎璺皟鏁存垚鍔�":"鏈�杩戜竴娆＄嚎璺皟鏁村け璐ワ紒")
@@ -946,14 +955,14 @@
int index =0;
for(JkSketchCustomer c : customers){
if(index ==0){
- if(c.getStartDistance() >0){
+ 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){
+ if(Constants.formatLongNum(c.getEndDistance())>0){
lineDistance+= Constants.formatLongNum(c.getEndDistance());
}else{
lineDistance += DistanceCalculator.calculateDistanceDecinal(c.getLatitude(),c.getLongitude(),cLatitude,cLongitude);
@@ -1085,11 +1094,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);
@@ -1107,7 +1118,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)
@@ -1117,7 +1128,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));
@@ -1184,11 +1195,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);
--
Gitblit v1.9.3