6 changed files with 13 additions and 115 deletions
--- a/ebike-feign/src/main/java/com/ebike/feign/clients/OperateFeignClient.java
+++ b/ebike-feign/src/main/java/com/ebike/feign/clients/OperateFeignClient.java
@ -6,20 +6,19 @@ import com.ebike.feign.model.res.ReqUserOperateDto;
 import com.ebike.feign.model.res.ResFeignEbikeSysRcostsetDto;
 import com.ebike.feign.model.rsp.FeignEbikeRegionDto;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;

 import java.util.List;
-import java.util.concurrent.CompletableFuture;

 /**
 * 运营管理 外部调用。
 *
 * @author dingchao
 * @date 2025/3/27
+ * @modified by:
 */
@FeignClient(name = "ebike-operate")
 public interface OperateFeignClient {
@ -27,7 +26,7 @@ public interface OperateFeignClient {
     * 批量保存电池入库记录。
     *
     * @param ebikeBatteryCodes 电池编码
-     * @return 结果数据
+     * @return
     */
    @PostMapping("ebikeBatteryEnterRecords/batchSave")
    JsonResult<?> batchSaveBatteryEnterRecords(@RequestBody List<String> ebikeBatteryCodes);
@ -36,7 +35,7 @@ public interface OperateFeignClient {
     * 批量保存电池出库记录。
     *
     * @param ebikeBatteryCodes 电池编码
-     * @return 结果数据
+     * @return
     */
    @PostMapping("ebikeBatteryOutRecords/batchSave")
    JsonResult<?> batchSaveBatteryOutRecords(@RequestBody List<String> ebikeBatteryCodes);
@ -45,7 +44,7 @@ public interface OperateFeignClient {
     * 获取行政区域。
     *
     * @param parent_id 父级行政区域ID
-     * @return 结果数据
+     * @return
     */
    @GetMapping("ebikeSystemCodeMapInfo/ebikeAdministrationZone")
    JsonResult<?> getEbikeAdministrationZone(@RequestParam(name = "parent_id", required = false) String parent_id);
@ -54,7 +53,7 @@ public interface OperateFeignClient {
     * 根据行政区名称获取运营区域ID列表
     *
     * @param zoneName 区域名称
-     * @return 结果数据 详情
+     * @return 详情
     */
    @GetMapping("ebikeRegion/getRegionIdsByZone")
    JsonResult<?> getRegionIdsByZone(@RequestParam(name = "zoneName") String zoneName);
@ -63,7 +62,7 @@ public interface OperateFeignClient {
     * 保存车辆轨迹。
     *
     * @param ebikeTracking 车辆轨迹
-     * @return 结果数据 返回结果
+     * @return 返回结果
     */
    @PostMapping("ebikeTracking/save")
    JsonResult<?> saveEbikeTracking(@RequestBody EbikeTracking ebikeTracking);
@ -72,7 +71,7 @@ public interface OperateFeignClient {
     * 获取运营区详情。
     *
     * @param regionId 运营区id
-     * @return 结果数据 返回结果
+     * @return 返回结果
     */
    @GetMapping("ebikeRegion/getOperationById")
    JsonResult<FeignEbikeRegionDto> getOperationById(@RequestParam(name = "regionId") Long regionId);
@ -81,7 +80,7 @@ public interface OperateFeignClient {
     * 根据区域id获取计费规则。
     *
     * @param operationRegionId 运营区id
-     * @return 结果数据 返回结果
+     * @return 返回结果
     */
    @GetMapping("ebikesysrcostset/getRegionFeeConfigById")
    JsonResult<ResFeignEbikeSysRcostsetDto> getRegionFeeConfigById(@RequestParam(name = "operationRegionId") Long operationRegionId);
@ -89,8 +88,8 @@ public interface OperateFeignClient {
    /**
     * 设置用户所属运营区
     *
-     * @param reqUserOperateDto 信息
-     * @return 结果数据
+     * @param reqUserOperateDto
+     * @return
     */
    @PostMapping("ebikeRegion/setUserOperate")
    JsonResult<?> setUserOperate(@RequestBody ReqUserOperateDto reqUserOperateDto);
@ -98,29 +97,9 @@ public interface OperateFeignClient {
    /**
     * 删除用户所属运营区
     *
-     * @param staffId 员工id
-     * @return 结果数据
+     * @param staffId
+     * @return
     */
    @PostMapping("ebikeRegion/delUserOperate")
    JsonResult<?> delUserOperate(@RequestParam("staffId") Long staffId);
-
-    /**
-     * 删除用户所属运营区
-     *
-     * @param siteRegionId 站点id
-     * @return 结果数据
-     */
-    @Async
-    @GetMapping("ebikeRegion/addBorrowing")
-    CompletableFuture<?> addBorrowing(@RequestParam("siteRegionId") Long siteRegionId);
-
-    /**
-     * 删除用户所属运营区
-     *
-     * @param siteRegionId 站点id
-     * @return 结果数据
-     */
-    @Async
-    @GetMapping("ebikeRegion/addReturn")
-    CompletableFuture<?> addReturn(@RequestParam("siteRegionId") Long siteRegionId);
 }
--- a/ebike-feign/src/main/java/com/ebike/feign/config/ExampleFeignConfiguration.java
+++ b/ebike-feign/src/main/java/com/ebike/feign/config/ExampleFeignConfiguration.java
@ -1,22 +0,0 @@
-package com.ebike.feign.config;
-
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.annotation.EnableAsync;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-
-import java.util.concurrent.Executor;
-
-@Configuration
-@EnableAsync
-public class ExampleFeignConfiguration {
-    @Bean
-    public Executor asyncExecutor() {
-        ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
-        executor.setCorePoolSize(10);
-        executor.setMaxPoolSize(50);
-        executor.setQueueCapacity(100);
-        executor.initialize();
-        return executor;
-    }
-}
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/controller/EbikeRegionController.java
@ -237,29 +237,6 @@ public class EbikeRegionController {
        return JsonResult.success();
    }

-    /**
-     * 添加站点借车单量。
-     *
-     * @return {@code 200} 添加成功，{@code 500} 添加失败
-     */
-    @GetMapping("addBorrowing")
-    public JsonResult<?> addBorrowing(@RequestParam("siteRegionId") Long siteRegionId) {
-        siteRegionService.addBorrowing(siteRegionId);
-        return JsonResult.success();
-    }
-
-
-    /**
-     * 添加站点还车单量。
-     *
-     * @return {@code 200} 添加成功，{@code 500} 添加失败
-     */
-    @GetMapping("addReturn")
-    public JsonResult<?> addReturn(@RequestParam("siteRegionId") Long siteRegionId) {
-        siteRegionService.addReturn(siteRegionId);
-        return JsonResult.success();
-    }
-
    /**
     * 获取当前登录用户所有行政区。
     */
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSiteRegionService.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/EbikeSiteRegionService.java
@ -65,19 +65,7 @@ public interface EbikeSiteRegionService extends IService<EbikeSiteRegion> {
    /**
     * 站点附件上传
     * @param file 附件
-     * @return 文件id
+     * @return
     */
    Long saveImages(MultipartFile file) throws Exception;
-
-    /**
-     * 添加站点借车单量
-     * @param siteRegionId 站点ID
-     */
-    void addBorrowing(Long siteRegionId);
-
-    /**
-     * 添加站点还车单量
-     * @param siteRegionId 站点ID
-     */
-    void addReturn(Long siteRegionId);
 }
--- a/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java
+++ b/ebike-operate/src/main/java/com/cdzy/ebikeoperate/service/impl/EbikeSiteRegionServiceImpl.java
@ -122,22 +122,6 @@ public class EbikeSiteRegionServiceImpl extends ServiceImpl<EbikeSiteRegionMappe
        return image.getImageId();
    }

-    @Override
-    public void addBorrowing(Long siteRegionId) {
-        EbikeSiteRegion ebikeSiteRegion = this.mapper.selectOneById(siteRegionId);
-        int i = ebikeSiteRegion.getBorrowingOrder() + 1;
-        ebikeSiteRegion.setBorrowingOrder(i);
-        this.mapper.update(ebikeSiteRegion);
-    }
-
-    @Override
-    public void addReturn(Long siteRegionId) {
-        EbikeSiteRegion ebikeSiteRegion = this.mapper.selectOneById(siteRegionId);
-        int i = ebikeSiteRegion.getReturnOrder() + 1;
-        ebikeSiteRegion.setReturnOrder(i);
-        this.mapper.update(ebikeSiteRegion);
-    }
-
    private void delImages(Long siteRegionId) throws Exception {
        QueryWrapper queryWrapper = QueryWrapper.create()
                .where(EBIKE_SITE_IMAGES.SITE_REGION_ID.eq(siteRegionId));
--- a/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
+++ b/ebike-orders/src/main/java/com/cdzy/orders/service/impl/UserOrdersServiceImpl.java
@ -129,10 +129,6 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
        if (jsonObject.getInteger("code") != 0) {
            throw new RuntimeException("开锁失败");
        }
-        //添加借车单量
-        Long siteRegionId = redisUtil.isPointInSiteWithSiteRegionId(resGpsDto.getLongitude(), resGpsDto.getLatitude(),regionDto.getOperationRegionId());
-        operateFeignClient.addBorrowing(siteRegionId);
-
        userOrders.setBikeId(bikeInfoDto.getBikeId());
        String stringBuilder = resGpsDto.getLongitude() + "," + resGpsDto.getLatitude();
        userOrders.setRidePoint(stringBuilder);
@ -185,10 +181,6 @@ public class UserOrdersServiceImpl extends ServiceImpl<UserOrdersMapper, EbikeUs
        if (jsonObject.getInteger("code") != 0) {
            throw new RuntimeException("关锁失败");
        }
-        //添加还车单量
-        Long siteRegionId = redisUtil.isPointInSiteWithSiteRegionId(resGpsDto.getLongitude(), resGpsDto.getLatitude(),regionDto.getOperationRegionId());
-        operateFeignClient.addReturn(siteRegionId);
-
        return userOrders.getOrderId();
    }