From d9c657aa78cf0ebe31933a87e63ca92edd8a8da3 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 六月 2026 09:57:50 +0800
Subject: [PATCH] 数据采集站

---
 server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/JkSketchServiceImpl.java |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 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..8a477f2 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
@@ -33,6 +33,7 @@
 import netscape.javascript.JSObject;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -44,6 +45,7 @@
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.Date;
+import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -56,6 +58,9 @@
 @Slf4j
 public class JkSketchServiceImpl implements JkSketchService {
 
+    @Autowired
+    @Qualifier("asyncExecutor")
+    private Executor asyncExecutor;
     @Autowired
     private JkSketchMapper jkSketchMapper;
     @Autowired
@@ -286,7 +291,7 @@
                 BigDecimal finalCLongitude = cLongitude;
                 log.error("浜ら�氳鍒�====绾跨▼circle锛�"+i+"====start:"+start+"===========end:"+end);
                 int finalI = i;
-                Thread t1=new Thread(() -> {
+                asyncExecutor.execute(() -> {
                     try {
                         int index =0;
                         for (int j = start; j < end; j++) {
@@ -311,10 +316,9 @@
                     }
 
                 });
-                t1.start();
             }
         }catch (Exception e){
-            e.printStackTrace();
+            log.error("distanceCustomer寮傚父", e);
         }finally {
 
         }
@@ -550,7 +554,7 @@
             dataModel.initDataInfo(vehicleNumber1,demands1,demands2,vehicleCapacities1,distanceMatrix1,vehicleMaxNodes);
             TspSolver.startSearch(dataModel);
             JkSketch nowModel = jkSketchMapper.selectById(model.getId());
-            if(StringUtils.equals(model.getJobId(), nowModel.getJobId())){
+            if(!StringUtils.equals(model.getJobId(), nowModel.getJobId())){
                log.error( "浼樺寲缁撴灉宸插け鏁堬紝闈炴渶杩戜竴娆℃搷浣滐紒");
                return;
             }
@@ -708,7 +712,7 @@
                     throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛屾湭鑾峰緱鏈�浼樹氦閫氳鍒掓柟妗堬紒");
                 }
                 JkSketch nowModel = jkSketchMapper.selectById(model.getId());
-                if(StringUtils.equals(model.getJobId(), nowModel.getJobId())){
+                if(!StringUtils.equals(model.getJobId(), nowModel.getJobId())){
                     throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绾胯矾銆�"+line.getLineName()+"銆戣皟鏁村け璐� 锛岄潪鏈�杩戜竴娆℃搷浣滐紒");
                 }
 

--
Gitblit v1.9.3