修改登录等资源权限

one-certificate-manager/src/main/java/com/mortals/xhx/common/code/DimensionTypeEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 维度类型(1.固定值,2.系统上下问变量)枚举类
+*
+* @author zxfei
+*/
+public enum DimensionTypeEnum {
+    固定值(1, "固定值"),
+    系统上下问变量(2, "系统上下问变量");
+    private Integer value;
+    private String desc;
+
+    DimensionTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static DimensionTypeEnum getByValue(Integer value) {
+        for (DimensionTypeEnum dimensionTypeEnum : DimensionTypeEnum.values()) {
+            if (dimensionTypeEnum.getValue() == value) {
+                return dimensionTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (DimensionTypeEnum item : DimensionTypeEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/common/code/RuleConditionEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 规则条件(IN.属于,<.小于,>.大于,=.等于,!=.不等于,>=.大于等于,<=.小于等于,like %.左模糊,like %.右模糊)枚举类
+*
+* @author zxfei
+*/
+public enum RuleConditionEnum {
+    属于("IN", "属于"),
+    小于("<", "小于"),
+    大于(">", "大于"),
+    等于("=", "等于"),
+    不等于("!=", "不等于"),
+    大于等于(">=", "大于等于"),
+    小于等于("<=", "小于等于"),
+    左模糊("like %", "左模糊"),
+    右模糊("like %", "右模糊");
+    private String value;
+    private String desc;
+
+    RuleConditionEnum(String value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static RuleConditionEnum getByValue(String value) {
+        for (RuleConditionEnum ruleConditionEnum : RuleConditionEnum.values()) {
+            if (ruleConditionEnum.getValue() == value) {
+                return ruleConditionEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(String... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (RuleConditionEnum item : RuleConditionEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (String e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/common/code/RuleTypeEnum.java

+package com.mortals.xhx.common.code;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+* 规则值类型(1.固定值,2.系统上下问变量)枚举类
+*
+* @author zxfei
+*/
+public enum RuleTypeEnum {
+    固定值(1, "固定值"),
+    系统上下问变量(2, "系统上下问变量");
+    private Integer value;
+    private String desc;
+
+    RuleTypeEnum(Integer value, String desc) {
+        this.value = value;
+        this.desc = desc;
+    }
+
+    public Integer getValue() {
+        return this.value;
+    }
+
+    public String getDesc() {
+        return this.desc;
+    }
+
+    public static RuleTypeEnum getByValue(Integer value) {
+        for (RuleTypeEnum ruleTypeEnum : RuleTypeEnum.values()) {
+            if (ruleTypeEnum.getValue() == value) {
+                return ruleTypeEnum;
+            }
+        }
+        return null;
+    }
+
+    /**
+    * 获取Map集合
+    *
+    * @param eItem 不包含项
+    * @return
+    */
+    public static Map<String, String> getEnumMap(Integer... eItem) {
+        Map<String, String> resultMap = new LinkedHashMap<>();
+        for (RuleTypeEnum item : RuleTypeEnum.values()) {
+            try {
+                boolean hasE = false;
+                for (Integer e : eItem) {
+                    if (item.getValue() == e) {
+                        hasE = true;
+                        break;
+                    }
+                }
+                if (!hasE) {
+                    resultMap.put(item.getValue() + "", item.getDesc());
+                }
+            } catch (Exception ex) {
+
+            }
+        }
+        return resultMap;
+    }
+}
\ No newline at end of file

one-certificate-manager/src/main/java/com/mortals/xhx/module/child/service/impl/ChildLicenseServiceImpl.java

 package com.mortals.xhx.module.child.service.impl;
+import com.mortals.framework.model.PageInfo;
 import org.springframework.beans.BeanUtils;
+
+import java.util.Map;
 import java.util.function.Function;
 import org.springframework.stereotype.Service;
 import com.mortals.framework.service.impl.AbstractCRUDServiceImpl;
@@ -16,6 +19,8 @@ import org.springframework.util.ObjectUtils;
 import java.util.Date;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
+
 import lombok.extern.slf4j.Slf4j;
 /**
 * ChildLicenseService
@@ -31,7 +36,7 @@ public class ChildLicenseServiceImpl extends AbstractCRUDServiceImpl<ChildLicens
     private ChildLicenseDatasetService childLicenseDatasetService;
 
     @Override
-    protected void findAfter(ChildLicenseEntity params,PageInfo pageInfo, Context context, List<ChildLicenseEntity> list) throws AppException {
+    protected void findAfter(ChildLicenseEntity params, PageInfo pageInfo, Context context, List<ChildLicenseEntity> list) throws AppException {
         fillSubData(list);
         super.findAfter(params,pageInfo, context, list);
     }