From 000139772077b1293e40479e9e78ad6166170648 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 21 Nov 2022 14:45:21 +0800 Subject: [PATCH 1/3] bug --- .../rent/service/impl/RentContractInfoServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 2ae5794..6b08c82 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 @@ -2,6 +2,7 @@ package com.epmet.plugin.power.modules.rent.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -31,6 +32,7 @@ import com.epmet.plugin.power.dto.rent.RentTenantInfoDTO; import com.epmet.plugin.power.modules.hik.service.HikCommunityInfoService; import com.epmet.plugin.power.modules.hik.service.HikDeviceInfoService; import com.epmet.plugin.power.modules.hik.service.HikErrorInfoService; +import com.epmet.plugin.power.modules.hik.utils.HkDeviceUtil; import com.epmet.plugin.power.modules.rent.dao.RentContractInfoDao; import com.epmet.plugin.power.modules.rent.entity.RentContractFileEntity; import com.epmet.plugin.power.modules.rent.entity.RentContractInfoEntity; @@ -39,7 +41,6 @@ import com.epmet.plugin.power.modules.rent.redis.RentContractInfoRedis; 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.plugin.power.modules.hik.utils.HkDeviceUtil; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -340,6 +341,9 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl delParams = new HashMap<>(); delParams.put("idCard", item.getIdCard()); hikErrorInfoService.deletePhysical(delParams); + if (CollectionUtils.isEmpty(item.getImgList())) { + return; + } HikPersonFormDTO person = new HikPersonFormDTO(); person.setFaceUrl(item.getImgList().get(0).getFileUrl()); From 9678c7d1b5d8d9251805b4ee16567b69a7514696 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Mon, 21 Nov 2022 15:06:50 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8D=A2=E4=B8=AA=E5=8C=85=E8=AF=95?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/rent/service/impl/RentContractInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 6b08c82..8dceb69 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 @@ -2,7 +2,6 @@ package com.epmet.plugin.power.modules.rent.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -45,6 +44,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.*; import java.util.stream.Collectors; From c2b22c9e33c95633320aa8beeb41947ab095322b Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 23 Nov 2022 10:30:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=A7=9F=E5=AE=A2=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=85=A8=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=96=B0=E5=88=B0=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E4=BF=A1=E6=81=AF=E9=87=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/RentContractInfoServiceImpl.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 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/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 8dceb69..616fc1d 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 @@ -302,17 +302,21 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl agencyInfo = govOrgOpenFeignClient.getAgencyById(contractDto.getCommunityId()); user.setPids(agencyInfo.getData().getPids());