elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

【政策】清理一些破烂

master
wangxianzhang 3 years ago
parent
3d221b45d6
commit
d3a1a2d7c4
4 changed files with 0 additions and 182 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java
  2. 47
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
  3. 2
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java
  4. 56
      epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java

77
epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java
View File

@ -1,77 +0,0 @@
package com.epmet.dto.form.resi;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@Data
@NoArgsConstructor
@AllArgsConstructor
public class HeartResisByPolicyRulesFormDTO {
private String ruleId;
private String orgId;
private String orgType;
private String neighborHoodId;
private String buildingId;
private String unitId;
private String houseId;
private String name;
private String mobile;
private String idCard;
private RuleList ruleList;
private Integer pageNo;
private Integer pageSize;
@Data
@NoArgsConstructor
@AllArgsConstructor
public static class RuleList {
private String ruleName;
private List<ResisByPolicyRulesFormDTO.ResiRule> resiRuleList;
private List<ResisByPolicyRulesFormDTO.HouseRule> houseRuleList;
private List<ResisByPolicyRulesFormDTO.StatRule> statRuleList;
}
@Data
@NoArgsConstructor
@AllArgsConstructor
public static class ResiRule {
private String ruleDesc;
private String nextLogicalRel;
private String itemGroupId;
private String itemId;
private String queryType;
private String colTable;
private String colKey;
private String colVal;
}
@Data
@NoArgsConstructor
@AllArgsConstructor
public static class HouseRule {
private String colTable;
private String colKey;
private String colVal;
private String ruleDesc;
private String nextLogicalRel;
private String queryType;
}
@Data
@NoArgsConstructor
@AllArgsConstructor
public static class StatRule {
private String colKey;
private String colVal;
private String nextLogicalRel;
private String ruleDesc;
private String queryType;
private String colTable;
}
}

47
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java
View File

@ -50,53 +50,6 @@ public class IcPolicyController {
return new Result<List<IcPolicyItemResultDTO>>().ok(list);
}
/**
* 政策找人，居民列表
* @param input
* @return
*/
@Deprecated
@PostMapping("resiuserlist")
public Result listResiUserByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) {
// 调整错位的逻辑符号位置
//adjustMalpositionLogicalOperatorPosition(input);
PageData<ResiByPolicyInfoResultDTO> page = icPolicyService.listResiUserByPolicyRules(input);
return new Result().ok(page);
}
/**
* 调整错位的逻辑运算符
* @param input
*/
//private void adjustMalpositionLogicalOperatorPosition(ResisByPolicyRulesFormDTO input) {
// List<ResisByPolicyRulesFormDTO.ResiRule> resiRule = input.getRuleList().getResiRule();
// List<ResisByPolicyRulesFormDTO.HouseRule> houseRule = input.getRuleList().getHouseRule();
// List<ResisByPolicyRulesFormDTO.StatRule> 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());
// }
// }
//}
/**
* 政策管理-新增/修改

2
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java
View File

@ -57,8 +57,6 @@ public interface IcPolicyService extends BaseService<IcPolicyEntity> {
IcPolicyDTO policyDetail(String customerId,String policyId);
PageData<ResiByPolicyInfoResultDTO> listResiUserByPolicyRules(ResisByPolicyRulesFormDTO input);
/**
* 政策规则查询
* @param customerId

56
epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java
View File

@ -321,62 +321,6 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
return icPolicyDTO;
}
@Override
public PageData<ResiByPolicyInfoResultDTO> listResiUserByPolicyRules(com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO input) {
String customerId = EpmetRequestHolder.getLoginUserCustomerId();
String ruleId = input.getRuleId();
ResisByPolicyRulesFormDTO aggForm = ConvertUtils.sourceToTarget(input, ResisByPolicyRulesFormDTO.class);
// 穿了规则id，按照规则id来，忽略规则list
if (StringUtils.isNotBlank(ruleId)) {
Map<String, List<IcPolicyRuleDetailEntity>> ruleMap = listPolicyRules4QueryAndExport(customerId, ruleId);
// resi规则
List<IcPolicyRuleDetailEntity> originResiRules = ruleMap.get("resi");
if (CollectionUtils.isNotEmpty(originResiRules)) {
List<ResisByPolicyRulesFormDTO.ResiRule> resiRules = originResiRules
.stream()
.map((r) -> new ResisByPolicyRulesFormDTO.ResiRule(r.getRuleDesc(), r.getNextLogicalRel(), r.getItemGroupId(),
r.getItemId(), r.getQueryType(), r.getColTable(), r.getColKey(), r.getColVal()))
.collect(Collectors.toList());
aggForm.getRuleList().setResiRuleList(resiRules);
}
// house规则
List<IcPolicyRuleDetailEntity> originHouseRules = ruleMap.get("house");
if (CollectionUtils.isNotEmpty(originHouseRules)) {
List<ResisByPolicyRulesFormDTO.HouseRule> houseRules = originHouseRules
.stream()
.map((r) -> new ResisByPolicyRulesFormDTO.HouseRule(r.getColTable(), r.getColKey(), r.getColVal(),
r.getRuleDesc(), r.getNextLogicalRel(), r.getQueryType()))
.collect(Collectors.toList());
aggForm.getRuleList().setHouseRuleList(houseRules);
}
// stat规则
List<IcPolicyRuleDetailEntity> originStatRules = ruleMap.get("stat");
if (CollectionUtils.isNotEmpty(originStatRules)) {
List<ResisByPolicyRulesFormDTO.StatRule> statRules = originStatRules
.stream()
.map((r) -> new ResisByPolicyRulesFormDTO.StatRule(r.getColKey(), r.getColVal(), r.getNextLogicalRel(),
r.getRuleDesc(), r.getQueryType(), r.getColTable()))
.collect(Collectors.toList());
aggForm.getRuleList().setStatRuleList(statRules);
}
}
// 调用aggre服务查询结果
Result<PageData<com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO>> result = dataAggregatorOpenFeignClient.listByPolicyRules(aggForm);
List<ResiByPolicyInfoResultDTO> list = result.getData().getList().stream()
.map((r) -> new ResiByPolicyInfoResultDTO(r.getIcResiUserId() ,r.getName(), r.getMobile(), r.getIdCard(), r.getGridId()
,r.getNeighborhoodId(), r.getNeighborHoodName(), r.getAge(), r.getBirthday()))
.collect(Collectors.toList());
return new PageData<ResiByPolicyInfoResultDTO>(list, result.getData().getTotal());
}
public Map<String, List<IcPolicyRuleDetailEntity>> listPolicyRules4QueryAndExport(String customerId, String ruleId) {
ResisByPolicyRulesFormDTO form = new ResisByPolicyRulesFormDTO();
LambdaQueryWrapper<IcPolicyRuleDetailEntity> query = new LambdaQueryWrapper();

Write Preview
Loading…
Cancel
Save