From 85fcaefbc30cc9a55e8047e79441c67012def8be Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 20 Jul 2022 15:22:57 +0800 Subject: [PATCH 1/2] update --- .../service/impl/IcPolicyServiceImpl.java | 24 ++++++++----------- .../main/resources/mapper/IcPolicyRuleDao.xml | 2 +- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 2c05ac4565..0745a52db3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -4,22 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.feign.ResultDataResolver; -import com.epmet.commons.tools.utils.EpmetRequestHolder; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dao.IcPolicyDao; -import com.epmet.dao.IcPolicyRuleDetailDao; -import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; -import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dao.*; @@ -28,14 +23,12 @@ import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient; import com.epmet.dto.IcPolicyCategoryDTO; import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; -import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; -import com.epmet.entity.IcPolicyEntity; -import com.epmet.entity.IcPolicyRuleDetailEntity; import com.epmet.dto.IcPolicyRuleDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.dto.form.policy.IcPolicyRuleDetailDTO; import com.epmet.dto.form.policy.IcPolicyRuleFormDTO; +import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; import com.epmet.entity.*; import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.service.IcPolicyService; @@ -48,7 +41,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -116,13 +112,13 @@ public class IcPolicyServiceImpl extends BaseServiceImpl - delete from ic_policy_rule where IC_POLICY_ID=#{policyId} + delete from ic_policy_rule where IC_POLICY_ID = #{policyId} \ No newline at end of file From 6648d840736728981f443526d3eaa06ca5b63f7a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 20 Jul 2022 15:58:41 +0800 Subject: [PATCH 2/2] detail --- .../epmet/service/impl/IcPolicyServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index b4e99c7588..c8f3edeae9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -3,7 +3,6 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; -import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -281,6 +280,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl ruleDetailWrapper = new LambdaQueryWrapper<>(); ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) .eq(IcPolicyRuleDetailEntity::getGroupType, "resi") @@ -289,19 +289,22 @@ public class IcPolicyServiceImpl extends BaseServiceImpl resiRuleList = CollectionUtils.isNotEmpty(resiList) ? ConvertUtils.sourceToTarget(resiList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); rule.setResiRuleList(resiRuleList); - ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) + //房屋信息 + LambdaQueryWrapper houseDetailWrapper = new LambdaQueryWrapper<>(); + houseDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) .eq(IcPolicyRuleDetailEntity::getGroupType, "house") .orderByAsc(IcPolicyRuleDetailEntity::getSort); - List houseList = icPolicyRuleDetailDao.selectList(ruleDetailWrapper); + List houseList = icPolicyRuleDetailDao.selectList(houseDetailWrapper); List houseRuleList = CollectionUtils.isNotEmpty(houseList) ? ConvertUtils.sourceToTarget(houseList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); rule.setHouseRuleList(houseRuleList); - ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) + //统计信息 + LambdaQueryWrapper statDetailWrapper = new LambdaQueryWrapper<>(); + statDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) .eq(IcPolicyRuleDetailEntity::getGroupType, "stat") .orderByAsc(IcPolicyRuleDetailEntity::getSort); - List statList = icPolicyRuleDetailDao.selectList(ruleDetailWrapper); + List statList = icPolicyRuleDetailDao.selectList(statDetailWrapper); List statRuleList = CollectionUtils.isNotEmpty(statList) ? ConvertUtils.sourceToTarget(statList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); - ; rule.setStatRuleList(statRuleList); } }