From cdba441bc692f95fdd7eb50d30dfdf4e346b1ee0 Mon Sep 17 00:00:00 2001 From: pnoker Date: Sun, 26 May 2024 23:38:29 +0800 Subject: [PATCH] refactor(auth,manager): remove unused cache imports from service implementations --- .../pnoker/center/auth/service/impl/ResourceServiceImpl.java | 1 - .../center/auth/service/impl/RoleResourceBindServiceImpl.java | 1 - .../center/auth/service/impl/RoleUserBindServiceImpl.java | 1 - .../center/auth/service/impl/TenantBindServiceImpl.java | 1 - .../pnoker/center/auth/service/impl/TenantServiceImpl.java | 1 - .../pnoker/center/auth/service/impl/UserLoginServiceImpl.java | 1 - .../center/auth/service/impl/UserPasswordServiceImpl.java | 1 - .../pnoker/center/auth/service/impl/UserServiceImpl.java | 1 - .../center/manager/service/PointAttributeConfigService.java | 1 - .../pnoker/center/manager/service/impl/DeviceServiceImpl.java | 4 ++++ .../manager/service/impl/DriverAttributeServiceImpl.java | 1 - .../pnoker/center/manager/service/impl/DriverServiceImpl.java | 1 - .../manager/service/impl/PointAttributeServiceImpl.java | 1 - .../pnoker/center/manager/service/impl/PointServiceImpl.java | 1 - .../center/manager/service/impl/ProfileBindServiceImpl.java | 1 - .../center/manager/service/impl/ProfileServiceImpl.java | 1 - 16 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/ResourceServiceImpl.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/ResourceServiceImpl.java index 97a1def7e..815045d7d 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/ResourceServiceImpl.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/ResourceServiceImpl.java @@ -24,7 +24,6 @@ import io.github.pnoker.center.auth.dal.ResourceManager; import io.github.pnoker.center.auth.entity.bo.ResourceBO; import io.github.pnoker.center.auth.entity.builder.ResourceBuilder; import io.github.pnoker.center.auth.entity.model.ResourceDO; -import io.github.pnoker.center.auth.entity.query.LimitedIpQuery; import io.github.pnoker.center.auth.entity.query.ResourceQuery; import io.github.pnoker.center.auth.service.ResourceService; import io.github.pnoker.common.constant.common.QueryWrapperConstant; diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/RoleResourceBindServiceImpl.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/RoleResourceBindServiceImpl.java index 5b96de570..4e10fab0c 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/RoleResourceBindServiceImpl.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/RoleResourceBindServiceImpl.java @@ -28,7 +28,6 @@ import io.github.pnoker.center.auth.entity.builder.ResourceBuilder; import io.github.pnoker.center.auth.entity.builder.RoleResourceBindBuilder; import io.github.pnoker.center.auth.entity.model.ResourceDO; import io.github.pnoker.center.auth.entity.model.RoleResourceBindDO; -import io.github.pnoker.center.auth.entity.query.ResourceQuery; import io.github.pnoker.center.auth.entity.query.RoleResourceBindQuery; import io.github.pnoker.center.auth.service.RoleResourceBindService; import io.github.pnoker.common.constant.common.QueryWrapperConstant; diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/RoleUserBindServiceImpl.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/RoleUserBindServiceImpl.java index 4e4ed14f9..5ae7a6706 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/RoleUserBindServiceImpl.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/RoleUserBindServiceImpl.java @@ -28,7 +28,6 @@ import io.github.pnoker.center.auth.entity.builder.RoleBuilder; import io.github.pnoker.center.auth.entity.builder.RoleUserBindBuilder; import io.github.pnoker.center.auth.entity.model.RoleDO; import io.github.pnoker.center.auth.entity.model.RoleUserBindDO; -import io.github.pnoker.center.auth.entity.query.RoleResourceBindQuery; import io.github.pnoker.center.auth.entity.query.RoleUserBindQuery; import io.github.pnoker.center.auth.service.RoleUserBindService; import io.github.pnoker.common.constant.common.QueryWrapperConstant; diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/TenantBindServiceImpl.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/TenantBindServiceImpl.java index 147edb7a4..1cdd80266 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/TenantBindServiceImpl.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/TenantBindServiceImpl.java @@ -23,7 +23,6 @@ import io.github.pnoker.center.auth.dal.TenantBindManager; import io.github.pnoker.center.auth.entity.bo.TenantBindBO; import io.github.pnoker.center.auth.entity.builder.TenantBindBuilder; import io.github.pnoker.center.auth.entity.model.TenantBindDO; -import io.github.pnoker.center.auth.entity.query.RoleUserBindQuery; import io.github.pnoker.center.auth.entity.query.TenantBindQuery; import io.github.pnoker.center.auth.service.TenantBindService; import io.github.pnoker.common.constant.common.QueryWrapperConstant; diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/TenantServiceImpl.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/TenantServiceImpl.java index b842759e9..333a3bbca 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/TenantServiceImpl.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/TenantServiceImpl.java @@ -24,7 +24,6 @@ import io.github.pnoker.center.auth.dal.TenantManager; import io.github.pnoker.center.auth.entity.bo.TenantBO; import io.github.pnoker.center.auth.entity.builder.TenantBuilder; import io.github.pnoker.center.auth.entity.model.TenantDO; -import io.github.pnoker.center.auth.entity.query.TenantBindQuery; import io.github.pnoker.center.auth.entity.query.TenantQuery; import io.github.pnoker.center.auth.service.TenantService; import io.github.pnoker.common.constant.common.QueryWrapperConstant; diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserLoginServiceImpl.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserLoginServiceImpl.java index 27c9796b8..cd550352f 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserLoginServiceImpl.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserLoginServiceImpl.java @@ -24,7 +24,6 @@ import io.github.pnoker.center.auth.dal.UserLoginManager; import io.github.pnoker.center.auth.entity.bo.UserLoginBO; import io.github.pnoker.center.auth.entity.builder.UserLoginBuilder; import io.github.pnoker.center.auth.entity.model.UserLoginDO; -import io.github.pnoker.center.auth.entity.query.TenantQuery; import io.github.pnoker.center.auth.entity.query.UserLoginQuery; import io.github.pnoker.center.auth.service.UserLoginService; import io.github.pnoker.common.constant.common.QueryWrapperConstant; diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserPasswordServiceImpl.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserPasswordServiceImpl.java index 215168b46..904c805fa 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserPasswordServiceImpl.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserPasswordServiceImpl.java @@ -23,7 +23,6 @@ import io.github.pnoker.center.auth.dal.UserPasswordManager; import io.github.pnoker.center.auth.entity.bo.UserPasswordBO; import io.github.pnoker.center.auth.entity.builder.UserPasswordBuilder; import io.github.pnoker.center.auth.entity.model.UserPasswordDO; -import io.github.pnoker.center.auth.entity.query.UserLoginQuery; import io.github.pnoker.center.auth.entity.query.UserPasswordQuery; import io.github.pnoker.center.auth.service.UserPasswordService; import io.github.pnoker.common.constant.common.AlgorithmConstant; diff --git a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserServiceImpl.java b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserServiceImpl.java index fd306f33d..d3d9f6e05 100644 --- a/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserServiceImpl.java +++ b/dc3-center/dc3-center-auth/src/main/java/io/github/pnoker/center/auth/service/impl/UserServiceImpl.java @@ -25,7 +25,6 @@ import io.github.pnoker.center.auth.dal.UserManager; import io.github.pnoker.center.auth.entity.bo.UserBO; import io.github.pnoker.center.auth.entity.builder.UserBuilder; import io.github.pnoker.center.auth.entity.model.UserDO; -import io.github.pnoker.center.auth.entity.query.UserPasswordQuery; import io.github.pnoker.center.auth.entity.query.UserQuery; import io.github.pnoker.center.auth.service.UserService; import io.github.pnoker.common.constant.common.QueryWrapperConstant; diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/PointAttributeConfigService.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/PointAttributeConfigService.java index 911e39629..a23833aea 100644 --- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/PointAttributeConfigService.java +++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/PointAttributeConfigService.java @@ -17,7 +17,6 @@ package io.github.pnoker.center.manager.service; import io.github.pnoker.center.manager.entity.bo.DeviceBO; -import io.github.pnoker.center.manager.entity.bo.DriverAttributeConfigBO; import io.github.pnoker.center.manager.entity.bo.PointAttributeConfigBO; import io.github.pnoker.center.manager.entity.query.PointAttributeConfigQuery; import io.github.pnoker.common.base.service.BaseService; diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DeviceServiceImpl.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DeviceServiceImpl.java index d51168443..1e9d8b75a 100644 --- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DeviceServiceImpl.java +++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DeviceServiceImpl.java @@ -17,6 +17,7 @@ package io.github.pnoker.center.manager.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.io.FileUtil; import cn.hutool.core.text.CharSequenceUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -280,6 +281,9 @@ public class DeviceServiceImpl implements DeviceService { MetadataEvent metadataEvent = new MetadataEvent(this, importDeviceBO.getId(), MetadataTypeEnum.DEVICE, MetadataOperateTypeEnum.ADD); metadataEventPublisher.publishEvent(metadataEvent); } + + // 删除文件 + FileUtil.del(file); } @Override diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DriverAttributeServiceImpl.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DriverAttributeServiceImpl.java index 44515904a..c8a1f299c 100644 --- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DriverAttributeServiceImpl.java +++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DriverAttributeServiceImpl.java @@ -25,7 +25,6 @@ import io.github.pnoker.center.manager.dal.DriverAttributeManager; import io.github.pnoker.center.manager.entity.bo.DriverAttributeBO; import io.github.pnoker.center.manager.entity.builder.DriverAttributeBuilder; import io.github.pnoker.center.manager.entity.model.DriverAttributeDO; -import io.github.pnoker.center.manager.entity.query.DeviceQuery; import io.github.pnoker.center.manager.entity.query.DriverAttributeQuery; import io.github.pnoker.center.manager.service.DriverAttributeService; import io.github.pnoker.common.constant.common.QueryWrapperConstant; diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DriverServiceImpl.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DriverServiceImpl.java index d88c39cfb..8300d7c84 100644 --- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DriverServiceImpl.java +++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/DriverServiceImpl.java @@ -30,7 +30,6 @@ import io.github.pnoker.center.manager.entity.builder.DriverBuilder; import io.github.pnoker.center.manager.entity.model.DeviceDO; import io.github.pnoker.center.manager.entity.model.DriverDO; import io.github.pnoker.center.manager.entity.model.PointDO; -import io.github.pnoker.center.manager.entity.query.DriverAttributeQuery; import io.github.pnoker.center.manager.entity.query.DriverQuery; import io.github.pnoker.center.manager.service.DriverService; import io.github.pnoker.center.manager.service.ProfileBindService; diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/PointAttributeServiceImpl.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/PointAttributeServiceImpl.java index cf16e2b09..7d5edc17a 100644 --- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/PointAttributeServiceImpl.java +++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/PointAttributeServiceImpl.java @@ -25,7 +25,6 @@ import io.github.pnoker.center.manager.dal.PointAttributeManager; import io.github.pnoker.center.manager.entity.bo.PointAttributeBO; import io.github.pnoker.center.manager.entity.builder.PointAttributeBuilder; import io.github.pnoker.center.manager.entity.model.PointAttributeDO; -import io.github.pnoker.center.manager.entity.query.PointAttributeConfigQuery; import io.github.pnoker.center.manager.entity.query.PointAttributeQuery; import io.github.pnoker.center.manager.service.PointAttributeService; import io.github.pnoker.common.constant.common.QueryWrapperConstant; diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/PointServiceImpl.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/PointServiceImpl.java index 5c963a8db..1eb4e1365 100644 --- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/PointServiceImpl.java +++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/PointServiceImpl.java @@ -30,7 +30,6 @@ import io.github.pnoker.center.manager.dal.ProfileBindManager; import io.github.pnoker.center.manager.entity.bo.*; import io.github.pnoker.center.manager.entity.builder.PointBuilder; import io.github.pnoker.center.manager.entity.model.*; -import io.github.pnoker.center.manager.entity.query.PointAttributeQuery; import io.github.pnoker.center.manager.entity.query.PointQuery; import io.github.pnoker.center.manager.event.metadata.MetadataEventPublisher; import io.github.pnoker.center.manager.mapper.DeviceMapper; diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/ProfileBindServiceImpl.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/ProfileBindServiceImpl.java index 2ef0e6ebc..bf12937dc 100644 --- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/ProfileBindServiceImpl.java +++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/ProfileBindServiceImpl.java @@ -24,7 +24,6 @@ import io.github.pnoker.center.manager.dal.ProfileBindManager; import io.github.pnoker.center.manager.entity.bo.ProfileBindBO; import io.github.pnoker.center.manager.entity.builder.ProfileBindBuilder; import io.github.pnoker.center.manager.entity.model.ProfileBindDO; -import io.github.pnoker.center.manager.entity.query.PointQuery; import io.github.pnoker.center.manager.entity.query.ProfileBindQuery; import io.github.pnoker.center.manager.service.ProfileBindService; import io.github.pnoker.common.constant.common.QueryWrapperConstant; diff --git a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/ProfileServiceImpl.java b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/ProfileServiceImpl.java index 62ad4aba8..85d2d38ba 100644 --- a/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/ProfileServiceImpl.java +++ b/dc3-center/dc3-center-manager/src/main/java/io/github/pnoker/center/manager/service/impl/ProfileServiceImpl.java @@ -31,7 +31,6 @@ import io.github.pnoker.center.manager.entity.builder.ProfileBuilder; import io.github.pnoker.center.manager.entity.model.PointDO; import io.github.pnoker.center.manager.entity.model.ProfileBindDO; import io.github.pnoker.center.manager.entity.model.ProfileDO; -import io.github.pnoker.center.manager.entity.query.ProfileBindQuery; import io.github.pnoker.center.manager.entity.query.ProfileQuery; import io.github.pnoker.center.manager.mapper.ProfileMapper; import io.github.pnoker.center.manager.service.ProfileService;