#

luxiaotao1123

2024-10-07 3900916ffa698a8d057ab9ee910b292657b536ae

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/RouteServiceImpl.java

@@ -21,22 +21,25 @@
    private CodeService codeService;

    @Override
    public Route createRouteByCode(Code code0, Code code1) {
        return createRouteByCode(code0, code1, 0, null);
    public Route createRouteByCode(Code startCode, Code endCode) {
        return createRouteByCode(startCode, endCode, 0, null);
    }

    @Override
    public Route createRouteByCode(Code code0, Code code1, Integer direction, Long userId) {
        Route route = this.findByCodeOfBoth(code0.getId(), code1.getId());
    public Route createRouteByCode(Code startCode, Code endCode, Integer direction, Long userId) {
        if (startCode.getData().equals(endCode.getData())) {
            return null;
        }
        Route route = this.findByCodeOfBoth(startCode.getId(), endCode.getId());
        direction = Optional.ofNullable(direction).orElse(0);
        if (null == route) {
            Date now = new Date();
            route = new Route();
            route.setUuid(code0.getData() + "-" + code1.getData());
            route.setStartCode(code0.getId());
            route.setEndCode(code1.getId());
            route.setUuid(startCode.getData() + "-" + endCode.getData());
            route.setStartCode(startCode.getId());
            route.setEndCode(endCode.getId());
            route.setDirection(direction);
            route.setCodeArr(GsonUtils.toJson(Arrays.asList(code0.getId(), code1.getId())));
            route.setCodeArr(GsonUtils.toJson(Arrays.asList(startCode.getId(), endCode.getId())));
            route.setCreateBy(userId);
            route.setCreateTime(now);
            route.setUpdateBy(userId);
@@ -63,10 +66,10 @@
    }

    @Override
    public Route findByCodeOfBoth(Long code0, Long code1) {
        Route route = getOne(new LambdaQueryWrapper<Route>().eq(Route::getStartCode, code0).eq(Route::getEndCode, code1).eq(Route::getStatus, 1));
    public Route findByCodeOfBoth(Long startCode, Long endCode) {
        Route route = getOne(new LambdaQueryWrapper<Route>().eq(Route::getStartCode, startCode).eq(Route::getEndCode, endCode).eq(Route::getStatus, 1));
        if (null == route) {
            route = getOne(new LambdaQueryWrapper<Route>().eq(Route::getEndCode, code0).eq(Route::getStartCode, code1).eq(Route::getStatus, 1));
            route = getOne(new LambdaQueryWrapper<Route>().eq(Route::getEndCode, startCode).eq(Route::getStartCode, endCode).eq(Route::getStatus, 1));
        }
        return route;
    }