Merge branch 'mazq-jiekouyouhua-230523' into 'develop'

Mazq jiekouyouhua 230523

See merge request dcuc-tjdsj/duceap-service!20

dcuc-duceap-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-duceap</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.2.0-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dcuc-duceap-model/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-duceap</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.2.0-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/AppFunStatusEnum.java

@@ -0,0 +1,39 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * @author mazq
+ * @data 2021/05/19
+ * 服务类型代码枚举值
+ */
+public enum AppFunStatusEnum implements ICodeEnum {
+
+    /**
+     * 启用
+     */
+    START("1", "启用"),
+    /**
+     * 停用
+     */
+    STOP("0", "停用");
+
+    private final String value;
+    private final String label;
+
+    AppFunStatusEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/AuthApplyTypeEnum.java

@@ -0,0 +1,55 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+/**
+ * 权限申请类型枚举
+ *
+ * @author mazq
+ * @date 2021/2/22
+ */
+public enum AuthApplyTypeEnum {
+
+    /**
+     * 服务授权工作单
+     */
+    SERVICE_AUTH("SERVICE_AUTH", "服务授权工作单"),
+
+    /**
+     * 权限撤销工作单
+     */
+    SERVICE_AUTH_CANCEL("SERVICE_AUTH_CANCEL", "权限撤销工作单"),
+
+    /**
+     * 应用功能授权工作单
+     */
+    APP_FUN_AUTH("APP_FUN_AUTH", "应用功能授权工作单"),
+
+    /**
+     * 数据授权工作单
+     */
+    DATA_AUTH("DATA_AUTH", "数据授权工作单");
+
+    private String value;
+
+    private String label;
+
+    AuthApplyTypeEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/AuthResultEnum.java

@@ -0,0 +1,33 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/17 10:05
+ * @Description: 鉴权结果
+ */
+public enum AuthResultEnum implements ICodeEnum {
+
+    SUC("1","成功"),
+    FAIL("0","失败"),
+    ;
+
+    private String value;
+    private String label;
+
+    AuthResultEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/AuthenticationNecessaryParamEnum.java

@@ -0,0 +1,48 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/17 10:05
+ * @Description: 鉴权必要条件不完整风险的必要参数
+ */
+public enum AuthenticationNecessaryParamEnum implements ICodeEnum {
+
+    YHLP("YHLP", "用户令牌"),
+    YYLP("YYLP", "应用令牌"),
+    LPZX("LPZX", "令牌在线"),
+    QMWBCG("QMWBCG", "签名未被篡改"),
+    YWRWXX("YWRWXX", "业务任务信息"),
+    HJXX("HJXX", "环境信息"),
+    DYFWXX("DYFWXX", "调用服务信息"),
+    ;
+
+    private String value;
+    private String label;
+
+    public static String getLabel(String value) {
+        AuthenticationNecessaryParamEnum[] values = values();
+        for (AuthenticationNecessaryParamEnum typeEnum : values) {
+            if (typeEnum.getValue().equals(value)) {
+                return typeEnum.getLabel();
+            }
+        }
+        return null;
+    }
+
+    AuthenticationNecessaryParamEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/AuthenticationTypeEnum.java

@@ -0,0 +1,35 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/17 10:05
+ * @Description:
+ */
+public enum AuthenticationTypeEnum implements ICodeEnum {
+
+    FWJJQ("FWJJQ","服务级鉴权"),
+    GNJJQ("GNJJQ","功能级鉴权"),
+    YYJJQ("YYJJQ","应用级鉴权"),
+    SJJJQ("SJJJQ","数据级鉴权"),
+    ;
+
+    private String value;
+    private String label;
+
+    AuthenticationTypeEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/AuthorizeTypeEnum.java

@@ -0,0 +1,39 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/17 10:05
+ * @Description:
+ */
+public enum AuthorizeTypeEnum implements ICodeEnum {
+
+    YYSQ("YYSQ","应用授权"),
+    GNSQ("GNSQ","功能授权"),
+    FWSQ("FWSQ","服务授权"),
+    SJSQ("SJSQ","数据授权"),
+    YYXQ("YYXQ","应用销权"),
+    GNXQ("GNXQ","功能销权"),
+    FWXQ("FWXQ","服务销权"),
+    SJXQ("SJXQ","数据销权"),
+    ;
+
+    private String value;
+    private String label;
+
+    AuthorizeTypeEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/FunUsageScenariosEnum.java

@@ -0,0 +1,49 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * 代码千万行,注释第一行,编码不规范,同事两行泪
+ * 功能使用场景代码
+ *
+ * @author huang(jy)
+ * @version 1.0
+ * @date 2021/5/6 15:44
+ */
+public enum FunUsageScenariosEnum implements ICodeEnum {
+    /**
+     * 移动警务
+     */
+    ONE("01", "移动警务"),
+    /**
+     * 云桌面
+     */
+    TWO("02", "云桌面"),
+    /**
+     * 接入网
+     */
+    THREE("03", "接入网"),
+    /**
+     * 核心网
+     */
+    FOUR("04", "核心网");
+
+    private String value;
+    private String label;
+
+    FunUsageScenariosEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/ListLevelEnum.java

@@ -0,0 +1,45 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * 红白名单等级枚举类
+ *
+ * @author mazq
+ * @date 2021/7/13
+ */
+public enum ListLevelEnum implements ICodeEnum {
+    /**
+     * 红白名单等级枚举类
+     */
+    FIR("1", "低"),
+    SEC("2", "中"),
+    THIR("3", "高");
+
+    private String value;
+
+    private String label;
+
+    ListLevelEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/ManageDisposeTypeEnum.java

@@ -0,0 +1,56 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * 代码千万行,注释第一行,编码不规范,同事两行泪
+ *
+ * @author huang(jy)
+ * @version 1.0
+ * @date 2021/2/5 8:59
+ */
+public enum ManageDisposeTypeEnum implements ICodeEnum {
+    /**
+     * 审批流程管理日志
+     */
+    INSERT("INSERT", "创建", "11"),
+    UPDATE("UPDATE", "修改", "12"),
+    DELETED("DELETED", "删除", "13"),
+    ;
+
+    public final String value;
+    public final String label;
+    public final String auditCode;
+
+    ManageDisposeTypeEnum(String value, String label, String auditCode) {
+        this.value = value;
+        this.label = label;
+        this.auditCode = auditCode;
+    }
+
+    public static ManageDisposeTypeEnum getValue(String code) {
+        ManageDisposeTypeEnum[] var1 = values();
+
+        for (ManageDisposeTypeEnum opEnum : var1) {
+            if (opEnum.getValue().equals(code)) {
+                return opEnum;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+
+    public String getAuditCode() {
+        return auditCode;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/OperateDisposeTypeEnum.java

@@ -0,0 +1,68 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * 代码千万行,注释第一行,编码不规范,同事两行泪
+ * 操作显示类型枚举
+ *
+ * @author huang(jy)
+ * @version 1.0
+ * @date 2021/2/5 8:59
+ */
+public enum OperateDisposeTypeEnum implements ICodeEnum {
+    /**
+     * 审批操作日志
+     */
+    COMPLETE_AGREE("COMPLETE_AGREE", "通过", "01", "31"),
+    /**
+     * 不通过显示为退回，
+     */
+    COMPLETE_DISAGREE("COMPLETE_DISAGREE", "退回", "02", "32"),
+    ;
+
+    public final String value;
+
+    public final String label;
+
+    public final String auditCode;
+
+    public final String businessTypeCode;
+
+    OperateDisposeTypeEnum(String value, String label, String auditCode, String businessTypeCode) {
+        this.value = value;
+        this.label = label;
+        this.auditCode = auditCode;
+        this.businessTypeCode = businessTypeCode;
+    }
+
+    public static OperateDisposeTypeEnum getValue(String code) {
+        OperateDisposeTypeEnum[] var1 = values();
+
+        for (OperateDisposeTypeEnum opEnum : var1) {
+            if (opEnum.getValue().equals(code)) {
+                return opEnum;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+
+    public String getAuditCode() {
+        return auditCode;
+    }
+
+    public String getBusinessTypeCode() {
+        return businessTypeCode;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/ProgrammeStateEnum.java

@@ -0,0 +1,33 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/17 10:05
+ * @Description: 鉴权结果
+ */
+public enum ProgrammeStateEnum implements ICodeEnum {
+
+    ENABLE("1","启用"),
+    DISABLE("0","停用"),
+    ;
+
+    private String value;
+    private String label;
+
+    ProgrammeStateEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/RequestDisposeTypeEnum.java

@@ -0,0 +1,60 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * 代码千万行,注释第一行,编码不规范,同事两行泪
+ * 审批请求日志
+ *
+ * @author huang(jy)
+ * @version 1.0
+ * @date 2021/2/5 8:59
+ */
+public enum RequestDisposeTypeEnum implements ICodeEnum {
+
+    /**
+     * 发起
+     */
+    START("START", "发起"),
+    /**
+     * 撤回
+     */
+    RECALL("RECALL", "撤回"),
+    /**
+     * 超期
+     */
+    OVER_DUE("OVER_DUE", "超期"),
+
+    ;
+
+    public final String value;
+    public final String label;
+
+
+    RequestDisposeTypeEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    public static RequestDisposeTypeEnum getValue(String code) {
+        RequestDisposeTypeEnum[] var1 = values();
+
+        for (RequestDisposeTypeEnum opEnum : var1) {
+            if (opEnum.getValue().equals(code)) {
+                return opEnum;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/RiskProgrammeTypeEnum.java

@@ -0,0 +1,41 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/17 10:05
+ * @Description:
+ */
+public enum RiskProgrammeTypeEnum implements ICodeEnum {
+
+
+    DSJPFJQFX("DSJPFJQFX", "短时间频繁鉴权风险"),
+    DSJPFHBMDMZFX("DSJPFHBMDMZFX", "短时间频繁红/白名单命中风险"),
+    JQBYTJBWZFX("JQBYTJBWZFX", "鉴权必要条件不完整风险"),
+//    YHCXYQFWFX("YHCXYQFWFX", "用户持续越权访问风险"),
+    ;
+
+    Logger logger = LoggerFactory.getLogger(RiskProgrammeTypeEnum.class);
+
+    private String value;
+    private String label;
+
+    RiskProgrammeTypeEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/SchemeStatusEnum.java

@@ -0,0 +1,53 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * 代码千万行,注释第一行,编码不规范,同事两行泪
+ *
+ * @author huang(jy)
+ * @version 1.0
+ * @date 2021/2/5 8:59
+ */
+public enum SchemeStatusEnum implements ICodeEnum {
+    /**
+     * 风险方案状态
+     */
+    ENABLE("ENABLE", "启用"),
+    STOP("STOP", "停用"),
+
+
+
+    ;
+
+
+    public final String desc;
+    public final String code;
+
+    private SchemeStatusEnum(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public String getValue() {
+        return this.code;
+    }
+
+    public String getLabel() {
+        return this.desc;
+    }
+
+    public static SchemeStatusEnum getValue(String code) {
+        SchemeStatusEnum[] var1 = values();
+        int var2 = var1.length;
+
+        for(int var3 = 0; var3 < var2; ++var3) {
+            SchemeStatusEnum opEnum = var1[var3];
+            if (opEnum.getValue().equals(code)) {
+                return opEnum;
+            }
+        }
+
+        return null;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/SchemeTypeEnum.java

@@ -0,0 +1,62 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * 代码千万行,注释第一行,编码不规范,同事两行泪
+ *
+ * @author huang(jy)
+ * @version 1.0
+ * @date 2021/2/5 8:59
+ */
+public enum SchemeTypeEnum implements ICodeEnum {
+    /**
+     * 审批内容命中红/白名单风险
+     */
+    RED_WHITE_RISK("RED_WHITE_RISK", "审批内容命中红/白名单风险", "审批内容命中红/白名单风险"),
+
+    /**
+     * 提交人与审批人重复风险
+     */
+    COMMIT_APPROVE_REPETITION_RISK("COMMIT_APPROVE_REPETITION_RISK", "提交人与审批人重复风险", "提交人与审批人重复风险"),
+
+    /**
+     * 单人连续审批风险
+     */
+    SINGLE_APPROVE_RISK("SINGLE_APPROVE_RISK", "单人连续审批风险", "一次审批中单人连续审批风险"),
+    ;
+
+    public final String value;
+
+    public final String label;
+
+    public final String auditType;
+
+    SchemeTypeEnum(String code, String label, String auditType) {
+        this.value = code;
+        this.label = label;
+        this.auditType = auditType;
+    }
+
+    public static SchemeTypeEnum getValue(String code) {
+        SchemeTypeEnum[] var1 = values();
+
+        for (SchemeTypeEnum opEnum : var1) {
+            if (opEnum.getValue().equals(code)) {
+                return opEnum;
+            }
+        }
+
+        return null;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/SecurityPrivacyEnum.java

@@ -0,0 +1,37 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * 代码千万行,注释第一行,编码不规范,同事两行泪
+ * 安全隐私类别
+ *
+ * @author huang(jy)
+ * @version 1.0
+ * @date 2021/5/6 15:44
+ */
+public enum SecurityPrivacyEnum implements ICodeEnum {
+    /**
+     * 枚举类
+     */
+    PUBLIC("0", "公开"), AUTH("1", "涉密");
+
+    private String value;
+    private String label;
+
+    SecurityPrivacyEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/SelfAuthApplyTypeEnum.java

@@ -0,0 +1,55 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * 权限自助申请类型枚举
+ *
+ * @author mazq
+ * @date 2021/2/22
+ */
+public enum SelfAuthApplyTypeEnum implements ICodeEnum {
+
+    /**
+     * 服务授权工作单
+     */
+    SERVICE_AUTH("SERVICE_AUTH", "服务资源访问权限"),
+
+
+    /**
+     * 应用功能授权工作单
+     */
+    APP_FUN_AUTH("APP_FUN_AUTH", "应用功能访问权限"),
+
+    /**
+     * 数据授权工作单
+     */
+    DATA_AUTH("DATA_AUTH", "数据资源访问权限");
+
+    private String value;
+
+    private String label;
+
+    SelfAuthApplyTypeEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/ServiceProvideWayEnum.java

@@ -0,0 +1,45 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * 代码千万行,注释第一行,编码不规范,同事两行泪
+ * 服务提供方式
+ *
+ * @author huang(jy)
+ * @version 1.0
+ * @date 2021/5/6 15:44
+ */
+public enum ServiceProvideWayEnum implements ICodeEnum {
+    /**
+     * 服务总线
+     */
+    ONE("01", "服务总线"),
+    /**
+     * API网关
+     */
+    TWO("02", "API网关"),
+    /**
+     * 服务接口
+     */
+    THREE("03", "服务接口");
+
+    private String value;
+    private String label;
+
+    ServiceProvideWayEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/ServiceResourceTypeEnum.java

@@ -0,0 +1,51 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * @author mazq
+ * @data 2021/05/19
+ * 服务类型代码枚举值
+ */
+public enum ServiceResourceTypeEnum implements ICodeEnum {
+
+    /**
+     * 服务类型
+     */
+    SEARCH_SERVICE("0100", "查询检索类服务"),
+    SUBSCRIBE_SERVICE("0200", "比对订阅类服务"),
+    ANALYSE_SERVICE("0300", "模型分析类服务"),
+    PUSH_SERVICE("0400", "数据推送类服务"),
+    AUTH_SERVICE("0500", "数据鉴权服务"),
+    DATA_SERVICE("0600", "数据操作类服务"),
+    MANAGE_SERVICE("0700", "数据服务管理类服务"),
+    OTHER_SERVICE("0800", "其它类服务");
+
+    private String value;
+
+    private String label;
+
+    ServiceResourceTypeEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
+
+    public void setLabel(String label) {
+        this.label = label;
+    }
+}

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/UserTypeEnum.java

@@ -8,9 +8,9 @@ import com.dragonsoft.duceap.base.enums.ICodeEnum;
  **/
 public enum UserTypeEnum implements ICodeEnum {
 
-    POLICE("10", "民警"),
+    POLICE("10", "警员"),
     HELPER("20", "辅警"),
-    EXTERNAL("30", "外部人员");
+    EXTERNAL("30", "施工人员");
 
     private String value;
     private String label;

dcuc-duceap-model/src/main/java/com/dragoninfo/dcuc/duceap/enums/WarningProgrammeTypeEnum.java

@@ -0,0 +1,40 @@
+package com.dragoninfo.dcuc.duceap.enums;
+
+import com.dragonsoft.duceap.base.enums.ICodeEnum;
+
+/**
+ * @Author: qiuyu
+ * @Date: 2021/5/17 10:05
+ * @Description:
+ */
+public enum WarningProgrammeTypeEnum implements ICodeEnum {
+
+    /**
+     * 用户异常时间鉴权预警
+     */
+    YHYCSJJQYJ("YHYCSJJQYJ", "用户异常时间鉴权预警"),
+    /**
+     * 用户异常IP鉴权预警
+     */
+    YHYCIPJQYJ("YHYCIPJQYJ", "用户异常IP鉴权预警"),
+    ;
+
+    private String value;
+    private String label;
+
+    WarningProgrammeTypeEnum(String value, String label) {
+        this.value = value;
+        this.label = label;
+    }
+
+    @Override
+    public String getValue() {
+        return this.value;
+    }
+
+    @Override
+    public String getLabel() {
+        return this.label;
+    }
+
+}

dcuc-duceap-service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dcuc-duceap</artifactId>
         <groupId>com.dragoninfo</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>2.2.0-tjdsj-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -197,7 +197,7 @@
                                 </goals>
                                 <configuration>
                                     <!--排除licenseignore包，用来禁用许可开关，防止生产环境通过关闭开关，绕过许可-->
-                                    <excludeArtifactIds>duceap-support-licenseignore</excludeArtifactIds>
+<!--                                    <excludeArtifactIds>duceap-support-licenseignore</excludeArtifactIds>-->
                                     <excludeScope>provided</excludeScope>
                                     <outputDirectory>${project.build.directory}/lib</outputDirectory>
                                     <!--取消依赖包的时间戳-->

dcuc-duceap-service/src/main/assembly/conf/application.yml

@@ -1,37 +1,6 @@
 spring:
-  datasource:
-    username: jzpt_bu
-    password: dragon
-    driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://192.168.120.142:3306/dcuc_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
-
-    #    username: DCUC2_GD
-    #    password: dragon
-    #    driver-class-name: oracle.jdbc.driver.OracleDriver
-    #    url: jdbc:oracle:thin:@192.168.6.120:1521:orcl
-    druid:
-      filters: sqlaudit
-  application:
-    name: dcuc-duceap
-  cloud:
-    nacos:
-      discovery:
-        server-addr: 127.0.0.1:8848
-  cache:
-    type: redis
-  redis:
-    host: 127.0.0.1
-    port: 6379
-  kafka:
-    consumer:
-      bootstrap-servers: 10.254.10.15:9092
-server:
-  port: 21899
-management:
-  endpoints:
-    web:
-      exposure:
-        include: '*'
+  profiles:
+    include: base,dcuc_duceap
 apollo:
   # 配置中心地址(服务端)
   meta: http://192.168.6.132:8080
@@ -39,47 +8,11 @@ apollo:
     # 命名空间，支持多个逗号隔开。按命名空间顺序依次加载，可用于公共配置
     namespaces: application,dragonsoft.dcuc
     # 是否启用apollo
-    enabled: true
+    enabled: false
   # 集群，默认default
-  cluster: GD
+  cluster: default
   # 取消placeholder的自动更新功能(默认true)
   autoUpdateInjectedSpringProperties: false
 duceap:
-  #通过配置duceap.datasource.dynamic.{dataSourceName}.{dataSourceProp}，将自动启用多数据源
-  #用apollo配置数据源方式
-  #  datasource:
-  #    dynamic:
-  #      dcuc:
-  #        url:
-  #        username:
-  #        password:
-  #        driver-class-name:
-  datasource:
-    dynamic:
-      enabled: false
-  auditlog:
-    login:
-      enabled: false
-    audit:
-      enabled: false
-    sqlaudit:
-      output: kafka
-      exclude-tables: T_LOG_*
-  code:
-    enums:
-      scan-package: com.dragonsoft.**.enumresources,com.dragonsoft.**.enums,com.dragoninfo.**.enums,com.dragoninfo.**.enumresources
   license:
-    #配置用来指定license对接的后端项目地址(格式：ip:port/context，如http://10.10.10.10:8080/ctx)，
-    #默认使用HttpServletRequest.getLocalAddr()方法获取ip地址，
-    #应用在docker部署环境中无法获取机子的真实ip地址 考虑以配置参数的形式传入
-    address: http://127.0.0.1:21899
-    dataCacheMethod: apollo
-  apollo:
-    client:
-      #apollo客户端（许可）
-      host: http://10.201.3.20:8070
-dcuc:
-  duceap:
-    es:
-      enabled: false
-      datasourceId: HW_DS_ElASTICSEARCH
+    enabled: false

dcuc-duceap-service/src/main/resources/application-base.yml

@@ -3,7 +3,7 @@ spring:
     username: dcuc
     password: 123
     driver-class-name: com.mysql.jdbc.Driver
-    url: jdbc:mysql://10.254.10.31:3306/dcuc_gd_2.0?useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://10.254.10.31:3306/dcuc_tjdsj_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&useSSL=false
     druid:
       filters: sqlaudit
   application:
@@ -20,7 +20,7 @@ spring:
   cache:
     type: redis
   redis:
-    host: 10.254.10.15
+    host: 127.0.0.1
     port: 6379
   kafka:
     consumer:
@@ -34,23 +34,11 @@ management:
         include: '*'
 
 duceap:
-  #通过配置duceap.datasource.dynamic.{dataSourceName}.{dataSourceProp}，将自动启用多数据源
-  #用apollo配置数据源方式
-  #  datasource:
-  #    dynamic:
-  #      dcuc:
-  #        url: jdbc:mysql://192.168.120.142:3306/dcuc_2.0?useUnicode=true&characterEncoding=UTF-8&serverTimezone=UTC
-  #        username: dcuc
-  #        password: 123
-  #        driver-class-name: com.mysql.jdbc.Driver
   flyway:
     # 是否执行flyway
-    enabled: false
+    enabled: true
     # 执行flyway路径
-    locations: classpath:/config/mysql
-  datasource:
-    dynamic:
-      enabled: false
+    locations: classpath:/mysql
   auditlog:
     login:
       enabled: false

dcuc-duceap-service/src/main/resources/application.yml

@@ -13,3 +13,6 @@ apollo:
   cluster: default
   # 取消placeholder的自动更新功能(默认true)
   autoUpdateInjectedSpringProperties: false
+duceap:
+  license:
+    enabled: false

dcuc-duceap-service/src/main/resources/mysql/V4_8_0002__Add_ROLE_CATEGORY.sql

@@ -0,0 +1,49 @@
+create table dm_role_category
+(
+    code  varchar(10)  not null
+        primary key,
+    value varchar(32) not null
+);
+
+INSERT INTO `t_md_sys_code_dic` (`code_id`, `datasource_id`, `name`, `entity_name`, `code_field`, `name_field`,
+                                 `py_field`, `wb_field`, `order_field`, `segment_rule`, `view_sql`, `load_type`,
+                                 `parent_code_field`)
+VALUES ('DM_ROLE_CATEGORY', NULL, '角色类型', 'DM_ROLE_CATEGORY', 'CODE', 'VALUE', NULL, NULL, NULL, NULL, NULL, '1', NULL);
+
+INSERT INTO dm_role_category (code, value) VALUES ('LOCAL', '本地角色');
+INSERT INTO dm_role_category (code, value) VALUES ('ALL', '全局角色');
+
+create table dm_env_ele_name_type
+(
+    code  varchar(10)  not null
+        primary key,
+    value varchar(32) not null
+);
+
+INSERT INTO `t_md_sys_code_dic` (`code_id`, `datasource_id`, `name`, `entity_name`, `code_field`, `name_field`,
+                                 `py_field`, `wb_field`, `order_field`, `segment_rule`, `view_sql`, `load_type`,
+                                 `parent_code_field`)
+VALUES ('DM_ENV_ELE_NAME_TYPE', NULL, '环境要素名称类型', 'DM_ENV_ELE_NAME_TYPE', 'CODE', 'VALUE', NULL, NULL, NULL, NULL, NULL, '1', NULL);
+
+INSERT INTO dm_env_ele_name_type (code, value) VALUES ('YZM', '云桌面');
+INSERT INTO dm_env_ele_name_type (code, value) VALUES ('YDJW', '移动警务');
+INSERT INTO dm_env_ele_name_type (code, value) VALUES ('IP', 'IP地址');
+INSERT INTO dm_env_ele_name_type (code, value) VALUES ('JRW', '接入网');
+INSERT INTO dm_env_ele_name_type (code, value) VALUES ('HXW', '核心网');
+
+INSERT INTO `t_md_sys_code_dic`(`code_id`, `datasource_id`, `name`, `entity_name`, `code_field`, `name_field`,
+                                `py_field`, `wb_field`, `order_field`, `segment_rule`, `view_sql`, `load_type`,
+                                `parent_code_field`)
+VALUES ('DM_ACTIVE_STATUS', NULL, '起停用状态', 'DM_ACTIVE_STATUS', 'CODE', 'VALUE', NULL, NULL, NULL, NULL, NULL,
+        '1', NULL);
+
+CREATE TABLE `DM_ACTIVE_STATUS`
+(
+    `CODE`  varchar(10) NOT NULL,
+    `VALUE` varchar(20) NOT NULL,
+    PRIMARY KEY (`CODE`)
+);
+INSERT INTO DM_ACTIVE_STATUS(CODE, VALUE)
+VALUES ('0', '停用');
+INSERT INTO DM_ACTIVE_STATUS(CODE, VALUE)
+VALUES ('1', '启用');

dcuc-duceap-service/src/main/resources/sql/V4_8_0002__Add_ROLE_CATEGORY.sql

@@ -0,0 +1,12 @@
+create table DM_ROLE_CATEGORY
+(
+    CODE  varchar2(10)  not null
+        primary key,
+    VALUE varchar2(32) not null
+);
+
+INSERT INTO T_MD_SYS_CODE_DIC (CODE_ID, NAME, ENTITY_NAME, CODE_FIELD, NAME_FIELD,LOAD_TYPE)
+VALUES ('DM_ROLE_CATEGORY', '角色类型', 'DM_ROLE_CATEGORY', 'CODE', 'VALUE',  '1');
+
+INSERT INTO DM_ROLE_CATEGORY (CODE, VALUE) VALUES ('LOCAL', '本地角色');
+INSERT INTO DM_ROLE_CATEGORY (CODE, VALUE) VALUES ('ALL', '全局角色');

pom.xml

@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.dragoninfo</groupId>
     <artifactId>dcuc-duceap</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-tjdsj-SNAPSHOT</version>
 
     <packaging>pom</packaging>
 
@@ -19,7 +19,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
         <!--revisions需写死，用于标识打包的版本号，不可删除-->
-        <revision>2.0.0-SNAPSHOT</revision>
+        <revision>2.2.0-tjdsj-SNAPSHOT</revision>
         <duceap.version>2.1.0-SNAPSHOT</duceap.version>
         <oracle.version>11.2.0.1.0</oracle.version>
         <mysql.version>5.1.49</mysql.version>