xionzeng

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java

@@ -12,7 +12,13 @@ import javax.validation.constraints.NotBlank;
  */
 @Data
 public class IcPolicyRuleDetailDTO {
-    public interface AddUserShowGroup extends CustomerClientShowGroup {
+    public interface ResiRulerShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface HouseRulerShowGroup extends CustomerClientShowGroup {
+    }
+
+    public interface StatRulerShowGroup extends CustomerClientShowGroup {
     }
     /**
      * 规则描述文字，例如：基础信息性别等于女
@@ -27,34 +33,37 @@ public class IcPolicyRuleDetailDTO {
     /**
      * 分组id；人员信息有值；
      */
+    @NotBlank(message = "itemGroupId不能为空", groups = ResiRulerShowGroup.class)
     private String itemGroupId;
 
     /**
      * 表名；人员信息有值；房屋信息也有值
      */
+    @NotBlank(message = "itemId不能为空", groups = ResiRulerShowGroup.class)
     private String itemId;
 
     /**
      * 查询类型：等于、不等于....;来源于字典表sql_query_type
      */
-    @NotBlank(message = "查询类型不能为空", groups = AddUserShowGroup.class)
+    @NotBlank(message = "查询类型不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class})
     private String queryType;
 
     /**
      * 表名；人员信息有值；
      */
+    @NotBlank(message = "colTable不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class})
     private String colTable;
 
     /**
      * 人员信息存储组件对应的列名；房屋信息存储ic_house表的列名；统计信息应该是定义到字典表，这里存储字典key就行吧
      */
-    @NotBlank(message = "条件不能为空", groups = AddUserShowGroup.class)
+    @NotBlank(message = "条件不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class})
     private String colKey;
 
     /**
      * 参数值
      */
-    @NotBlank(message = "参数值不能为空", groups = AddUserShowGroup.class)
+    @NotBlank(message = "参数值不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class})
     private String colVal;
 }
 

epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java

@@ -2,6 +2,7 @@ package com.epmet.dto.form.policy;
 
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.List;
@@ -22,16 +23,18 @@ public class IcPolicyRuleFormDTO implements Serializable {
     /**
      * 人员信息
      */
-    // @Valid
+    @Valid
     // @NotEmpty
     private List<IcPolicyRuleDetailDTO> resiRuleList;
     /**
      * 房屋信息
      */
+    @Valid
     private List<IcPolicyRuleDetailDTO> houseRuleList;
     /**
      * 统计信息
      */
+    @Valid
     private List<IcPolicyRuleDetailDTO> statRuleList;
 
     /**

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

@@ -3,11 +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.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;
@@ -18,12 +13,13 @@ 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.Result;
+import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dao.*;
+import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO;
+import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient;
 import com.epmet.dto.IcPolicyCategoryDTO;
 import com.epmet.dto.IcPolicyDTO;
 import com.epmet.dto.IcPolicyItemResultDTO;
-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;
@@ -41,13 +37,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.stream.Collectors;
-import java.util.Map;
 
 /**
  * 政策表
@@ -137,6 +128,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
             if (CollectionUtils.isNotEmpty(rule.getResiRuleList())) {
                 int resiRuleSort = 1;
                 for (IcPolicyRuleDetailDTO ruleDetailDTO : rule.getResiRuleList()) {
+                    ValidatorUtils.validateEntity(ruleDetailDTO,IcPolicyRuleDetailDTO.ResiRulerShowGroup.class);
                     IcPolicyRuleDetailEntity icPolicyRuleDetailEntity = ConvertUtils.sourceToTarget(ruleDetailDTO, IcPolicyRuleDetailEntity.class);
                     icPolicyRuleDetailEntity.setCustomerId(formDTO.getCustomerId());
                     icPolicyRuleDetailEntity.setIcPolicyId(icPolicyEntity.getId());
@@ -150,6 +142,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
             if (CollectionUtils.isNotEmpty(rule.getHouseRuleList())) {
                 int houseRuleSort = 1;
                 for (IcPolicyRuleDetailDTO ruleDetailDTO : rule.getHouseRuleList()) {
+                    ValidatorUtils.validateEntity(ruleDetailDTO,IcPolicyRuleDetailDTO.HouseRulerShowGroup.class);
                     IcPolicyRuleDetailEntity icPolicyRuleDetailEntity = ConvertUtils.sourceToTarget(ruleDetailDTO, IcPolicyRuleDetailEntity.class);
                     icPolicyRuleDetailEntity.setCustomerId(formDTO.getCustomerId());
                     icPolicyRuleDetailEntity.setIcPolicyId(icPolicyEntity.getId());
@@ -163,6 +156,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl<IcPolicyDao, IcPolicyEn
             if (CollectionUtils.isNotEmpty(rule.getStatRuleList())) {
                 int statRuleSort = 1;
                 for (IcPolicyRuleDetailDTO ruleDetailDTO : rule.getStatRuleList()) {
+                    ValidatorUtils.validateEntity(ruleDetailDTO,IcPolicyRuleDetailDTO.StatRulerShowGroup.class);
                     IcPolicyRuleDetailEntity icPolicyRuleDetailEntity = ConvertUtils.sourceToTarget(ruleDetailDTO, IcPolicyRuleDetailEntity.class);
                     icPolicyRuleDetailEntity.setCustomerId(formDTO.getCustomerId());
                     icPolicyRuleDetailEntity.setIcPolicyId(icPolicyEntity.getId());