使用自定义线程池

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/amap/service/impl/AMapServiceImpl.java

@@ -8,6 +8,7 @@ import com.google.common.collect.Maps;
 import com.jsowell.common.constant.Constants;
 import com.jsowell.common.util.PageUtils;
 import com.jsowell.common.util.StringUtils;
+import com.jsowell.common.util.spring.SpringUtils;
 import com.jsowell.pile.domain.OrderBasicInfo;
 import com.jsowell.pile.domain.PileBasicInfo;
 import com.jsowell.pile.domain.PileStationInfo;
@@ -24,6 +25,7 @@ import com.jsowell.thirdparty.amap.service.AMapService;
 import com.jsowell.thirdparty.amap.util.AMapUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StopWatch;
@@ -49,6 +51,9 @@ import java.util.stream.Collectors;
 @Service
 public class AMapServiceImpl implements AMapService {
 
+    // 引入线程池
+    private ThreadPoolTaskExecutor executor = SpringUtils.getBean("threadPoolTaskExecutor");
+
     @Autowired
     private PileStationInfoService pileStationInfoService;
 
@@ -309,13 +314,13 @@ public class AMapServiceImpl implements AMapService {
 
         stopWatch.start("拼装高德需要的格式数据-查询数据");
         // 根据站点id查询计费模板
-        CompletableFuture<List<AMapPriceChargingInfo>> future1 = CompletableFuture.supplyAsync(() -> getPriceInfoByStationId(String.valueOf(stationInfoId)));
+        CompletableFuture<List<AMapPriceChargingInfo>> future1 = CompletableFuture.supplyAsync(() -> getPriceInfoByStationId(String.valueOf(stationInfoId)), executor);
 
         // 根据站点id查询快、慢充设备数量
-        CompletableFuture<Map<String, Integer>> future2 = CompletableFuture.supplyAsync(() -> pileConnectorInfoService.getPileTypeNum(stationInfoId));
+        CompletableFuture<Map<String, Integer>> future2 = CompletableFuture.supplyAsync(() -> pileConnectorInfoService.getPileTypeNum(stationInfoId), executor);
 
         // 根据站点查询站点下所有桩
-        CompletableFuture<List<AMapEquipmentInfo>> future3 = CompletableFuture.supplyAsync(() -> getPileListByStationId(String.valueOf(stationInfoId)));
+        CompletableFuture<List<AMapEquipmentInfo>> future3 = CompletableFuture.supplyAsync(() -> getPileListByStationId(String.valueOf(stationInfoId)), executor);
 
         CompletableFuture<Void> all = CompletableFuture.allOf(future1, future2, future3);
         // .join()和.get()都会阻塞并获取线程的执行情况

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/HuaweiServiceV2.java

@@ -22,6 +22,7 @@ import com.jsowell.common.util.DateUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.Threads;
 import com.jsowell.common.util.YKCUtils;
+import com.jsowell.common.util.spring.SpringUtils;
 import com.jsowell.pile.domain.*;
 import com.jsowell.pile.domain.huawei.HWStationInfo;
 import com.jsowell.pile.domain.huawei.HWStationStatusInfo;
@@ -31,6 +32,7 @@ import com.jsowell.pile.dto.huawei.*;
 import com.jsowell.pile.service.*;
 import com.jsowell.pile.service.programlogic.AbstractProgramLogic;
 import com.jsowell.pile.service.programlogic.ProgramLogicFactory;
+import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.pile.vo.huawei.QueryChargeStatusVO;
 import com.jsowell.pile.vo.huawei.QueryEquipAuthVO;
 import com.jsowell.pile.vo.huawei.QueryStartChargeVO;
@@ -38,7 +40,6 @@ import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.thirdparty.lianlian.common.CommonResult;
 import com.jsowell.thirdparty.lianlian.domain.ConnectorStatusInfo;
-import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.thirdparty.lianlian.service.LianLianService;
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.Encodes;
@@ -46,6 +47,7 @@ import com.jsowell.thirdparty.platform.util.GBSignUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 
 import java.io.UnsupportedEncodingException;
@@ -67,6 +69,9 @@ import java.util.stream.Collectors;
 @Slf4j
 public class HuaweiServiceV2 {
 
+    // 引入线程池
+    private ThreadPoolTaskExecutor executor = SpringUtils.getBean("threadPoolTaskExecutor");
+
     @Autowired
     private LianLianService lianLianService;
 
@@ -376,7 +381,7 @@ public class HuaweiServiceV2 {
                 }
                 String result = deliverEquipBusinessPolicy(equipBizSeq, pileConnectorCode);
                 log.info("华为 异步调用 下发计费策略 接口 result:{}", result);
-            });
+            }, executor);
 
             resultJson.put("SuccStat", 0);
             resultJson.put("FailReason", 0);
@@ -827,7 +832,7 @@ public class HuaweiServiceV2 {
             } catch (Exception e) {
                 log.error("异步结算华为订单 error", e);
             }
-        });
+        }, executor);
 
 
 

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/huawei/impl/HuaWeiServiceImpl.java

@@ -9,6 +9,7 @@ import com.jsowell.common.enums.ykc.StartModeEnum;
 import com.jsowell.common.exception.BusinessException;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.common.util.YKCUtils;
+import com.jsowell.common.util.spring.SpringUtils;
 import com.jsowell.pile.domain.*;
 import com.jsowell.pile.domain.huawei.HWStationInfo;
 import com.jsowell.pile.dto.*;
@@ -16,11 +17,11 @@ import com.jsowell.pile.dto.huawei.DeliverEquipBusinessDTO;
 import com.jsowell.pile.dto.huawei.ReceiveDeliverDTO;
 import com.jsowell.pile.dto.huawei.VinStartChargeDTO;
 import com.jsowell.pile.service.*;
+import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.pile.vo.base.ThirdPartyStationRelationVO;
 import com.jsowell.pile.vo.uniapp.customer.BillingPriceVO;
 import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.thirdparty.huawei.HuaWeiService;
-import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.thirdparty.platform.util.Cryptos;
 import com.jsowell.thirdparty.platform.util.Encodes;
 import com.jsowell.thirdparty.platform.util.GBSignUtils;
@@ -30,6 +31,7 @@ import com.jsowell.thirdparty.zhongdianlian.service.ZDLService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
 import org.springframework.stereotype.Service;
 
 import java.io.UnsupportedEncodingException;
@@ -51,6 +53,9 @@ import java.util.stream.Collectors;
 @Slf4j
 public class HuaWeiServiceImpl implements HuaWeiService {
 
+    // 引入线程池
+    private ThreadPoolTaskExecutor executor = SpringUtils.getBean("threadPoolTaskExecutor");
+
     @Autowired
     private ZDLService zdlService;
 
@@ -297,7 +302,7 @@ public class HuaWeiServiceImpl implements HuaWeiService {
                 }
                 String result = deliverEquipBusinessPolicy(equipBizSeq, pileConnectorCode);
                 log.info("华为 异步调用 下发计费策略 接口 result:{}", result);
-            });
+            }, executor);
 
             resultJson.put("SuccStat", 0);
             resultJson.put("FailReason", 0);

jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/service/impl/LianLianServiceImpl.java

@@ -673,15 +673,6 @@ public class LianLianServiceImpl implements LianLianService {
             // 如果是新电途平台，则将 startChargeSeqStat 改为 1-启动中
             vo.setStartChargeSeqStat(1);
         }
-        // 异步推送启动充电结果  2024.01.25改为在0x33帧类型中统一回复
-        // CompletableFuture.runAsync(() -> {
-        //     try {
-        //         Thread.sleep(200);
-        //     } catch (InterruptedException e) {
-        //         e.printStackTrace();
-        //     }
-        //     pushStartChargeResult(orderCode);
-        // });
 
         // 加密
         Map<String, String> resultMap = Maps.newLinkedHashMap();