From 2e2364742663c3b36a560a00659ff77bf8479dfe Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 20 Jul 2022 14:35:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcPolicyController.java | 38 +++++++++++++++++++ .../service/impl/IcPolicyServiceImpl.java | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index cc444aa24e..a383b5ffd9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -15,6 +15,7 @@ import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; import com.epmet.service.IcPolicyService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -48,9 +49,46 @@ public class IcPolicyController { @PostMapping("resiuserlist") public Result listResiUserByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { + // 调整错位的逻辑符号位置 + //adjustMalpositionLogicalOperatorPosition(input); icPolicyService.listResiUserByPolicyRules(input); return null; } + + /** + * 调整错位的逻辑运算符 + * @param input + */ + //private void adjustMalpositionLogicalOperatorPosition(ResisByPolicyRulesFormDTO input) { + // List resiRule = input.getRuleList().getResiRule(); + // List houseRule = input.getRuleList().getHouseRule(); + // List statRule = input.getRuleList().getStatRule(); + // + // if (CollectionUtils.isNotEmpty(resiRule)) { + // for (int i = 1; i < resiRule.size() - 1; i++) { + // ResisByPolicyRulesFormDTO.ResiRule current = resiRule.get(i); + // ResisByPolicyRulesFormDTO.ResiRule last = resiRule.get(i - 1); + // current.setLastLogicalRel(last.getLastLogicalRel()); + // } + // } + // + // if (CollectionUtils.isNotEmpty(houseRule)) { + // for (int i = 1; i < houseRule.size() - 1; i++) { + // ResisByPolicyRulesFormDTO.HouseRule current = houseRule.get(i); + // ResisByPolicyRulesFormDTO.HouseRule last = houseRule.get(i - 1); + // current.setLastLogicalRel(last.getLastLogicalRel()); + // } + // } + // + // if (CollectionUtils.isNotEmpty(statRule)) { + // for (int i = 1; i < statRule.size() - 1; i++) { + // ResisByPolicyRulesFormDTO.StatRule current = statRule.get(i); + // ResisByPolicyRulesFormDTO.StatRule last = statRule.get(i - 1); + // current.setLastLogicalRel(last.getLastLogicalRel()); + // } + // } + //} + /** * 政策管理-新增/修改 * 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 f46a0b0af8..ed96978438 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 @@ -369,7 +369,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl resis = getResultDataOrReturnNull(dataAggregatorOpenFeignClient.listByPolicyRules(aggForm), ServiceConstant.DATA_AGGREGATOR_SERVER); return resis.stream() - .map((r) -> new ResiByPolicyInfoResultDTO(r.getName(), r.getMobile(), r.getIdCard(), r.getNeighborhoodFullName(), r.getAge())) + .map((r) -> new ResiByPolicyInfoResultDTO(r.getName(), r.getMobile(), r.getIdCard(), r.getNeighborHoodName(), r.getAge())) .collect(Collectors.toList()); } } \ No newline at end of file