From 5480c6b604d16a34bec547a293ea1a3ba405ab10 Mon Sep 17 00:00:00 2001 From: qushutong <1976590620@qq.com> Date: Thu, 21 Nov 2024 11:07:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/service/impl/RentBlacklistServiceImpl.java | 9 ++++++--- .../rent/service/impl/RentContractInfoServiceImpl.java | 9 +++++++-- .../rent/service/impl/RentTenantInfoServiceImpl.java | 9 ++++++--- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java index bca0d53..8b1de2f 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java @@ -12,14 +12,17 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.form.RentTenantDataFormDTO; -import com.epmet.dto.result.RentTenantDataResultDTO; -import com.epmet.feign.EpmetUserOpenFeignClient; +//import com.epmet.dto.form.RentTenantDataFormDTO; +//import com.epmet.dto.result.RentTenantDataResultDTO; +//import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.plugin.power.dto.rent.RentBlacklistDTO; import com.epmet.plugin.power.modules.rent.dao.RentBlacklistDao; import com.epmet.plugin.power.modules.rent.entity.RentBlacklistEntity; import com.epmet.plugin.power.modules.rent.redis.RentBlacklistRedis; import com.epmet.plugin.power.modules.rent.service.RentBlacklistService; +import com.epmet.user.dto.form.RentTenantDataFormDTO; +import com.epmet.user.dto.result.RentTenantDataResultDTO; +import com.epmet.user.feign.EpmetUserOpenFeignClient; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java index ee495da..09e3960 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java @@ -14,8 +14,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.IdCardNoValidatorUtils; import com.epmet.dto.*; import com.epmet.dto.form.IcHouseAddFormDTO; -import com.epmet.dto.form.RentTenantFormDTO; -import com.epmet.feign.EpmetUserOpenFeignClient; +//import com.epmet.dto.form.RentTenantFormDTO; +//import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.plugin.commons.utils.IdCardRegexUtils; import com.epmet.plugin.power.dto.hik.HikCommunityInfoDTO; @@ -40,6 +40,11 @@ import com.epmet.plugin.power.modules.rent.service.PliRentContractInfoLogService import com.epmet.plugin.power.modules.rent.service.RentContractFileService; import com.epmet.plugin.power.modules.rent.service.RentContractInfoService; import com.epmet.plugin.power.modules.rent.service.RentTenantInfoService; +import com.epmet.user.dto.IcResiUserAttachmentDTO; +import com.epmet.user.dto.IcResiUserDTO; +import com.epmet.user.dto.VaccineLogDetailDTO; +import com.epmet.user.dto.form.RentTenantFormDTO; +import com.epmet.user.feign.EpmetUserOpenFeignClient; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java index 1dfbd9e..959d14a 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentTenantInfoServiceImpl.java @@ -9,9 +9,9 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.IcResiUserAttachmentDTO; -import com.epmet.dto.form.RentTenantFormDTO; -import com.epmet.feign.EpmetUserOpenFeignClient; +//import com.epmet.dto.IcResiUserAttachmentDTO; +//import com.epmet.dto.form.RentTenantFormDTO; +//import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.plugin.power.dto.rent.RentContractFileDTO; import com.epmet.plugin.power.dto.rent.RentTenantInfoDTO; import com.epmet.plugin.power.modules.rent.dao.RentTenantInfoDao; @@ -20,6 +20,9 @@ import com.epmet.plugin.power.modules.rent.entity.RentTenantInfoEntity; import com.epmet.plugin.power.modules.rent.redis.RentTenantInfoRedis; import com.epmet.plugin.power.modules.rent.service.RentContractFileService; import com.epmet.plugin.power.modules.rent.service.RentTenantInfoService; +import com.epmet.user.dto.IcResiUserAttachmentDTO; +import com.epmet.user.dto.form.RentTenantFormDTO; +import com.epmet.user.feign.EpmetUserOpenFeignClient; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service;