diff --git a/buildics-oviphone-back-controller/src/main/java/com/buildics/oviphone/back/controller/DeviceController.java b/buildics-oviphone-back-controller/src/main/java/com/buildics/oviphone/back/controller/DeviceController.java index cf2b7ba..b1e5a36 100644 --- a/buildics-oviphone-back-controller/src/main/java/com/buildics/oviphone/back/controller/DeviceController.java +++ b/buildics-oviphone-back-controller/src/main/java/com/buildics/oviphone/back/controller/DeviceController.java @@ -5,12 +5,9 @@ import com.buildics.oviphone.back.common.exception.BusinessException; import com.buildics.oviphone.back.common.response.PageResponse; import com.buildics.oviphone.back.common.response.ResponseCode; import com.buildics.oviphone.back.configurator.interceptor.AccessRequired; -import com.buildics.oviphone.back.dto.company.CompanySearchParams; import com.buildics.oviphone.back.dto.device.DevicePageSearchParam; import com.buildics.oviphone.back.service.DeviceService; -import com.buildics.oviphone.back.vo.company.CompanyPageDTO; import com.buildics.oviphone.back.vo.device.DevicePageDTO; -import io.swagger.v3.oas.annotations.Hidden; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Schema; @@ -35,7 +32,7 @@ import org.springframework.web.bind.annotation.RestController; @SuppressWarnings("unchecked") public class DeviceController { - private static Logger logger = LoggerFactory.getLogger(DeviceController.class); + private final static Logger logger = LoggerFactory.getLogger(DeviceController.class); @Autowired private DeviceService deviceService; diff --git a/buildics-oviphone-back-service/src/main/java/com/buildics/oviphone/back/service/DeviceService.java b/buildics-oviphone-back-service/src/main/java/com/buildics/oviphone/back/service/DeviceService.java index 0aaeea7..3e69202 100644 --- a/buildics-oviphone-back-service/src/main/java/com/buildics/oviphone/back/service/DeviceService.java +++ b/buildics-oviphone-back-service/src/main/java/com/buildics/oviphone/back/service/DeviceService.java @@ -2,7 +2,6 @@ package com.buildics.oviphone.back.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.buildics.oviphone.back.dto.device.DevicePageSearchParam; -import com.buildics.oviphone.back.vo.company.CompanyPageDTO; import com.buildics.oviphone.back.vo.device.DevicePageDTO; /** diff --git a/buildics-oviphone-back-service/src/main/java/com/buildics/oviphone/back/service/impl/DeviceServiceImpl.java b/buildics-oviphone-back-service/src/main/java/com/buildics/oviphone/back/service/impl/DeviceServiceImpl.java index b0df95d..9f40894 100644 --- a/buildics-oviphone-back-service/src/main/java/com/buildics/oviphone/back/service/impl/DeviceServiceImpl.java +++ b/buildics-oviphone-back-service/src/main/java/com/buildics/oviphone/back/service/impl/DeviceServiceImpl.java @@ -3,16 +3,10 @@ package com.buildics.oviphone.back.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.buildics.oviphone.back.common.language.msg.MsgLanguageChange; -import com.buildics.oviphone.back.dao.ex.BasicCompanyMapperExt; -import com.buildics.oviphone.back.dao.ex.BasicUserMapperExt; import com.buildics.oviphone.back.dao.ex.DeviceInfoMapperExt; -import com.buildics.oviphone.back.dto.company.CompanySearchParams; import com.buildics.oviphone.back.dto.device.DevicePageSearchParam; -import com.buildics.oviphone.back.service.CompanyService; import com.buildics.oviphone.back.service.DeviceService; import com.buildics.oviphone.back.service.common.CommonOpt; -import com.buildics.oviphone.back.util.async.OptAsync; -import com.buildics.oviphone.back.vo.company.CompanyPageDTO; import com.buildics.oviphone.back.vo.device.DevicePageDTO; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -33,18 +27,14 @@ import java.util.List; @Service public class DeviceServiceImpl implements DeviceService { - private static Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class); + private final static Logger logger = LoggerFactory.getLogger(DeviceServiceImpl.class); @Value("${wgbt.type.id}") private List wgbtTypeIdList; - @Autowired - private OptAsync optAsync; @Autowired private MsgLanguageChange msgLanguageChange; @Autowired - private BasicCompanyMapperExt basicCompanyMapperExt; - @Autowired private CommonOpt commonOpt; @Autowired private DeviceInfoMapperExt deviceInfoMapperExt;